1 files changed, 53 insertions, 28 deletions

diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 1a66044627..36b0af0c1a 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -1139,7 +1139,7 @@ reply_sched_wall_time(void *vswtrp)
 	hpp = &hp;
     }
 
-    erts_queue_message(rp, &rp_locks, mp, msg);
+    erts_queue_message(rp, rp_locks, mp, msg, am_system);
 
     if (swtrp->req_sched == esdp->no)
 	rp_locks &= ~ERTS_PROC_LOCK_MAIN;
@@ -1218,7 +1218,7 @@ reply_system_check(void *vscrp)
     hpp = &hp;
     msg = STORE_NC(hpp, ohp, scrp->ref);
 
-    erts_queue_message(rp, &rp_locks, mp, msg);
+    erts_queue_message(rp, rp_locks, mp, msg, am_system);
 
     if (scrp->req_sched == esdp->no)
 	rp_locks &= ~ERTS_PROC_LOCK_MAIN;
@@ -6688,10 +6688,8 @@ schedule_process_sys_task(Process *p, erts_aint32_t prio, ErtsProcSysTask *st)
 	erts_aint32_t e;
 	n = e = a;
 
-	if (a & ERTS_PSFLG_FREE) {
-	    res = 0;
+	if (a & ERTS_PSFLG_FREE)
 	    goto cleanup; /* We don't want to schedule free processes... */
-	}
 
 	enqueue = ERTS_ENQUEUE_NOT;
 	n |= ERTS_PSFLG_ACTIVE_SYS;
@@ -9240,6 +9238,21 @@ erts_set_process_priority(Process *p, Eterm value)
     }
 }
 
+static int
+scheduler_gc_proc(Process *c_p, int reds_left)
+{
+    int fcalls, reds;
+    if (!ERTS_PROC_GET_SAVED_CALLS_BUF(c_p))
+	fcalls = reds_left;
+    else
+	fcalls = reds_left - CONTEXT_REDS;
+    reds = erts_garbage_collect_nobump(c_p, 0, c_p->arg_reg, c_p->arity, fcalls);
+    ASSERT(reds_left >= reds);
+    return reds;
+}
+
+
+
 /*
  * schedule() is called from BEAM (process_main()) or HiPE
  * (hipe_mode_switch()) when the current process is to be
@@ -9318,6 +9331,7 @@ Process *schedule(Process *p, int calls)
 #endif
 
 	reds = actual_reds = calls - esdp->virtual_reds;
+	ASSERT(actual_reds >= 0);
 	if (reds < ERTS_PROC_MIN_CONTEXT_SWITCH_REDS_COST)
 	    reds = ERTS_PROC_MIN_CONTEXT_SWITCH_REDS_COST;
 	esdp->virtual_reds = 0;
@@ -9740,7 +9754,7 @@ Process *schedule(Process *p, int calls)
 
 	    esdp->current_process = p;
 
-
+	    calls = 0;
 	    reds = context_reds;
 
 #ifdef ERTS_SMP
@@ -9819,9 +9833,7 @@ Process *schedule(Process *p, int calls)
 		/* Migrate to dirty scheduler... */
 	    sunlock_sched_out_proc:
 		erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
-		p->fcalls = reds;
 		goto sched_out_proc;
-
 	    }
 	}
 	else {
@@ -9856,8 +9868,6 @@ Process *schedule(Process *p, int calls)
 
 #endif /* ERTS_SMP */
 
-	p->fcalls = reds;
-
 	erts_smp_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
 
 	if (IS_TRACED(p)) {
@@ -9890,14 +9900,15 @@ Process *schedule(Process *p, int calls)
 	     * not allowed to execute system tasks.
 	     */
 	    if (!(p->flags & F_DELAY_GC)) {
-		reds -= execute_sys_tasks(p, &state, reds);
+		int cost = execute_sys_tasks(p, &state, reds);
+		calls += cost;
+		reds -= cost;
 		if (reds <= 0
 #ifdef ERTS_DIRTY_SCHEDULERS
 		    || ERTS_SCHEDULER_IS_DIRTY(esdp)
 		    || (state & ERTS_PSFLGS_DIRTY_WORK)
 #endif
 		    ) {
-		    p->fcalls = reds;
 		    goto sched_out_proc;
 		}
 	    }
@@ -9910,8 +9921,9 @@ Process *schedule(Process *p, int calls)
 
 		if (((state & (ERTS_PSFLG_SUSPENDED
 			       | ERTS_PSFLG_ACTIVE)) != ERTS_PSFLG_ACTIVE)
-		    && !(state & ERTS_PSFLG_EXITING))
+		    && !(state & ERTS_PSFLG_EXITING)) {
 		    goto sched_out_proc;
+		}
 
 		n = e = state;
 		n &= ~ERTS_PSFLG_RUNNING_SYS;
@@ -9930,11 +9942,11 @@ Process *schedule(Process *p, int calls)
 
 	if (ERTS_IS_GC_DESIRED(p)) {
 	    if (!(state & ERTS_PSFLG_EXITING) && !(p->flags & (F_DELAY_GC|F_DISABLE_GC))) {
-		reds -= erts_garbage_collect_nobump(p, 0, p->arg_reg, p->arity);
-		if (reds <= 0) {
-		    p->fcalls = reds;
+		int cost = scheduler_gc_proc(p, reds);
+		calls += cost;
+		reds -= cost;
+		if (reds <= 0)
 		    goto sched_out_proc;
-		}
 	    }
 	}
 
@@ -9942,6 +9954,8 @@ Process *schedule(Process *p, int calls)
 	    free_proxy_proc(proxy_p);
 	    proxy_p = NULL;
 	}
