erts: Refactor code loading to use erts_schedule_thr_prgr_later_op

3 files changed, 39 insertions, 57 deletions

diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c
index 94f8edf165..585d1fd6c3 100644
--- a/erts/emulator/beam/beam_bif_load.c
+++ b/erts/emulator/beam/beam_bif_load.c
@@ -148,6 +148,15 @@ struct m {
 };
 
 static Eterm staging_epilogue(Process* c_p, int, Eterm res, int, struct m*, int);
+#ifdef ERTS_SMP
+static void smp_code_ix_commiter(void*);
+
+static struct /* Protected by code_write_permission */
+{
+    Process* stager;
+    ErtsThrPrgrLaterOp lop;
+}commiter_state;
+#endif
 
 static Eterm
 exception_list(Process* p, Eterm tag, struct m* mp, Sint exceptions)
@@ -347,7 +356,6 @@ staging_epilogue(Process* c_p, int commit, Eterm res, int is_blocking,
     }
 #ifdef ERTS_SMP
     else {
-	ErtsThrPrgrVal later;
 	ASSERT(is_value(res));
 
 	if (loaded) {
@@ -356,17 +364,17 @@ staging_epilogue(Process* c_p, int commit, Eterm res, int is_blocking,
 	erts_end_staging_code_ix();
 	/*
 	 * Now we must wait for all schedulers to do a memory barrier before
-	 * we can activate and let them access the new staged code. This allows
+	 * we can commit and let them access the new staged code. This allows
 	 * schedulers to read active code_ix in a safe way while executing
 	 * without any memory barriers at all. 
 	 */
-    
-	later = erts_thr_progress_later(c_p->scheduler_data);
-	erts_thr_progress_wakeup(c_p->scheduler_data, later);
-	erts_notify_code_ix_activation(c_p, later);
+	ASSERT(commiter_state.stager == NULL);
+	commiter_state.stager = c_p;
+	erts_schedule_thr_prgr_later_op(smp_code_ix_commiter, NULL, &commiter_state.lop);
+	erts_smp_proc_inc_refc(c_p);
 	erts_suspend(c_p, ERTS_PROC_LOCK_MAIN, NULL);
 	/*
-	 * handle_code_ix_activation() will do the rest "later"
+	 * smp_code_ix_commiter() will do the rest "later"
 	 * and resume this process to return 'res'.  
 	 */
 	ERTS_BIF_YIELD_RETURN(c_p, res);
@@ -374,6 +382,28 @@ staging_epilogue(Process* c_p, int commit, Eterm res, int is_blocking,
 #endif
 }
 
+
+#ifdef ERTS_SMP
+static void smp_code_ix_commiter(void* null)
+{
+    Process* p = commiter_state.stager;
+
+    erts_commit_staging_code_ix();
+    erts_smp_proc_lock(p, ERTS_PROC_LOCK_STATUS);
+    if (!ERTS_PROC_IS_EXITING(p)) {
+	erts_resume(p, ERTS_PROC_LOCK_STATUS);
+    }
+    erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+    erts_smp_proc_dec_refc(p);
+#ifdef DEBUG
+    commiter_state.stager = NULL;
+#endif
+    erts_release_code_write_permission();
+}
+#endif /* ERTS_SMP */
+
+
+
 BIF_RETTYPE
 check_old_code_1(BIF_ALIST_1)
 {
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index c58bf40435..25b32c851d 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -531,7 +531,6 @@ dbg_chk_aux_work_val(erts_aint32_t value)
     valid |= ERTS_SSI_AUX_WORK_CHECK_CHILDREN;
 #endif
 #ifdef ERTS_SMP
-    valid |= ERTS_SSI_AUX_WORK_CODE_IX_ACTIVATION;
     valid |= ERTS_SSI_AUX_WORK_FINISH_BP;
 #endif
 #ifdef ERTS_SSI_AUX_WORK_REAP_PORTS
@@ -1450,43 +1449,6 @@ handle_async_ready_clean(ErtsAuxWorkData *awdp,
 
 #endif /* ERTS_USE_ASYNC_READY_Q */
 
-#ifdef ERTS_SMP
-void
-erts_notify_code_ix_activation(Process* p, ErtsThrPrgrVal later)
-{
-    ErtsAuxWorkData* awdp = &p->scheduler_data->aux_work_data;
-    ASSERT(awdp->code_ix_activation.code_stager == NULL);
-    awdp->code_ix_activation.code_stager = p;
-    awdp->code_ix_activation.thr_prgr = later;
-    erts_smp_proc_inc_refc(p);
-    set_aux_work_flags_wakeup_relb(p->scheduler_data->ssi,
-				   ERTS_SSI_AUX_WORK_CODE_IX_ACTIVATION);
-}
-
-static erts_aint32_t
-handle_code_ix_activation(ErtsAuxWorkData *awdp, erts_aint32_t aux_work)
-{
-    Process* p;
-    if (!erts_thr_progress_has_reached(awdp->code_ix_activation.thr_prgr)) {
-	return aux_work & ~ERTS_SSI_AUX_WORK_CODE_IX_ACTIVATION;
-    }
-    unset_aux_work_flags(awdp->ssi, ERTS_SSI_AUX_WORK_CODE_IX_ACTIVATION);
-    p = awdp->code_ix_activation.code_stager;
-    ASSERT(p);
-#ifdef DEBUG
-    awdp->code_ix_activation.code_stager = NULL;
-#endif
-    erts_commit_staging_code_ix();
-    erts_release_code_write_permission();
-    erts_smp_proc_lock(p, ERTS_PROC_LOCK_STATUS);
-    if (!ERTS_PROC_IS_EXITING(p)) {
-	erts_resume(p, ERTS_PROC_LOCK_STATUS);
-    }
-    erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
-    erts_smp_proc_dec_refc(p);
-    return aux_work & ~ERTS_SSI_AUX_WORK_CODE_IX_ACTIVATION;
-}
-#endif /* ERTS_SMP */
 
 #ifdef ERTS_SMP
 void
@@ -1981,11 +1943,6 @@ handle_aux_work(ErtsAuxWorkData *awdp, erts_aint32_t orig_aux_work, int waiting)
 		    handle_mseg_cache_check);
 #endif
 
-#ifdef ERTS_SMP
-    HANDLE_AUX_WORK(ERTS_SSI_AUX_WORK_CODE_IX_ACTIVATION,
-		    handle_code_ix_activation);
-#endif
-
     HANDLE_AUX_WORK(ERTS_SSI_AUX_WORK_REAP_PORTS,
 		    handle_reap_ports);
 
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index 1436e246d6..71b066046b 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -283,9 +283,8 @@ typedef enum {
 #define ERTS_SSI_AUX_WORK_CHECK_CHILDREN	(((erts_aint32_t) 1) << 10)
 #define ERTS_SSI_AUX_WORK_SET_TMO		(((erts_aint32_t) 1) << 11)
 #define ERTS_SSI_AUX_WORK_MSEG_CACHE_CHECK	(((erts_aint32_t) 1) << 12)
-#define ERTS_SSI_AUX_WORK_CODE_IX_ACTIVATION	(((erts_aint32_t) 1) << 13)
-#define ERTS_SSI_AUX_WORK_REAP_PORTS		(((erts_aint32_t) 1) << 14)
-#define ERTS_SSI_AUX_WORK_FINISH_BP	        (((erts_aint32_t) 1) << 15)
+#define ERTS_SSI_AUX_WORK_REAP_PORTS		(((erts_aint32_t) 1) << 13)
+#define ERTS_SSI_AUX_WORK_FINISH_BP	        (((erts_aint32_t) 1) << 14)
 
 typedef struct ErtsSchedulerSleepInfo_ ErtsSchedulerSleepInfo;
 
@@ -480,10 +479,6 @@ typedef struct {
 #endif
 #ifdef ERTS_SMP
     struct {
-	Process* code_stager;
-	ErtsThrPrgrVal thr_prgr;
-    } code_ix_activation;
-    struct {
 	Process* stager;
 	ErtsThrPrgrVal thr_prgr;
     } bp_ix_activation;