diff options
| author | Sverker Eriksson <[email protected]> | 2012-02-02 11:47:18 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-02-21 12:23:06 +0100 |
| commit | e148e9fc3e11eb6e08e2dc94a468dc433864b11b (patch) | |
| tree | 285b32baaf5cef8c75b2c5331c05d745246740ce /erts/emulator/beam/erl_bif_trace.c | |
| parent | 9dbd1dbf260c41878704728adc533ace1a27c1ff (diff) | |
| download | otp-e148e9fc3e11eb6e08e2dc94a468dc433864b11b.tar.gz otp-e148e9fc3e11eb6e08e2dc94a468dc433864b11b.tar.bz2 otp-e148e9fc3e11eb6e08e2dc94a468dc433864b11b.zip | |
erts: Fix tracing bug for new non-blocking load
Made on_load-tracing always set after commit on active
code_ix when system is still blocked.
Bug caused cprof_SUITE:on_load to fail.
Diffstat (limited to 'erts/emulator/beam/erl_bif_trace.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_trace.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c index 203ba9004b..c92e0400e0 100644 --- a/erts/emulator/beam/erl_bif_trace.c +++ b/erts/emulator/beam/erl_bif_trace.c @@ -333,8 +333,7 @@ trace_pattern(Process* p, Eterm MFA, Eterm Pattern, Eterm flaglist) matches = erts_set_trace_pattern(mfa, specified, match_prog_set, match_prog_set, - on, flags, meta_tracer_pid, - erts_active_code_ix()); + on, flags, meta_tracer_pid); MatchSetUnref(match_prog_set); done: @@ -1335,9 +1334,9 @@ int erts_set_trace_pattern(Eterm* mfa, int specified, Binary* match_prog_set, Binary *meta_match_prog_set, int on, struct trace_pattern_flags flags, - Eterm meta_tracer_pid, - ErtsCodeIndex code_ix) + Eterm meta_tracer_pid) { + const ErtsCodeIndex code_ix = erts_active_code_ix(); int matches = 0; int i; |