Refactor erts_dsig_prepare argument dep(p)

Don't need to be pointer-pointer

5 files changed, 29 insertions, 36 deletions

diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 30278cbe36..50699eac31 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -227,7 +227,7 @@ BIF_RETTYPE link_1(BIF_ALIST_1)
 		goto res_no_proc;
 	    }
 
-	    code = erts_dsig_prepare(&dsd, &dep, BIF_P,
+	    code = erts_dsig_prepare(&dsd, dep, BIF_P,
 				     (ERTS_PROC_LOCK_MAIN | ERTS_PROC_LOCK_LINK),
 				     ERTS_DSP_RLOCK, 0, 1);
 	    switch (code) {
@@ -314,7 +314,7 @@ remote_demonitor(Process *c_p, DistEntry *dep, Eterm ref, Eterm to)
     ERTS_LC_ASSERT((ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_LINK)
 		       == erts_proc_lc_my_proc_locks(c_p));
 
-    code = erts_dsig_prepare(&dsd, &dep, c_p, ERTS_PROC_LOCK_MAIN,
+    code = erts_dsig_prepare(&dsd, dep, c_p, ERTS_PROC_LOCK_MAIN,
 			     ERTS_DSP_RLOCK, 0, 0);
     switch (code) {
     case ERTS_DSIG_PREP_NOT_ALIVE:
@@ -792,7 +792,7 @@ remote_monitor(Process *p, Eterm bifarg1, Eterm bifarg2,
 
     ASSERT(dep);
     erts_proc_lock(p, ERTS_PROC_LOCK_LINK);
-    code = erts_dsig_prepare(&dsd, &dep,
+    code = erts_dsig_prepare(&dsd, dep,
 			     p, (ERTS_PROC_LOCK_MAIN | ERTS_PROC_LOCK_LINK),
 			     ERTS_DSP_RLOCK, 0, 1);
     switch (code) {
@@ -1176,7 +1176,7 @@ BIF_RETTYPE unlink_1(BIF_ALIST_1)
 	    BIF_RET(am_true);
 	}
 
-	code = erts_dsig_prepare(&dsd, &dep, BIF_P, ERTS_PROC_LOCK_MAIN,
+	code = erts_dsig_prepare(&dsd, dep, BIF_P, ERTS_PROC_LOCK_MAIN,
 				 ERTS_DSP_NO_LOCK, 0, 0);
 	switch (code) {
 	case ERTS_DSIG_PREP_NOT_ALIVE:
@@ -1560,7 +1560,7 @@ BIF_RETTYPE exit_2(BIF_ALIST_2)
 	 if(dep == erts_this_dist_entry)
 	     BIF_RET(am_true);
 
-	 code = erts_dsig_prepare(&dsd, &dep, BIF_P, ERTS_PROC_LOCK_MAIN,
+	 code = erts_dsig_prepare(&dsd, dep, BIF_P, ERTS_PROC_LOCK_MAIN,
 				  ERTS_DSP_NO_LOCK, 0, 1);
 	 switch (code) {
 	 case ERTS_DSIG_PREP_NOT_ALIVE:
@@ -1996,7 +1996,7 @@ static Sint remote_send(Process *p, DistEntry *dep,
     ASSERT(is_atom(to) || is_external_pid(to));
 
     ctx->dep = dep;
-    code = erts_dsig_prepare(&ctx->dsd, &dep, p, ERTS_PROC_LOCK_MAIN,
+    code = erts_dsig_prepare(&ctx->dsd, dep, p, ERTS_PROC_LOCK_MAIN,
 			     ERTS_DSP_NO_LOCK,
 			     !ctx->suspend, ctx->connect);
     switch (code) {
@@ -2185,6 +2185,7 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext *ctx)
 	}
 	return ret_val;
     } else if (is_tuple(to)) { /* Remote send */
+        int deref_dep = 0;
 	int ret;
 	tp = tuple_val(to);
 	if (*tp != make_arityval(2))
@@ -2219,15 +2220,20 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext *ctx)
 	    }
 	    return 0;
 	}
+        if (dep == NULL) {
+            dep = erts_find_or_insert_dist_entry(tp[2]);
+            ASSERT(dep != erts_this_dist_entry);
+            deref_dep = 1;
+        }
 	ctx->dsd.node = tp[2];
 
 	ret = remote_send(p, dep, tp[1], to, msg, ctx);
 	if (ret == SEND_YIELD_CONTINUE) {
-            if (dep) {
-                erts_ref_dist_entry(dep);
-		ctx->deref_dep = 1;
-	    }
+            erts_ref_dist_entry(ctx->dep);
+            ctx->deref_dep = 1;
 	}
+        if (deref_dep)
+            erts_deref_dist_entry(dep);
 	return ret;
     } else {
 	if (IS_TRACED_FL(p, F_TRACE_SEND))
@@ -4405,7 +4411,7 @@ BIF_RETTYPE group_leader_2(BIF_ALIST_2)
 	if(dep == erts_this_dist_entry)
 	    BIF_ERROR(BIF_P, BADARG);
 
-	code = erts_dsig_prepare(&dsd, &dep, BIF_P, ERTS_PROC_LOCK_MAIN,
+	code = erts_dsig_prepare(&dsd, dep, BIF_P, ERTS_PROC_LOCK_MAIN,
 				 ERTS_DSP_NO_LOCK, 0, 1);
 	switch (code) {
 	case ERTS_DSIG_PREP_NOT_ALIVE:
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index 4a25fbdd4c..ae64f394c8 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -1349,7 +1349,7 @@ int erts_net_message(Port *prt,
 	    /* This is tricky (we MUST force a distributed send) */
 	    ErtsDSigData dsd;
 	    int code;
-	    code = erts_dsig_prepare(&dsd, &dep, NULL, 0, ERTS_DSP_NO_LOCK, 0, 0);
+	    code = erts_dsig_prepare(&dsd, dep, NULL, 0, ERTS_DSP_NO_LOCK, 0, 0);
 	    if (code == ERTS_DSIG_PREP_CONNECTED) {
 		code = erts_dsig_send_exit(&dsd, to, from, am_noproc);
 		ASSERT(code == ERTS_DSIG_SEND_OK);
@@ -1441,7 +1441,7 @@ int erts_net_message(Port *prt,
 	if (!rp) {
 	    ErtsDSigData dsd;
 	    int code;
-	    code = erts_dsig_prepare(&dsd, &dep, NULL, 0, ERTS_DSP_NO_LOCK, 0, 0);
+	    code = erts_dsig_prepare(&dsd, dep, NULL, 0, ERTS_DSP_NO_LOCK, 0, 0);
 	    if (code == ERTS_DSIG_PREP_CONNECTED) {
 		code = erts_dsig_send_m_exit(&dsd, watcher, watched, ref,
 					     am_noproc);
@@ -3831,7 +3831,7 @@ monitor_node(Process* p, Eterm Node, Eterm Bool, Eterm Options)
 
         erts_proc_lock(p, ERTS_PROC_LOCK_LINK);
 
-        switch (erts_dsig_prepare(&dsd, &dep, p,
+        switch (erts_dsig_prepare(&dsd, dep, p,
                                   (ERTS_PROC_LOCK_MAIN | ERTS_PROC_LOCK_LINK),
                                   ERTS_DSP_RLOCK, 0, async_connect)) {
         case ERTS_DSIG_PREP_NOT_ALIVE:
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index a205ce0cb5..a96e39be89 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -138,7 +138,7 @@ extern int erts_is_alive;
 #define ERTS_DSIG_PREP_PENDING	        4
 
 ERTS_GLB_INLINE int erts_dsig_prepare(ErtsDSigData *,
-				      DistEntry **,
+				      DistEntry*,
 				      Process *,
                                       ErtsProcLocks,
 				      ErtsDSigPrepLock,
@@ -154,26 +154,20 @@ int erts_auto_connect(DistEntry* dep, Process *proc, ErtsProcLocks proc_locks);
 
 ERTS_GLB_INLINE int 
 erts_dsig_prepare(ErtsDSigData *dsdp,
-		  DistEntry **depp,
+		  DistEntry *dep,
 		  Process *proc,
                   ErtsProcLocks proc_locks,
 		  ErtsDSigPrepLock dspl,
 		  int no_suspend,
 		  int connect)
 {
-    DistEntry* dep = *depp;
-    int deref_dep = 0;
     int res;
 
     if (!erts_is_alive)
 	return ERTS_DSIG_PREP_NOT_ALIVE;
     if (!dep) {
-	if (!connect)
-	    return ERTS_DSIG_PREP_NOT_CONNECTED;
-
-	dep = erts_find_or_insert_dist_entry(dsdp->node);
-	ASSERT(dep != erts_this_dist_entry);
-        deref_dep = 1;
+        ASSERT(!connect);
+        return ERTS_DSIG_PREP_NOT_CONNECTED;
     }
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
@@ -199,8 +193,6 @@ retry:
         ASSERT(dep->status == 0);
         erts_de_runlock(dep);
         if (!erts_auto_connect(dep, proc, proc_locks)) {
-            if (deref_dep)
-                erts_deref_dist_entry(dep);
             return ERTS_DSIG_PREP_NOT_ALIVE;
         }
 	goto retry;
@@ -224,15 +216,10 @@ retry:
     dsdp->no_suspend = no_suspend;
     if (dspl == ERTS_DSP_NO_LOCK)
 	erts_de_runlock(dep);
-    if (deref_dep)
-        erts_deref_dist_entry(dep);
-    *depp = dep;
     return res;
 
  fail:
     erts_de_runlock(dep);
-    if (deref_dep)
-        erts_deref_dist_entry(dep);
     return res;
 }
 
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 2d13cd92b2..a807d60ec7 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -12659,7 +12659,7 @@ static void doit_exit_monitor(ErtsMonitor *mon, void *vpcontext)
 		erts_de_links_unlock(dep);
 		if (rmon) {
 		    ErtsDSigData dsd;
-		    int code = erts_dsig_prepare(&dsd, &dep, NULL, 0,
+		    int code = erts_dsig_prepare(&dsd, dep, NULL, 0,
 						 ERTS_DSP_NO_LOCK, 0, 0);
 		    if (code == ERTS_DSIG_PREP_CONNECTED ||
                         code == ERTS_DSIG_PREP_PENDING) {
@@ -12707,7 +12707,7 @@ static void doit_exit_monitor(ErtsMonitor *mon, void *vpcontext)
 		    erts_de_links_unlock(dep);
 		    if (rmon) {
 			ErtsDSigData dsd;
-			int code = erts_dsig_prepare(&dsd, &dep, NULL, 0,
+			int code = erts_dsig_prepare(&dsd, dep, NULL, 0,
 						     ERTS_DSP_NO_LOCK, 0, 0);
 			if (code == ERTS_DSIG_PREP_CONNECTED ||
                             code == ERTS_DSIG_PREP_PENDING) {
@@ -12768,7 +12768,7 @@ static void doit_exit_monitor(ErtsMonitor *mon, void *vpcontext)
 		erts_de_links_unlock(dep);
 		if (rmon) {
 		    ErtsDSigData dsd;
-		    int code = erts_dsig_prepare(&dsd, &dep, NULL, 0,
+		    int code = erts_dsig_prepare(&dsd, dep, NULL, 0,
 						 ERTS_DSP_NO_LOCK, 0, 0);
 		    if (code == ERTS_DSIG_PREP_CONNECTED) {
 			code = erts_dsig_send_m_exit(&dsd,
@@ -12893,7 +12893,7 @@ static void doit_exit_link(ErtsLink *lnk, void *vpcontext)
 		erts_remove_dist_link(&dld, p->common.id, item, dep);
                 if (dld.d_lnk) {
                     erts_proc_lock(p, ERTS_PROC_LOCK_MAIN);
-                    code = erts_dsig_prepare(&dsd, &dep, p, 0, ERTS_DSP_NO_LOCK, 0, 0);
+                    code = erts_dsig_prepare(&dsd, dep, p, 0, ERTS_DSP_NO_LOCK, 0, 0);
                     if (code == ERTS_DSIG_PREP_CONNECTED ||
                         code == ERTS_DSIG_PREP_PENDING) {
 
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 6cd1aa5e79..9933c8dda4 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -3829,7 +3829,7 @@ static void sweep_one_link(ErtsLink *lnk, void *vpsc)
 	    ErtsDistLinkData dld;
 	    ErtsDSigData dsd;
 	    int code;
-	    code = erts_dsig_prepare(&dsd, &dep, NULL, 0, ERTS_DSP_NO_LOCK, 0, 0);
+	    code = erts_dsig_prepare(&dsd, dep, NULL, 0, ERTS_DSP_NO_LOCK, 0, 0);
 	    switch (code) {
 	    case ERTS_DSIG_PREP_NOT_ALIVE:
 	    case ERTS_DSIG_PREP_NOT_CONNECTED: