diff options
| author | Rickard Green <[email protected]> | 2011-11-13 21:42:11 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-11-13 21:42:11 +0100 |
| commit | 73ee2e00fe0389d0362e89a74d1909510da9e0fd (patch) | |
| tree | b75c2a8b4b77885c6864ffd4f2d4825cb781c103 /erts/emulator/beam/erl_bif_timer.c | |
| parent | c12befbdc957f7f166598c6d5143ce27a0d10fa8 (diff) | |
| parent | bc5818cfdd56e19a16357f4443d80a56426aa134 (diff) | |
| download | otp-73ee2e00fe0389d0362e89a74d1909510da9e0fd.tar.gz otp-73ee2e00fe0389d0362e89a74d1909510da9e0fd.tar.bz2 otp-73ee2e00fe0389d0362e89a74d1909510da9e0fd.zip | |
Merge branch 'rickard/thr-progress-block/OTP-9631'
* rickard/thr-progress-block/OTP-9631:
Replace system block with thread progress block
Diffstat (limited to 'erts/emulator/beam/erl_bif_timer.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_timer.c b/erts/emulator/beam/erl_bif_timer.c index db771bd216..a922a33da3 100644 --- a/erts/emulator/beam/erl_bif_timer.c +++ b/erts/emulator/beam/erl_bif_timer.c @@ -26,6 +26,7 @@ #include "bif.h" #include "error.h" #include "big.h" +#include "erl_thr_progress.h" /**************************************************************************** ** BIF Timer support @@ -686,7 +687,7 @@ erts_bif_timer_foreach(void (*func)(Eterm, Eterm, ErlHeapFragment *, void *), { int i; - ERTS_SMP_LC_ASSERT(erts_smp_is_system_blocked(0)); + ERTS_SMP_LC_ASSERT(erts_smp_thr_progress_is_blocking()); for (i = 0; i < TIMER_HASH_VEC_SZ; i++) { ErtsBifTimer *btm; |