diff options
| author | Lukas Larsson <[email protected]> | 2016-10-26 12:18:21 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-10-26 12:18:21 +0200 |
| commit | a728202d3de71326cf96952ba90cd96f31537cca (patch) | |
| tree | b11f6e5a2746b0cff7f4145e9a36616c88802fc1 /erts/emulator/beam/erl_bif_trace.c | |
| parent | 1302b09c4aa0f944bdc0e3beeebb2cf84cc06c89 (diff) | |
| parent | 07fef73c1301664d76c04b1261c8f351b44510f6 (diff) | |
| download | otp-a728202d3de71326cf96952ba90cd96f31537cca.tar.gz otp-a728202d3de71326cf96952ba90cd96f31537cca.tar.bz2 otp-a728202d3de71326cf96952ba90cd96f31537cca.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_bif_trace.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_trace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c index 1a20cc911e..b1c2c427b0 100644 --- a/erts/emulator/beam/erl_bif_trace.c +++ b/erts/emulator/beam/erl_bif_trace.c @@ -510,7 +510,7 @@ start_trace(Process *c_p, ErtsTracer tracer, && !ERTS_TRACER_COMPARE(ERTS_TRACER(port), tracer)) { /* This tracee is already being traced, and not by the * tracer to be */ - if (erts_is_tracer_enabled(tracer, common)) { + if (erts_is_tracer_enabled(ERTS_TRACER(port), common)) { /* The tracer is still in use */ return 1; } @@ -713,8 +713,8 @@ Eterm erts_internal_trace_3(BIF_ALIST_3) Process* tracee_p = erts_pix2proc(i); if (! tracee_p) continue; - start_trace(p, tracer, &tracee_p->common, on, mask); - matches++; + if (!start_trace(p, tracer, &tracee_p->common, on, mask)) + matches++; } } if (ports || mods) { @@ -728,8 +728,8 @@ Eterm erts_internal_trace_3(BIF_ALIST_3) state = erts_atomic32_read_nob(&tracee_port->state); if (state & ERTS_PORT_SFLGS_DEAD) continue; - start_trace(p, tracer, &tracee_port->common, on, mask); - matches++; + if (!start_trace(p, tracer, &tracee_port->common, on, mask)) + matches++; } } } |