aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/module.c
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2012-01-24 15:42:02 +0100
committerSverker Eriksson <[email protected]>2012-02-21 12:23:04 +0100
commita23f25a3014dbad01d2016dc4e6d6df9d59ba64c (patch)
tree52c142a4d78eddcde0fdb526d531239e0638f6f3 /erts/emulator/beam/module.c
parent72cab3a723925d0e369466d7de7567d8482b1318 (diff)
downloadotp-a23f25a3014dbad01d2016dc4e6d6df9d59ba64c.tar.gz
otp-a23f25a3014dbad01d2016dc4e6d6df9d59ba64c.tar.bz2
otp-a23f25a3014dbad01d2016dc4e6d6df9d59ba64c.zip
erts: Rename "loader" code_ix as "staging" code_ix
Staging is a better and more general name as does not necessary need to involve code loading (can be deletion, tracing, etc).
Diffstat (limited to 'erts/emulator/beam/module.c')
-rw-r--r--erts/emulator/beam/module.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/erts/emulator/beam/module.c b/erts/emulator/beam/module.c
index f326aecebf..b0a3bd1fab 100644
--- a/erts/emulator/beam/module.c
+++ b/erts/emulator/beam/module.c
@@ -129,7 +129,7 @@ erts_put_module(Eterm mod)
|| erts_is_code_ix_locked()
|| erts_smp_thr_progress_is_blocking());
- mod_tab = &module_tables[erts_loader_code_ix()];
+ mod_tab = &module_tables[erts_staging_code_ix()];
e.module = atom_val(mod);
return (Module*) index_put_entry(mod_tab, (void*) &e);
}
@@ -155,10 +155,10 @@ static ErtsCodeIndex dbg_load_code_ix = 0;
static int entries_at_start_load = 0;
-void module_start_load(void)
+void module_start_staging(void)
{
IndexTable* src = &module_tables[erts_active_code_ix()];
- IndexTable* dst = &module_tables[erts_loader_code_ix()];
+ IndexTable* dst = &module_tables[erts_staging_code_ix()];
Module* src_mod;
Module* dst_mod;
int i;
@@ -191,15 +191,15 @@ void module_start_load(void)
}
entries_at_start_load = dst->entries;
- IF_DEBUG(dbg_load_code_ix = erts_loader_code_ix());
+ IF_DEBUG(dbg_load_code_ix = erts_staging_code_ix());
}
-void module_end_load(int commit)
+void module_end_staging(int commit)
{
- ASSERT(dbg_load_code_ix == erts_loader_code_ix());
+ ASSERT(dbg_load_code_ix == erts_staging_code_ix());
if (!commit) { /* abort */
- IndexTable* tab = &module_tables[erts_loader_code_ix()];
+ IndexTable* tab = &module_tables[erts_staging_code_ix()];
ASSERT(entries_at_start_load <= tab->entries);
index_erase_latest_from(tab, entries_at_start_load);