diff options
| author | Erlang/OTP <[email protected]> | 2017-04-21 17:46:20 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-04-21 17:46:20 +0200 |
| commit | b04b835572e8f737d7437b2fa706652fb7e3e311 (patch) | |
| tree | 92dd3a36bec3f40d20fd8fe2aa95cd2c48e63d12 | |
| parent | d25ad84195ca42969fbfb017a52aab8c8effc246 (diff) | |
| parent | 4c408d98127c3a44f47b86e89d2a0bd5567b1e70 (diff) | |
| download | otp-b04b835572e8f737d7437b2fa706652fb7e3e311.tar.gz otp-b04b835572e8f737d7437b2fa706652fb7e3e311.tar.bz2 otp-b04b835572e8f737d7437b2fa706652fb7e3e311.zip | |
Merge branch 'rickard/sigterm/OTP-14358' into maint-19
* rickard/sigterm/OTP-14358:
Do not ignore SIGTERM when VM has been started with +Bi
| -rw-r--r-- | erts/emulator/sys/unix/erl_unix_sys.h | 1 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 19 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys_drivers.c | 1 |
3 files changed, 16 insertions, 5 deletions
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h index b64b0d87f6..054a4678c8 100644 --- a/erts/emulator/sys/unix/erl_unix_sys.h +++ b/erts/emulator/sys/unix/erl_unix_sys.h @@ -322,6 +322,7 @@ extern SIGFUNC sys_signal(int, SIGFUNC); extern void sys_sigrelease(int); extern void sys_sigblock(int); extern void sys_init_suspend_handler(void); +extern void erts_sys_unix_later_init(void); /* * Handling of floating point exceptions. diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index 55411f83d0..3010af44be 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -791,10 +791,14 @@ static RETSIGTYPE do_quit(int signum) /* Disable break */ void erts_set_ignore_break(void) { - sys_signal(SIGINT, SIG_IGN); - sys_signal(SIGTERM, SIG_IGN); - sys_signal(SIGQUIT, SIG_IGN); - sys_signal(SIGTSTP, SIG_IGN); + /* + * Ignore signals that can be sent to the VM by + * typing certain key combinations at the + * controlling terminal... + */ + sys_signal(SIGINT, SIG_IGN); /* Ctrl-C */ + sys_signal(SIGQUIT, SIG_IGN); /* Ctrl-\ */ + sys_signal(SIGTSTP, SIG_IGN); /* Ctrl-Z */ } /* Don't use ctrl-c for break handler but let it be @@ -818,7 +822,6 @@ void erts_replace_intr(void) { void init_break_handler(void) { sys_signal(SIGINT, request_break); - sys_signal(SIGTERM, request_stop); #ifndef ETHR_UNUSABLE_SIGUSRX sys_signal(SIGUSR1, user_signal1); #endif /* #ifndef ETHR_UNUSABLE_SIGUSRX */ @@ -832,6 +835,12 @@ void sys_init_suspend_handler(void) #endif } +void +erts_sys_unix_later_init(void) +{ + sys_signal(SIGTERM, request_stop); +} + int sys_max_files(void) { return(max_files); diff --git a/erts/emulator/sys/unix/sys_drivers.c b/erts/emulator/sys/unix/sys_drivers.c index 400f163652..93cf64719a 100644 --- a/erts/emulator/sys/unix/sys_drivers.c +++ b/erts/emulator/sys/unix/sys_drivers.c @@ -204,6 +204,7 @@ erl_sys_late_init(void) #ifdef ERTS_SMP erts_mtx_unlock(port->lock); #endif + erts_sys_unix_later_init(); /* Need to be called after forker has been started */ } /* II. Prototypes */ |