diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2017-02-03 15:22:06 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2017-02-03 15:22:06 +0100 |
| commit | e53e74c5349061857d8eeb9c564768e54446012a (patch) | |
| tree | 1c7ebcd38ff44e9ca0d8ba558e334791858b5096 /erts/emulator/beam/sys.h | |
| parent | 08726ff1c6a0bfb9989034920184438aed9db8bd (diff) | |
| parent | 1409b6ae110f60c410e83d1923dd59ae3659a887 (diff) | |
| download | otp-e53e74c5349061857d8eeb9c564768e54446012a.tar.gz otp-e53e74c5349061857d8eeb9c564768e54446012a.tar.bz2 otp-e53e74c5349061857d8eeb9c564768e54446012a.zip | |
Merge branch 'egil/20/erts/signal-service/OTP-14186'
* egil/20/erts/signal-service/OTP-14186:
kernel: Document signal server
erts: Use os module instead of erts_internal for set_signal/2
erts: Do not handle SIGILL
erts: Fix thread suspend in crashdump
erts: Do not enable SIGINT
erts: Use generic signal handler
erts: Add OS signal tests
erts: Handle SIGUSR1 via signal service instead
erts: Handle SIGTERM via signal service instead
kernel: Add gen_event signal server and default handler
erts: Add SIGHUP signal handler
erts: Remove whitespace errors
Conflicts:
erts/emulator/beam/bif.tab
Diffstat (limited to 'erts/emulator/beam/sys.h')
| -rw-r--r-- | erts/emulator/beam/sys.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index 14b8a5950d..a11fb16b39 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -487,20 +487,6 @@ extern volatile int erts_break_requested; void erts_do_break_handling(void); #endif -#ifdef ERTS_WANT_GOT_SIGUSR1 -# ifndef UNIX -# define ERTS_GOT_SIGUSR1 0 -# else -# ifdef ERTS_SMP -extern erts_smp_atomic32_t erts_got_sigusr1; -# define ERTS_GOT_SIGUSR1 ((int) erts_smp_atomic32_read_mb(&erts_got_sigusr1)) -# else -extern volatile int erts_got_sigusr1; -# define ERTS_GOT_SIGUSR1 erts_got_sigusr1 -# endif -# endif -#endif - #ifdef ERTS_SMP extern erts_smp_atomic32_t erts_writing_erl_crash_dump; extern erts_tsd_key_t erts_is_crash_dumping_key; |