aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-03-27 17:01:55 +0100
committerJohn Högberg <[email protected]>2019-03-27 17:01:55 +0100
commit5cf819d51eec27365692d2783259129dce0395d7 (patch)
treeaba57e292a11e600908d000e7294b3f1cfbce1ac
parent6b563c556828b40623967430cfdb0ad99d70ad69 (diff)
parent4a67e657845ac7f941ddfb9f64fce226324e372c (diff)
downloadotp-5cf819d51eec27365692d2783259129dce0395d7.tar.gz
otp-5cf819d51eec27365692d2783259129dce0395d7.tar.bz2
otp-5cf819d51eec27365692d2783259129dce0395d7.zip
Merge branch 'john/erts/seq_trace-sigq-clearing/OTP-15704' into maint
* john/erts/seq_trace-sigq-clearing/OTP-15704: erts: Handle all signal types when clearing seq_trace token
-rw-r--r--erts/emulator/beam/erl_proc_sig_queue.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_proc_sig_queue.c b/erts/emulator/beam/erl_proc_sig_queue.c
index c95b7057fd..d475a0a634 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.c
+++ b/erts/emulator/beam/erl_proc_sig_queue.c
@@ -3790,6 +3790,9 @@ clear_seq_trace_token(ErtsMessage *sig)
case ERTS_MON_TYPE_PROC:
case ERTS_MON_TYPE_DIST_PROC:
case ERTS_MON_TYPE_NODE:
+ case ERTS_MON_TYPE_NODES:
+ case ERTS_MON_TYPE_SUSPEND:
+ case ERTS_MON_TYPE_TIME_OFFSET:
break;
default:
ERTS_INTERNAL_ERROR("Unexpected sig type");
@@ -3806,6 +3809,11 @@ clear_seq_trace_token(ErtsMessage *sig)
case ERTS_SIG_Q_OP_LINK:
case ERTS_SIG_Q_OP_UNLINK:
case ERTS_SIG_Q_OP_TRACE_CHANGE_STATE:
+ case ERTS_SIG_Q_OP_GROUP_LEADER:
+ case ERTS_SIG_Q_OP_IS_ALIVE:
+ case ERTS_SIG_Q_OP_PROCESS_INFO:
+ case ERTS_SIG_Q_OP_SYNC_SUSPEND:
+ case ERTS_SIG_Q_OP_RPC:
break;
default: