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_nif.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_nif.c')
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index a0182630b9..bdbeb3bcf6 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -1522,7 +1522,7 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2) } lib_name[len] = '\0'; - if (!erts_try_lock_code_ix(BIF_P)) { + if (!erts_try_seize_code_write_permission(BIF_P)) { erts_free(ERTS_ALC_T_TMP, lib_name); ERTS_BIF_YIELD2(bif_export[BIF_load_nif_2], BIF_P, BIF_ARG_1, BIF_ARG_2); @@ -1722,7 +1722,7 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2) erts_smp_thr_progress_unblock(); erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_MAIN); - erts_unlock_code_ix(); + erts_release_code_write_permission(); erts_free(ERTS_ALC_T_TMP, lib_name); if (reload_warning) { |