aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-08-16 17:37:01 +0200
committerLukas Larsson <[email protected]>2017-08-16 17:38:36 +0200
commitddb348c31e75bfa895c0959ef1e16c9e43917e8a (patch)
tree3e38581a35fec11b4fb794f3486c02e717c5961d
parent856eb2e75ec0ed37c7dedaeb0772803988ffee82 (diff)
parent33b3697ae98147e0470d8d08bca6c51042dcb3d1 (diff)
downloadotp-ddb348c31e75bfa895c0959ef1e16c9e43917e8a.tar.gz
otp-ddb348c31e75bfa895c0959ef1e16c9e43917e8a.tar.bz2
otp-ddb348c31e75bfa895c0959ef1e16c9e43917e8a.zip
Merge branch 'maint'
Conflicts: erts/emulator/beam/erl_nif.c erts/emulator/beam/erl_process.c
-rw-r--r--erts/emulator/beam/erl_nif.c4
-rw-r--r--erts/emulator/beam/erl_process.c18
2 files changed, 15 insertions, 7 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 9ffb53d532..05bcf73451 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -587,6 +587,10 @@ int erts_flush_trace_messages(Process *c_p, ErtsProcLocks c_p_locks)
ErlTraceMessageQueue *msgq, **last_msgq;
int reds = 0;
+ /* Only one thread at a time is allowed to flush trace messages,
+ so we require the main lock to be held when doing the flush */
+ ERTS_CHK_HAVE_ONLY_MAIN_PROC_LOCK(c_p);
+
erts_proc_lock(c_p, ERTS_PROC_LOCK_TRACE);
msgq = c_p->trace_msg_q;
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 88b2bda59c..0d4f7305d0 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -11403,9 +11403,11 @@ flush_dirty_trace_messages(void *vpid)
erts_free(ERTS_ALC_T_DIRTY_SL, vpid);
#endif
- proc = erts_proc_lookup(pid);
- if (proc)
- (void) erts_flush_trace_messages(proc, 0);
+ proc = erts_pid2proc_opt(NULL, 0, pid, ERTS_PROC_LOCK_MAIN, 0);
+ if (proc) {
+ (void) erts_flush_trace_messages(proc, ERTS_PROC_LOCK_MAIN);
+ erts_proc_unlock(proc, ERTS_PROC_LOCK_MAIN);
+ }
}
#endif /* ERTS_DIRTY_SCHEDULERS */
@@ -13667,16 +13669,18 @@ erts_continue_exit_process(Process *p)
have none here */
}
- erts_flush_trace_messages(p, 0);
+ erts_proc_lock(p, ERTS_PROC_LOCK_MAIN);
+ ERTS_CHK_HAVE_ONLY_MAIN_PROC_LOCK(p);
+
+#ifdef ERTS_SMP
+ erts_flush_trace_messages(p, ERTS_PROC_LOCK_MAIN);
+#endif
ERTS_TRACER_CLEAR(&ERTS_TRACER(p));
if (!delay_del_proc)
delete_process(p);
- erts_proc_lock(p, ERTS_PROC_LOCK_MAIN);
- ERTS_CHK_HAVE_ONLY_MAIN_PROC_LOCK(p);
-
return;
yield: