diff options
| author | Lukas Larsson <[email protected]> | 2017-08-16 17:37:01 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-08-16 17:38:36 +0200 |
| commit | ddb348c31e75bfa895c0959ef1e16c9e43917e8a (patch) | |
| tree | 3e38581a35fec11b4fb794f3486c02e717c5961d /erts/emulator/beam/erl_process.c | |
| parent | 856eb2e75ec0ed37c7dedaeb0772803988ffee82 (diff) | |
| parent | 33b3697ae98147e0470d8d08bca6c51042dcb3d1 (diff) | |
| download | otp-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
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 18 |
1 files changed, 11 insertions, 7 deletions
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: |