diff options
| author | Lukas Larsson <[email protected]> | 2019-03-22 13:29:06 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-03-25 16:34:11 +0100 |
| commit | 9eb5e4dc76690ab4059bf94848e41e87cf5606b1 (patch) | |
| tree | 3c9cd25d05dab7026828c59f1669df5804fd03a2 /erts | |
| parent | 80beed3bebbdacf8acdb6cc93992c4a473dac492 (diff) | |
| download | otp-9eb5e4dc76690ab4059bf94848e41e87cf5606b1.tar.gz otp-9eb5e4dc76690ab4059bf94848e41e87cf5606b1.tar.bz2 otp-9eb5e4dc76690ab4059bf94848e41e87cf5606b1.zip | |
erts: Always do trylock on proc locks when crash dumping
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/break.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c index 303ab9d9b7..06d8c7cda8 100644 --- a/erts/emulator/beam/break.c +++ b/erts/emulator/beam/break.c @@ -75,6 +75,7 @@ port_info(fmtfn_t to, void *to_arg) void process_info(fmtfn_t to, void *to_arg) { + ErtsSchedulerData *esdp = erts_get_scheduler_data(); int i, max = erts_ptab_max(&erts_proc); for (i = 0; i < max; i++) { Process *p = erts_pix2proc(i); @@ -82,8 +83,11 @@ process_info(fmtfn_t to, void *to_arg) /* Do not include processes with no heap, * they are most likely just created and has invalid data */ - if (p->heap != NULL) - print_process_info(to, to_arg, p, 0); + if (p->heap != NULL) { + ErtsProcLocks locks = (p == esdp->current_process || + p == esdp->free_process) ? ERTS_PROC_LOCK_MAIN : 0; + print_process_info(to, to_arg, p, locks); + } } } @@ -221,7 +225,7 @@ static int doit_print_monitor(ErtsMonitor *mon, void *vpcontext, Sint reds) } return 1; } - + /* Display info about an individual Erlang process */ void print_process_info(fmtfn_t to, void *to_arg, Process *p, ErtsProcLocks orig_locks) @@ -254,7 +258,7 @@ print_process_info(fmtfn_t to, void *to_arg, Process *p, ErtsProcLocks orig_lock if (!(locks & ERTS_PROC_LOCK_MAIN)) { locks |= ERTS_PROC_LOCK_MAIN; - if (ERTS_IS_CRASH_DUMPING && running) { + if (ERTS_IS_CRASH_DUMPING) { if (erts_proc_trylock(p, locks)) { /* crash dumping and main lock taken, this probably means that the process is doing a GC on a dirty-scheduler... so we cannot |