erts: Refactor naming regarding code_write_permission

The concept of code_write_permission is used by tracing as well
and is not specific to code_ix.

7 files changed, 34 insertions, 33 deletions

diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c
index dc06218e6e..58e0090a76 100644
--- a/erts/emulator/beam/beam_bp.c
+++ b/erts/emulator/beam/beam_bp.c
@@ -254,7 +254,7 @@ erts_consolidate_bp_data(BpFunctions* f, int local)
     Uint i;
     Uint n = f->matched;
 
-    ERTS_SMP_LC_ASSERT(erts_is_code_ix_locked());
+    ERTS_SMP_LC_ASSERT(erts_has_code_write_permission());
 
     for (i = 0; i < n; i++) {
 	consolidate_bp_data(fs[i].mod, fs[i].pc, local);
@@ -266,7 +266,7 @@ erts_consolidate_bif_bp_data(void)
 {
     int i;
 
-    ERTS_SMP_LC_ASSERT(erts_is_code_ix_locked());
+    ERTS_SMP_LC_ASSERT(erts_has_code_write_permission());
     for (i = 0; i < BIF_SIZE; i++) {
 	Export *ep = bif_export[i];
 	consolidate_bp_data(0, ep->code+3, 0);
@@ -1449,7 +1449,7 @@ set_function_break(BeamInstr *pc, Binary *match_spec, Uint break_flags,
     Uint common;
     ErtsBpIndex ix = erts_staging_bp_ix();
 
-    ERTS_SMP_LC_ASSERT(erts_is_code_ix_locked());
+    ERTS_SMP_LC_ASSERT(erts_has_code_write_permission());
     g = (GenericBp *) pc[-4];
     if (g == 0) {
 	int i;
@@ -1565,7 +1565,7 @@ clear_function_break(BeamInstr *pc, Uint break_flags)
     Uint common;
     ErtsBpIndex ix = erts_staging_bp_ix();
 
-    ERTS_SMP_LC_ASSERT(erts_is_code_ix_locked());
+    ERTS_SMP_LC_ASSERT(erts_has_code_write_permission());
 
     if ((g = (GenericBp *) pc[-4]) == 0) {
 	return 1;
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index d3f55a2ba4..a0717fcf75 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -756,7 +756,7 @@ erts_finish_loading(Binary* magic, Process* c_p,
      * table which is not protected by any locks.
      */
 
-    ERTS_SMP_LC_ASSERT(erts_initialized == 0 || erts_is_code_ix_locked() ||
+    ERTS_SMP_LC_ASSERT(erts_initialized == 0 || erts_has_code_write_permission() ||
 		       erts_smp_thr_progress_is_blocking());
 
     /*
diff --git a/erts/emulator/beam/code_ix.c b/erts/emulator/beam/code_ix.c
index 8025058ee0..91679bfb4e 100644
--- a/erts/emulator/beam/code_ix.c
+++ b/erts/emulator/beam/code_ix.c
@@ -36,13 +36,13 @@
 erts_smp_atomic32_t the_active_code_index;
 erts_smp_atomic32_t the_staging_code_index;
 
-static int the_code_ix_lock = 0;
-struct code_ix_queue_item {
+static int is_code_write_locked = 0;
+struct code_write_queue_item {
     Process *p;
-    struct code_ix_queue_item* next;
+    struct code_write_queue_item* next;
 };
-static struct code_ix_queue_item* the_code_ix_queue = NULL;
-static erts_smp_mtx_t the_code_ix_queue_lock;
+static struct code_write_queue_item* code_write_queue = NULL;
+static erts_smp_mtx_t code_write_permission_mtx;
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
 static erts_tsd_key_t has_code_write_permission;
@@ -56,7 +56,7 @@ void erts_code_ix_init(void)
      */
     erts_smp_atomic32_init_nob(&the_active_code_index, 0);
     erts_smp_atomic32_init_nob(&the_staging_code_index, 0);
-    erts_smp_mtx_init(&the_code_ix_queue_lock, "code_ix_queue");
+    erts_smp_mtx_init(&code_write_permission_mtx, "code_write_permission");
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_tsd_key_create(&has_code_write_permission);
 #endif
@@ -115,52 +115,53 @@ int erts_try_seize_code_write_permission(Process* c_p)
     ASSERT(!erts_smp_thr_progress_is_blocking()); /* to avoid deadlock */
 #endif
 
-    erts_smp_mtx_lock(&the_code_ix_queue_lock);
-    success = !the_code_ix_lock;
+    erts_smp_mtx_lock(&code_write_permission_mtx);
+    success = !is_code_write_locked;
     if (success) {
-	the_code_ix_lock = 1;
+	is_code_write_locked = 1;
 #ifdef ERTS_ENABLE_LOCK_CHECK
 	erts_tsd_set(has_code_write_permission, (void *) 1);
 #endif
     }
     else { /* Already locked */
-	struct code_ix_queue_item* qitem;
+	struct code_write_queue_item* qitem;
+	ERTS_SMP_LC_ASSERT(!erts_tsd_get(has_code_write_permission));
 	qitem = erts_alloc(ERTS_ALC_T_CODE_IX_LOCK_Q, sizeof(*qitem));
 	qitem->p = c_p;
 	erts_smp_proc_inc_refc(c_p);
-	qitem->next = the_code_ix_queue;
-	the_code_ix_queue = qitem;
+	qitem->next = code_write_queue;
+	code_write_queue = qitem;
 	erts_suspend(c_p, ERTS_PROC_LOCK_MAIN, NULL);
     }
-   erts_smp_mtx_unlock(&the_code_ix_queue_lock);
+   erts_smp_mtx_unlock(&code_write_permission_mtx);
    return success;
 }
 
 void erts_release_code_write_permission(void)
 {
-    ERTS_SMP_LC_ASSERT(erts_is_code_ix_locked());
-    erts_smp_mtx_lock(&the_code_ix_queue_lock);
-    while (the_code_ix_queue != NULL) { /* unleash the entire herd */
-	struct code_ix_queue_item* qitem = the_code_ix_queue;
+    erts_smp_mtx_lock(&code_write_permission_mtx);
+    ERTS_SMP_LC_ASSERT(erts_has_code_write_permission());
+    while (code_write_queue != NULL) { /* unleash the entire herd */
+	struct code_write_queue_item* qitem = code_write_queue;
 	erts_smp_proc_lock(qitem->p, ERTS_PROC_LOCK_STATUS);
 	if (!ERTS_PROC_IS_EXITING(qitem->p)) {
 	    erts_resume(qitem->p, ERTS_PROC_LOCK_STATUS);
 	}
 	erts_smp_proc_unlock(qitem->p, ERTS_PROC_LOCK_STATUS);
-	the_code_ix_queue = qitem->next;
+	code_write_queue = qitem->next;
 	erts_smp_proc_dec_refc(qitem->p);
 	erts_free(ERTS_ALC_T_CODE_IX_LOCK_Q, qitem);
     }
-    the_code_ix_lock = 0;
+    is_code_write_locked = 0;
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_tsd_set(has_code_write_permission, (void *) 0);
 #endif
-    erts_smp_mtx_unlock(&the_code_ix_queue_lock);
+    erts_smp_mtx_unlock(&code_write_permission_mtx);
 }
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
-int erts_is_code_ix_locked(void)
+int erts_has_code_write_permission(void)
 {
-    return the_code_ix_lock && erts_tsd_get(has_code_write_permission);
+    return is_code_write_locked && erts_tsd_get(has_code_write_permission);
 }
 #endif
diff --git a/erts/emulator/beam/code_ix.h b/erts/emulator/beam/code_ix.h
index 6b2680044e..bc10e956f5 100644
--- a/erts/emulator/beam/code_ix.h
+++ b/erts/emulator/beam/code_ix.h
@@ -116,7 +116,7 @@ void erts_commit_staging_code_ix(void);
 void erts_abort_staging_code_ix(void);
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
-int erts_is_code_ix_locked(void);
+int erts_has_code_write_permission(void);
 #endif
 
 
diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c
index 764548d884..8d64397366 100644
--- a/erts/emulator/beam/erl_bif_trace.c
+++ b/erts/emulator/beam/erl_bif_trace.c
@@ -406,7 +406,7 @@ erts_get_default_trace_pattern(int *trace_pattern_is_on,
 			       struct trace_pattern_flags *trace_pattern_flags,
 			       Eterm *meta_tracer_pid)
 {
-    ERTS_SMP_LC_ASSERT(erts_is_code_ix_locked() ||
+    ERTS_SMP_LC_ASSERT(erts_has_code_write_permission() ||
 		       erts_smp_thr_progress_is_blocking());
     if (trace_pattern_is_on)
 	*trace_pattern_is_on = erts_default_trace_pattern_is_on;
@@ -422,7 +422,7 @@ erts_get_default_trace_pattern(int *trace_pattern_is_on,
 
 int erts_is_default_trace_enabled(void)
 {
-    ERTS_SMP_LC_ASSERT(erts_is_code_ix_locked() ||
+    ERTS_SMP_LC_ASSERT(erts_has_code_write_permission() ||
 		       erts_smp_thr_progress_is_blocking());
     return erts_default_trace_pattern_is_on;
 }
@@ -1556,7 +1556,7 @@ erts_set_trace_pattern(Process*p, Eterm* mfa, int specified,
 int
 erts_finish_breakpointing(void)
 {
-    ERTS_SMP_LC_ASSERT(erts_is_code_ix_locked());
+    ERTS_SMP_LC_ASSERT(erts_has_code_write_permission());
 
     /*
      * Memory barriers will be issued for all processes *before*
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c
index 11fed4079d..314d2f6a9c 100644
--- a/erts/emulator/beam/erl_lock_check.c
+++ b/erts/emulator/beam/erl_lock_check.c
@@ -93,7 +93,7 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"proc_msgq",				"pid"			},
     {	"dist_entry",				"address"		},
     {	"dist_entry_links",			"address"		},
-    {   "code_ix_queue",                        NULL                    },
+    {   "code_write_permission",                NULL                    },
     {	"proc_status",				"pid"			},
     {	"proc_tab",				NULL			},
     {   "ports_snapshot",                       NULL                    },
diff --git a/erts/emulator/beam/module.c b/erts/emulator/beam/module.c
index 1ef71cda79..01856007ee 100644
--- a/erts/emulator/beam/module.c
+++ b/erts/emulator/beam/module.c
@@ -144,7 +144,7 @@ erts_put_module(Eterm mod)
 
     ASSERT(is_atom(mod));
     ERTS_SMP_LC_ASSERT(erts_initialized == 0
-		       || erts_is_code_ix_locked());
+		       || erts_has_code_write_permission());
 
     mod_tab = &module_tables[erts_staging_code_ix()];
     e.module = atom_val(mod);