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/export.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/export.c')
| -rw-r--r-- | erts/emulator/beam/export.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/export.c b/erts/emulator/beam/export.c index 5bc402fe22..18d62dac1d 100644 --- a/erts/emulator/beam/export.c +++ b/erts/emulator/beam/export.c @@ -208,7 +208,8 @@ erts_export_put(Eterm mod, Eterm func, unsigned int arity) Export e; int ix; - ERTS_SMP_LC_ASSERT(erts_initialized == 0 || erts_smp_is_system_blocked(0)); + ERTS_SMP_LC_ASSERT(erts_initialized == 0 + || erts_smp_thr_progress_is_blocking()); ASSERT(is_atom(mod)); ASSERT(is_atom(func)); e.code[0] = mod; @@ -265,7 +266,8 @@ erts_export_consolidate(void) HashInfo hi; #endif - ERTS_SMP_LC_ASSERT(erts_initialized == 0 || erts_smp_is_system_blocked(0)); + ERTS_SMP_LC_ASSERT(erts_initialized == 0 + || erts_smp_thr_progress_is_blocking()); export_write_lock(); erts_index_merge(&secondary_export_table, &export_table); |