diff options
| author | Sverker Eriksson <[email protected]> | 2012-02-23 12:13:31 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-02-23 12:19:42 +0100 |
| commit | 62a41d25361de2ee08970a3905c63c503d3c89a1 (patch) | |
| tree | 8acc8d513edb8110de52265604e145631657f047 /erts/emulator/beam/erl_process.c | |
| parent | 6d7073e33a8f326b8a37eaf5539aa322a06a732c (diff) | |
| download | otp-62a41d25361de2ee08970a3905c63c503d3c89a1.tar.gz otp-62a41d25361de2ee08970a3905c63c503d3c89a1.tar.bz2 otp-62a41d25361de2ee08970a3905c63c503d3c89a1.zip | |
erts: Refactor code loading with renaming
Rename lock_code_ix as seize_code_write_permission. Don't want to call
it a "lock" as it can be held between schedulings and different threads
and is not managed by lock checker.
Rename "activate" staging as "commit" staging. Why not be consistent
and use git terminology all the way.
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index aaee951107..a7707e9498 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -1178,7 +1178,7 @@ handle_code_ix_activation(ErtsAuxWorkData *awdp, erts_aint32_t aux_work) #endif erts_smp_proc_lock(p, ERTS_PROC_LOCK_STATUS); if (!ERTS_PROC_IS_EXITING(p)) { - erts_activate_staging_code_ix(); + erts_commit_staging_code_ix(); erts_resume(p, ERTS_PROC_LOCK_STATUS); erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS); } @@ -1186,7 +1186,7 @@ handle_code_ix_activation(ErtsAuxWorkData *awdp, erts_aint32_t aux_work) erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS); erts_abort_staging_code_ix(); } - erts_unlock_code_ix(); + erts_release_code_write_permission(); erts_smp_proc_dec_refc(p); return aux_work & ~ERTS_SSI_AUX_WORK_CODE_IX_ACTIVATION; } |