diff options
| author | Rickard Green <[email protected]> | 2015-06-10 18:07:33 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-06-10 18:07:33 +0200 |
| commit | c8825f09f5df654ab89d417af827bfaa7f185066 (patch) | |
| tree | d9255a7a58e01421f3571f4cd9074b557e8d3567 /erts/emulator/beam/erl_bif_info.c | |
| parent | d395b5c5559a18e44258ca46e4b8703189d18067 (diff) | |
| parent | ea84ab6c03994f8d6d9f07d8740f0547f8a3cb51 (diff) | |
| download | otp-c8825f09f5df654ab89d417af827bfaa7f185066.tar.gz otp-c8825f09f5df654ab89d417af827bfaa7f185066.tar.bz2 otp-c8825f09f5df654ab89d417af827bfaa7f185066.zip | |
Merge branch 'rickard/timer-improvement/OTP-12650'
* rickard/timer-improvement/OTP-12650:
Callback timer
Disable accessor timer option
Aux work flag descriptions
Fix test cases
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index f74aea80a7..ae8a5c266a 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -4050,7 +4050,14 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2) } else if (ERTS_IS_ATOM_STR("wait", BIF_ARG_1)) { if (ERTS_IS_ATOM_STR("deallocations", BIF_ARG_2)) { - if (erts_debug_wait_deallocations(BIF_P)) { + int flag = ERTS_DEBUG_WAIT_COMPLETED_DEALLOCATIONS; + if (erts_debug_wait_completed(BIF_P, flag)) { + ERTS_BIF_YIELD_RETURN(BIF_P, am_ok); + } + } + if (ERTS_IS_ATOM_STR("timer_cancellations", BIF_ARG_2)) { + int flag = ERTS_DEBUG_WAIT_COMPLETED_TIMER_CANCELLATIONS; + if (erts_debug_wait_completed(BIF_P, flag)) { ERTS_BIF_YIELD_RETURN(BIF_P, am_ok); } } |