From a23f25a3014dbad01d2016dc4e6d6df9d59ba64c Mon Sep 17 00:00:00 2001 From: Sverker Eriksson Date: Tue, 24 Jan 2012 15:42:02 +0100 Subject: 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). --- erts/emulator/beam/module.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'erts/emulator/beam/module.c') 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); -- cgit v1.2.3