1 files changed, 77 insertions, 82 deletions

diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index fc00b42454..66f4259d20 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -233,15 +233,17 @@ BIF_RETTYPE link_1(BIF_ALIST_1)
 
     BIF_ERROR(BIF_P, BADARG);
 
- res_no_proc:
-    if (BIF_P->flags & F_TRAPEXIT) {
-	ErtsProcLocks locks = ERTS_PROC_LOCK_MAIN;
-	erts_deliver_exit_message(BIF_ARG_1, BIF_P, &locks, am_noproc, NIL);
-	erts_smp_proc_unlock(BIF_P, ~ERTS_PROC_LOCK_MAIN & locks);
-	BIF_RET(am_true);
+res_no_proc: {
+	erts_aint32_t state = erts_smp_atomic32_read_nob(&BIF_P->state);
+	if (state & ERTS_PSFLG_TRAP_EXIT) {
+	    ErtsProcLocks locks = ERTS_PROC_LOCK_MAIN;
+	    erts_deliver_exit_message(BIF_ARG_1, BIF_P, &locks, am_noproc, NIL);
+	    erts_smp_proc_unlock(BIF_P, ~ERTS_PROC_LOCK_MAIN & locks);
+	    BIF_RET(am_true);
+	}
+	else
+	    BIF_ERROR(BIF_P, EXC_NOPROC);
     }
-    else
-	BIF_ERROR(BIF_P, EXC_NOPROC);
 }
 
 #define ERTS_DEMONITOR_FALSE		2
@@ -1103,8 +1105,9 @@ BIF_RETTYPE hibernate_3(BIF_ALIST_3)
 
     if (erts_hibernate(BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3, reg)) {
         /*
-         * If hibernate succeeded, TRAP. The process will be suspended
-         * if status is P_WAITING or continue (if any message was in the queue).
+         * If hibernate succeeded, TRAP. The process will be wait in a
+         * hibernated state if its state is inactive (!ERTS_PSFLG_ACTIVE);
+         * otherwise, continue executing (if any message was in the queue).
          */
         BIF_TRAP_CODE_PTR_(BIF_P, BIF_P->i);
     }
@@ -1403,9 +1406,8 @@ BIF_RETTYPE exit_2(BIF_ALIST_2)
 	 }
 	 else {
 	     rp_locks = ERTS_PROC_LOCKS_XSIG_SEND;
-	     rp = erts_pid2proc_opt(BIF_P, ERTS_PROC_LOCK_MAIN,
-				    BIF_ARG_1, rp_locks,
-				    ERTS_P2P_FLG_SMP_INC_REFC);
+	     rp = erts_pid2proc(BIF_P, ERTS_PROC_LOCK_MAIN,
+				BIF_ARG_1, rp_locks);
 	     if (!rp) {
 		 BIF_RET(am_true);
 	     }
@@ -1427,8 +1429,6 @@ BIF_RETTYPE exit_2(BIF_ALIST_2)
 	     rp_locks &= ~ERTS_PROC_LOCK_MAIN;
 	 if (rp_locks)
 	     erts_smp_proc_unlock(rp, rp_locks);
-	 if (rp != BIF_P)
-	     erts_smp_proc_dec_refc(rp);
 #endif
 	 /*
 	  * We may have exited ourselves and may have to take action.
@@ -1502,14 +1502,13 @@ BIF_RETTYPE process_flag_2(BIF_ALIST_2)
       BIF_RET(old_value);
    }
    else if (BIF_ARG_1 == am_priority) {
-       erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_STATUS);
        old_value = erts_set_process_priority(BIF_P, BIF_ARG_2);
-       erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_STATUS);
        if (old_value == THE_NON_VALUE)
 	   goto error;
        BIF_RET(old_value);
    }
    else if (BIF_ARG_1 == am_trap_exit) {
+       erts_aint32_t state;
        Uint trap_exit;
        if (BIF_ARG_2 == am_true) {
 	   trap_exit = 1;
@@ -1524,59 +1523,52 @@ BIF_RETTYPE process_flag_2(BIF_ALIST_2)
 	*       For more info, see implementation of erts_send_exit_signal().
 	*/
        erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_STATUS);
+       ERTS_SMP_LC_ASSERT((ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS)
+			  & erts_proc_lc_my_proc_locks(BIF_P));
        ERTS_SMP_BIF_CHK_PENDING_EXIT(BIF_P,
 				     ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS);
