diff options
| author | Rickard Green <[email protected]> | 2015-06-22 20:28:53 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-06-22 20:28:53 +0200 |
| commit | c57c5c83acb3a21b52304bc53cbdf32e0dda3690 (patch) | |
| tree | b08b3b69dd3e317bca9c456d5b36df851c7ba009 /erts | |
| parent | fa94e6bd6887284e59b5a187de99e6a37ca6e8d1 (diff) | |
| parent | 37f143e9e16e89d753b0e5e4415968dbcd5f6b65 (diff) | |
| download | otp-c57c5c83acb3a21b52304bc53cbdf32e0dda3690.tar.gz otp-c57c5c83acb3a21b52304bc53cbdf32e0dda3690.tar.bz2 otp-c57c5c83acb3a21b52304bc53cbdf32e0dda3690.zip | |
Merge branch 'rickard/debug-fix/OTP-12650'
* rickard/debug-fix/OTP-12650:
Fix node/dist refc count
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_hl_timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c index 907491f616..51a0d68247 100644 --- a/erts/emulator/beam/erl_hl_timer.c +++ b/erts/emulator/beam/erl_hl_timer.c @@ -2966,7 +2966,7 @@ debug_callback_timer_foreach_list(ErtsHLTimer *tmr, void *vdfct) = (ErtsDebugForeachCallbackTimer *) vdfct; if ((tmr->head.roflgs & ERTS_TMR_ROFLG_CALLBACK) - && (tmr->receiver.callback && dfct->tclbk)) + && (tmr->receiver.callback == dfct->tclbk)) (*dfct->func)(dfct->arg, tmr->timeout, tmr->head.u.arg); @@ -2984,7 +2984,7 @@ debug_callback_timer_foreach(ErtsHLTimer *tmr, void *vdfct) vdfct); if ((tmr->head.roflgs & ERTS_TMR_ROFLG_CALLBACK) - && (tmr->receiver.callback && dfct->tclbk)) + && (tmr->receiver.callback == dfct->tclbk)) (*dfct->func)(dfct->arg, tmr->timeout, tmr->head.u.arg); @@ -3037,7 +3037,7 @@ erts_debug_callback_timer_foreach(void (*tclbk)(void *), debug_callback_timer_foreach(srv->yield.root, (void *) &dfct); - time_rbt_foreach(srv->btm_tree, + time_rbt_foreach(srv->time_tree, debug_callback_timer_foreach, (void *) &dfct); } |