diff options
| author | Sverker Eriksson <[email protected]> | 2017-11-06 18:38:11 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-11-06 18:38:11 +0100 |
| commit | c4885e555f5c87bf52b78a7a89ddaf4767eb081b (patch) | |
| tree | e2b44935ff549ae317102d0d3a7085b90b9bb764 | |
| parent | de48cf9a757c329dda26875f8cf7dd7c4425fc04 (diff) | |
| parent | 64101035e025fc44dff5ba3d6ed4668c1e3a698f (diff) | |
| download | otp-c4885e555f5c87bf52b78a7a89ddaf4767eb081b.tar.gz otp-c4885e555f5c87bf52b78a7a89ddaf4767eb081b.tar.bz2 otp-c4885e555f5c87bf52b78a7a89ddaf4767eb081b.zip | |
Merge branch 'sverker/mend-do_call_trace'
* sverker/mend-do_call_trace:
erts: Fix lock checking in do_call_trace
| -rw-r--r-- | erts/emulator/beam/beam_bp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c index fe1e15701b..0832b3f374 100644 --- a/erts/emulator/beam/beam_bp.c +++ b/erts/emulator/beam/beam_bp.c @@ -998,7 +998,9 @@ do_call_trace(Process* c_p, ErtsCodeInfo* info, Eterm* reg, fixup_cp_before_trace(c_p, &return_to_trace); + ERTS_UNREQ_PROC_MAIN_LOCK(c_p); flags = erts_call_trace(c_p, info, ms, reg, local, &tracer); + ERTS_REQ_PROC_MAIN_LOCK(c_p); /* restore cp after potential fixup */ c_p->cp = cp_save; |