-       old_value = ERTS_PROC_IS_TRAPPING_EXITS(BIF_P) ? am_true : am_false;
-       if (trap_exit) {
-	   ERTS_PROC_SET_TRAP_EXIT(BIF_P);
-       } else {
-	   ERTS_PROC_UNSET_TRAP_EXIT(BIF_P);
-       }
+       if (trap_exit)
+	   state = erts_smp_atomic32_read_bor_nob(&BIF_P->state,
+						  ERTS_PSFLG_TRAP_EXIT);
+       else
+	   state = erts_smp_atomic32_read_band_nob(&BIF_P->state,
+						   ~ERTS_PSFLG_TRAP_EXIT);
+       old_value = (state & ERTS_PSFLG_TRAP_EXIT) ? am_true : am_false;
        erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_STATUS);
        BIF_RET(old_value);
    }
    else if (BIF_ARG_1 == am_scheduler) {
-       int yield;
-       ErtsRunQueue *old;
-       ErtsRunQueue *new;
+       ErtsRunQueue *old, *new, *curr;
        Sint sched;
+       erts_aint32_t state;
+
        if (!is_small(BIF_ARG_2))
 	   goto error;
        sched = signed_val(BIF_ARG_2);
        if (sched < 0 || erts_no_schedulers < sched)
 	   goto error;
-       erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_STATUS);
-       old = BIF_P->bound_runq;
-#ifdef ERTS_SMP
-       ASSERT(!old || old == BIF_P->run_queue);
-#endif
-       new = !sched ? NULL : erts_schedid2runq(sched);
-#ifndef ERTS_SMP
-       yield = 0;
-#else
-       if (new == old)
-	   yield = 0;
+
+       if (sched == 0) {
+	   new = NULL;
+	   state = erts_smp_atomic32_read_band_mb(&BIF_P->state,
+						  ~ERTS_PSFLG_BOUND);
+       }
        else {
-	   ErtsRunQueue *curr = BIF_P->run_queue;
-	   if (!new)
-	       erts_smp_runq_lock(curr);
-	   else
-	       erts_smp_runqs_lock(curr, new);
-	   yield = new && BIF_P->run_queue != new;
-#endif
-	   BIF_P->bound_runq = new;
+	   new = erts_schedid2runq(sched);
 #ifdef ERTS_SMP
-	   if (new)
-	       BIF_P->run_queue = new;
-	   if (!new)
-	       erts_smp_runq_unlock(curr);
-	   else
-	       erts_smp_runqs_unlock(curr, new);
-       }
+	   erts_atomic_set_nob(&BIF_P->run_queue, (erts_aint_t) new);
 #endif
-       erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_STATUS);
+	   state = erts_smp_atomic32_read_bor_mb(&BIF_P->state,
+						 ERTS_PSFLG_BOUND);
+       }
+
+       curr = ERTS_GET_SCHEDULER_DATA_FROM_PROC(BIF_P)->run_queue;
+       old = (ERTS_PSFLG_BOUND & state) ? curr : NULL;
+
+       ASSERT(!old || old == curr);
+
        old_value = old ? make_small(old->ix+1) : make_small(0);
-       if (yield)
+       if (new && new != curr)
 	   ERTS_BIF_YIELD_RETURN_X(BIF_P, old_value, am_scheduler);
        else
 	   BIF_RET(old_value);
