aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-03-29 19:25:45 +0100
committerErlang/OTP <[email protected]>2019-03-29 19:25:45 +0100
commitd1330131457f117e12f0431533ea6a3152ea0536 (patch)
tree7b2b50e220be4d95be876b1c425d7dca4cc1f687
parent7e6fff1e849998a3dd747b4d3cf35f39cb896aa0 (diff)
parent4a67e657845ac7f941ddfb9f64fce226324e372c (diff)
downloadotp-d1330131457f117e12f0431533ea6a3152ea0536.tar.gz
otp-d1330131457f117e12f0431533ea6a3152ea0536.tar.bz2
otp-d1330131457f117e12f0431533ea6a3152ea0536.zip
Merge branch 'john/erts/seq_trace-sigq-clearing/OTP-15704' into maint-21
* 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: