Merge branch 'sverk/code-load-refactor-later-op'

* sverk/code-load-refactor-later-op:
  erts: Fix faulty lock check assert
  erts: Refactor naming regarding code_write_permission
  erts: Refactor tracing to use erts_schedule_thr_prgr_later_op
  erts: Allow thr_prgr_later_op to reschedule
  erts: Refactor code loading to use erts_schedule_thr_prgr_later_op
  erts: Remove some compiler warnings

1 files changed, 3 insertions, 100 deletions

diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index ddc43e621d..09169ba914 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -530,10 +530,6 @@ dbg_chk_aux_work_val(erts_aint32_t value)
 #ifdef ERTS_SMP_SCHEDULERS_NEED_TO_CHECK_CHILDREN
     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
     valid |= ERTS_SSI_AUX_WORK_REAP_PORTS;
 #endif
@@ -1450,92 +1446,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
-erts_notify_finish_breakpointing(Process* p)
-{
-    ErtsAuxWorkData* awdp = &p->scheduler_data->aux_work_data;
-
-    ASSERT(awdp->bp_ix_activation.stager == NULL);
-    awdp->bp_ix_activation.stager = p;
-    awdp->bp_ix_activation.thr_prgr = erts_thr_progress_later(awdp->esdp);
-    erts_thr_progress_wakeup(awdp->esdp, awdp->bp_ix_activation.thr_prgr);
-    erts_smp_proc_inc_refc(p);
-    set_aux_work_flags_wakeup_relb(p->scheduler_data->ssi,
-				   ERTS_SSI_AUX_WORK_FINISH_BP);
-}
-
-static erts_aint32_t
-handle_finish_bp(ErtsAuxWorkData* awdp, erts_aint32_t aux_work)
-{
-    ErtsThrPrgrVal current = haw_thr_prgr_current(awdp);
-
-    if (!erts_thr_progress_has_reached_this(current,
-					    awdp->bp_ix_activation.thr_prgr)) {
-	return aux_work & ~ERTS_SSI_AUX_WORK_FINISH_BP;
-    }
-    if (erts_finish_breakpointing()) { /* Not done */
-	/* Arrange for being called again */
-	awdp->bp_ix_activation.thr_prgr =
-	    erts_thr_progress_later(awdp->esdp);
-	erts_thr_progress_wakeup(awdp->esdp, awdp->bp_ix_activation.thr_prgr);
-    } else {			/* Done */
-	Process* p;
-
-	unset_aux_work_flags(awdp->ssi, ERTS_SSI_AUX_WORK_FINISH_BP);
-	p = awdp->bp_ix_activation.stager;
-#ifdef DEBUG
-	awdp->bp_ix_activation.stager = NULL;
-#endif
-	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);
-	erts_release_code_write_permission();
-    }
-    return aux_work & ~ERTS_SSI_AUX_WORK_FINISH_BP;
-}
-#endif /* ERTS_SMP */
 
 static ERTS_INLINE erts_aint32_t
 handle_fix_alloc(ErtsAuxWorkData *awdp, erts_aint32_t aux_work)
@@ -1670,6 +1580,9 @@ handle_thr_prgr_later_op(ErtsAuxWorkData *awdp, erts_aint32_t aux_work)
 	if (!erts_thr_progress_has_reached_this(current, lop->later))
 	    return aux_work & ~ERTS_SSI_AUX_WORK_THR_PRGR_LATER_OP;
 	awdp->later_op.first = lop->next;
+	if (!awdp->later_op.first) {
+	    awdp->later_op.last = NULL;
+	}
 	lop->func(lop->data);
 	if (!awdp->later_op.first) {
 	    awdp->later_op.last = NULL;
@@ -1981,19 +1894,9 @@ 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);
 
-#ifdef ERTS_SMP
-    HANDLE_AUX_WORK(ERTS_SSI_AUX_WORK_FINISH_BP,
-		    handle_finish_bp);
-#endif
-
     ERTS_DBG_CHK_AUX_WORK_VAL(aux_work);
 
 #ifdef ERTS_SMP