@@ -1826,8 +1818,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend) {
 	if (internal_pid_index(to) >= erts_max_processes)
 	    return SEND_BADARG;
 
-	rp = erts_pid2proc_opt(p, ERTS_PROC_LOCK_MAIN,
-			       to, 0, ERTS_P2P_FLG_SMP_INC_REFC);
+	rp = erts_proc_lookup_raw(to);
 	
 	if (!rp) {
 	    ERTS_SMP_ASSERT_IS_NOT_EXITING(p);
@@ -1865,7 +1856,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend) {
 	}
 	erts_whereis_name(p, ERTS_PROC_LOCK_MAIN,
 			  to,
-			  &rp, 0, ERTS_P2P_FLG_SMP_INC_REFC,
+			  &rp, 0, 0,
 			  &pt);
 
 	if (pt) {
@@ -2017,7 +2008,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend) {
 
 	    erts_whereis_name(p, ERTS_PROC_LOCK_MAIN,
 			      tp[1],
-			      &rp, 0, ERTS_P2P_FLG_SMP_INC_REFC,
+			      &rp, 0, 0,
 			      &pt);
 	    if (pt) {
 		portid = pt->id;
@@ -2060,23 +2051,15 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend) {
 	    rp_locks |= ERTS_PROC_LOCK_MAIN;
 #endif
 	/* send to local process */
-	erts_send_message(p, rp, &rp_locks, msg, 0);
-	if (!erts_use_sender_punish)
+	res = erts_send_message(p, rp, &rp_locks, msg, 0);
+	if (erts_use_sender_punish)
+	    res *= 4;
+	else
 	    res = 0;
-	else {
-#ifdef ERTS_SMP
-	    res = rp->msg_inq.len*4;
-	    if (ERTS_PROC_LOCK_MAIN & rp_locks)
-		res += rp->msg.len*4;
-#else
-	    res = rp->msg.len*4;
-#endif
-	}
 	erts_smp_proc_unlock(rp,
 			     p == rp
 			     ? (rp_locks & ~ERTS_PROC_LOCK_MAIN)
 			     : rp_locks);
-	erts_smp_proc_dec_refc(rp);
 	return res;
     }
 }
@@ -3486,7 +3469,7 @@ BIF_RETTYPE garbage_collect_1(BIF_ALIST_1)
 	if (rp == ERTS_PROC_LOCK_BUSY)
 	    ERTS_BIF_YIELD1(bif_export[BIF_garbage_collect_1], BIF_P, BIF_ARG_1);
 #else
-	rp = erts_pid2proc(BIF_P, 0, BIF_ARG_1, 0);
+	rp = erts_proc_lookup(BIF_ARG_1);
 #endif
 	if (!rp)
 	    BIF_RET(am_false);
@@ -3780,7 +3763,8 @@ BIF_RETTYPE function_exported_3(BIF_ALIST_3)
 	is_not_small(BIF_ARG_3)) {
 	BIF_ERROR(BIF_P, BADARG);
     }
-    if (erts_find_function(BIF_ARG_1, BIF_ARG_2, signed_val(BIF_ARG_3)) == NULL) {
+    if (erts_find_function(BIF_ARG_1, BIF_ARG_2, signed_val(BIF_ARG_3),
+			   erts_active_code_ix()) == NULL) {
 	BIF_RET(am_false);
     }
     BIF_RET(am_true);
@@ -4216,8 +4200,8 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
 	erts_smp_thr_progress_block();
 
 	for (i = 0; i < erts_max_processes; i++) {
-	    if (process_tab[i] != (Process*) 0) {
-		Process* p = process_tab[i];
+	    Process *p = erts_pix2proc(i);
+	    if (p) {
 #ifdef USE_VM_PROBES
 		p->seq_trace_token = (p->dt_utag != NIL) ? am_have_dt_utag : NIL;
 #else
@@ -4513,6 +4497,21 @@ erts_bif_prep_await_proc_exit_apply_trap(Process *c_p,
 
 Export bif_return_trap_export;
 
+void erts_init_trap_export(Export* ep, Eterm m, Eterm f, Uint a,
+			   Eterm (*bif)(BIF_ALIST_0))
+{
+    int i;
+    sys_memset((void *) ep, 0, sizeof(Export));
+    for (i=0; i<ERTS_NUM_CODE_IX; i++) {
+	ep->addressv[i] = &ep->code[3];
+    }
+    ep->code[0] = m;
+    ep->code[1] = f;
+    ep->code[2] = a;
+    ep->code[3] = (BeamInstr) em_apply_bif;
+    ep->code[4] = (BeamInstr) bif;
+}
+
 void erts_init_bif(void)
 {
     reference0 = 0;
@@ -4528,17 +4527,13 @@ void erts_init_bif(void)
      * yield the calling process traps to. The only thing it does:
      * return the value passed as argument.
      */
-    sys_memset((void *) &bif_return_trap_export, 0, sizeof(Export));
-    bif_return_trap_export.address = &bif_return_trap_export.code[3];
-    bif_return_trap_export.code[0] = am_erlang;
-    bif_return_trap_export.code[1] = am_bif_return_trap;
+    erts_init_trap_export(&bif_return_trap_export, am_erlang, am_bif_return_trap,
 #ifdef DEBUG
-    bif_return_trap_export.code[2] = 2;
+		     2
 #else
-    bif_return_trap_export.code[2] = 1;
+		     1
 #endif
-    bif_return_trap_export.code[3] = (BeamInstr) em_apply_bif;
-    bif_return_trap_export.code[4] = (BeamInstr) &bif_return_trap;
+		     , &bif_return_trap);
 
     flush_monitor_message_trap = erts_export_put(am_erlang,
 						 am_flush_monitor_message,