diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2017-04-04 15:35:50 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2017-04-04 15:35:50 +0200 |
| commit | 38cd77b3e7afbf3973167c5a339381707e3d95bc (patch) | |
| tree | de8a3dac88e62cd9ff2820ba7404bf21d1e08903 /erts/emulator/sys/common | |
| parent | a748cafdc7063d9f181ba12088db6458793ced2f (diff) | |
| parent | f92d862c1af230a873c2b2d30fea575ff3dafd56 (diff) | |
| download | otp-38cd77b3e7afbf3973167c5a339381707e3d95bc.tar.gz otp-38cd77b3e7afbf3973167c5a339381707e3d95bc.tar.bz2 otp-38cd77b3e7afbf3973167c5a339381707e3d95bc.zip | |
Merge branch 'egil/erts/fix-sigterm/OTP-14290' into maint
* egil/erts/fix-sigterm/OTP-14290:
erts: Make sigterm signal safe for non-smp beam
Diffstat (limited to 'erts/emulator/sys/common')
| -rw-r--r-- | erts/emulator/sys/common/erl_check_io.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c index 44a77f3ea5..8f2f1f9521 100644 --- a/erts/emulator/sys/common/erl_check_io.c +++ b/erts/emulator/sys/common/erl_check_io.c @@ -1617,6 +1617,11 @@ ERTS_CIO_EXPORT(erts_check_io)(int do_wait) erts_do_break_handling(); #endif +#ifdef ERTS_SIGNAL_SIGTERM + if (ERTS_SIGNAL_SIGTERM) + erts_handle_signal_sigterm(); +#endif + /* Figure out timeout value */ timeout_time = (do_wait ? erts_check_next_timeout_time(esdp) @@ -1654,6 +1659,11 @@ ERTS_CIO_EXPORT(erts_check_io)(int do_wait) erts_do_break_handling(); #endif +#ifdef ERTS_SIGNAL_SIGTERM + if (ERTS_SIGNAL_SIGTERM) + erts_handle_signal_sigterm(); +#endif + if (poll_ret != 0) { erts_smp_atomic_set_nob(&pollset.in_poll_wait, 0); forget_removed(&pollset); |