diff options
| author | Rickard Green <[email protected]> | 2018-04-26 14:27:11 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-04-26 14:27:11 +0200 |
| commit | 0183ddffb112d898d9b8c0396afa7f2210b9e169 (patch) | |
| tree | 7d0c40190db5bfc80a0da6f9640077d10bfaa237 /erts/emulator/beam/erl_proc_sig_queue.c | |
| parent | b22051714857713e0f4f43f77ea02ec50532b2df (diff) | |
| parent | 630d7e7df458490ae4d5c263e096851e14349537 (diff) | |
| download | otp-0183ddffb112d898d9b8c0396afa7f2210b9e169.tar.gz otp-0183ddffb112d898d9b8c0396afa7f2210b9e169.tar.bz2 otp-0183ddffb112d898d9b8c0396afa7f2210b9e169.zip | |
Merge branch 'rickard/process_info/OTP-14966'
* rickard/process_info/OTP-14966:
Restore merge of signal queues in queue_messages() if main lock is held
Fix message tracing
Diffstat (limited to 'erts/emulator/beam/erl_proc_sig_queue.c')
| -rw-r--r-- | erts/emulator/beam/erl_proc_sig_queue.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_proc_sig_queue.c b/erts/emulator/beam/erl_proc_sig_queue.c index bcc4fc6d9b..2d59724aad 100644 --- a/erts/emulator/beam/erl_proc_sig_queue.c +++ b/erts/emulator/beam/erl_proc_sig_queue.c @@ -2391,8 +2391,9 @@ destroy_process_info_request(Process *c_p, ErtsProcessInfoSig *pisig) } static int -handle_process_info(Process *c_p, ErtsMessage *sig, - ErtsMessage ***next_nm_sig, int is_alive) +handle_process_info(Process *c_p, ErtsSigRecvTracing *tracing, + ErtsMessage *sig, ErtsMessage ***next_nm_sig, + int is_alive) { ErtsProcessInfoSig *pisig = (ErtsProcessInfoSig *) sig; Uint reds = 0; @@ -2416,7 +2417,11 @@ handle_process_info(Process *c_p, ErtsMessage *sig, * Move messages part of message queue into inner * signal queue... */ + ASSERT(tracing); + if (*next_nm_sig != &c_p->sig_qs.cont) { + if (*next_nm_sig == tracing->messages.next) + tracing->messages.next = &c_p->sig_qs.cont; *c_p->sig_qs.last = c_p->sig_qs.cont; c_p->sig_qs.last = *next_nm_sig; @@ -2877,7 +2882,7 @@ erts_proc_sig_handle_incoming(Process *c_p, erts_aint32_t *statep, case ERTS_SIG_Q_OP_PROCESS_INFO: ERTS_PROC_SIG_HDBG_PRIV_CHKQ(c_p, &tracing, next_nm_sig); - handle_process_info(c_p, sig, next_nm_sig, !0); + handle_process_info(c_p, &tracing, sig, next_nm_sig, !0); ERTS_PROC_SIG_HDBG_PRIV_CHKQ(c_p, &tracing, next_nm_sig); break; @@ -3198,7 +3203,7 @@ erts_proc_sig_handle_exit(Process *c_p, int *redsp) break; case ERTS_SIG_Q_OP_PROCESS_INFO: - handle_process_info(c_p, sig, next_nm_sig, 0); + handle_process_info(c_p, NULL, sig, next_nm_sig, 0); break; case ERTS_SIG_Q_OP_TRACE_CHANGE_STATE: |