+
+	p->fcalls = reds;
 	    
 	ERTS_SMP_CHK_HAVE_ONLY_MAIN_PROC_LOCK(p);
 
@@ -10010,7 +10024,7 @@ notify_sys_task_executed(Process *c_p, ErtsProcSysTask *st, Eterm st_result)
 	ASSERT(hp_start + hsz == hp);
 #endif
 
-	erts_queue_message(rp, &rp_locks, mp, msg);
+	erts_queue_message(rp, rp_locks, mp, msg, c_p->common.id);
 
 	if (c_p == rp)
 	    rp_locks &= ~ERTS_PROC_LOCK_MAIN;
@@ -10211,21 +10225,24 @@ execute_sys_tasks(Process *c_p, erts_aint32_t *statep, int in_reds)
 	    else {
 		if (!garbage_collected) {
 		    FLAGS(c_p) |= F_NEED_FULLSWEEP;
-		    reds -= erts_garbage_collect_nobump(c_p,
-							0,
-							c_p->arg_reg,
-							c_p->arity);
+		    reds -= scheduler_gc_proc(c_p, reds);
 		    garbage_collected = 1;
 		}
 		st_res = am_true;
 	    }
 	    break;
 	case ERTS_PSTT_CPC: {
+	    int fcalls;
             int cpc_reds = 0;
+	    if (!ERTS_PROC_GET_SAVED_CALLS_BUF(c_p))
+		fcalls = reds;
+	    else
+		fcalls = reds - CONTEXT_REDS;
 	    st_res = erts_check_process_code(c_p,
 					     st->arg[0],
                                              unsigned_val(st->arg[1]),
-					     &cpc_reds);
+					     &cpc_reds,
+					     fcalls);
             reds -= cpc_reds;
 	    if (is_non_value(st_res)) {
 		/* Needed gc, but gc was disabled */
@@ -10257,6 +10274,9 @@ execute_sys_tasks(Process *c_p, erts_aint32_t *statep, int in_reds)
 
     *statep = state;
 
+    if (in_reds < reds)
+	return in_reds;
+
     return in_reds - reds;
 }
 
@@ -10932,9 +10952,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
     INITIALIZE_SHCOPY(info);
 #endif
 
-#ifdef ERTS_SMP
     erts_smp_proc_lock(parent, ERTS_PROC_LOCKS_ALL_MINOR);
-#endif
 
     /*
      * Check for errors.
@@ -11235,6 +11253,8 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
      * Schedule process for execution.
      */
 
+    erts_smp_proc_unlock(parent, locks & ERTS_PROC_LOCKS_ALL_MINOR);
+
     schedule_process(p, state, 0);
 
     VERBOSE(DEBUG_PROCESSES, ("Created a new process: %T\n",p->common.id));
@@ -11248,6 +11268,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
         DTRACE2(process_spawn, process_name, mfa);
     }
 #endif
+    return res;
 
  error:
 
@@ -11481,8 +11502,10 @@ delete_process(Process* p)
 
     psd = (ErtsPSD *) erts_smp_atomic_read_nob(&p->psd);
 
-    if (psd)
+    if (psd) {
+	erts_smp_atomic_set_nob(&p->psd, (erts_aint_t) NULL); /* Reduction counting depends on this... */
 	erts_free(ERTS_ALC_T_PSD, psd);
+    }
 
     /* Clean binaries and funs */
     erts_cleanup_offheap(&p->off_heap);
@@ -11743,7 +11766,7 @@ send_exit_message(Process *to, ErtsProcLocks *to_locksp,
 	mp = erts_alloc_message_heap(to, to_locksp, term_size, &hp, &ohp);
 	mess = copy_struct(exit_term, term_size, &hp, ohp);
 #endif
-	erts_queue_message(to, to_locksp, mp, mess);
+	erts_queue_message(to, *to_locksp, mp, mess, am_system);
     } else {
 	Eterm temp_token;
 	Uint sz_token;
@@ -11764,7 +11787,7 @@ send_exit_message(Process *to, ErtsProcLocks *to_locksp,
 	seq_trace_output(token, mess, SEQ_TRACE_SEND, to->common.id, to);
 	temp_token = copy_struct(token, sz_token, &hp, ohp);
         ERL_MESSAGE_TOKEN(mp) = temp_token;
-	erts_queue_message(to, to_locksp, mp, mess);
+	erts_queue_message(to, *to_locksp, mp, mess, am_system);
     }
 }
 
@@ -12576,6 +12599,8 @@ erts_continue_exit_process(Process *p)
     
     dep = (p->flags & F_DISTRIBUTION) ? erts_this_dist_entry : NULL;
     scb = ERTS_PROC_SET_SAVED_CALLS_BUF(p, NULL);
+    if (scb)
+	p->fcalls += CONTEXT_REDS; /* Reduction counting depends on this... */
     pbt = ERTS_PROC_SET_CALL_TIME(p, NULL);
     nif_export = ERTS_PROC_SET_NIF_TRAP_EXPORT(p, NULL);