1 files changed, 20 insertions, 58 deletions

diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index ff19ef018e..eb9e749a08 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -80,7 +80,7 @@ dist_msg_dbg(ErtsDistExternal *edep, char *what, byte *buf, int sz)
     byte *extp = edep->data->extp;
     Eterm msg;
     Sint ctl_len;
-    Sint size = ctl_len = erts_decode_dist_ext_size(edep, 0);
+    Sint size = ctl_len = erts_decode_dist_ext_size(edep, 0, 0);
     if (size < 0) {
 	erts_fprintf(dbg_file,
 		     "DIST MSG DEBUG: erts_decode_dist_ext_size(%s) failed:\n",
@@ -1266,18 +1266,6 @@ erts_dsig_send_group_leader(ErtsDSigSendContext *ctx, Eterm leader, Eterm remote
     return dsig_send_ctl(ctx, ctl);
 }
 
-struct dist_sequences {
-    ErlHeapFragment hfrag;
-    struct dist_sequences *parent;
-    struct dist_sequences *left;
-    struct dist_sequences *right;
-    char is_red;
-
-    Uint64 seq_id;
-    int cnt;
-    Sint ctl_len;
-};
-
 #define ERTS_RBT_PREFIX dist_seq
 #define ERTS_RBT_T DistSeqNode
 #define ERTS_RBT_KEY_T Uint
@@ -1312,25 +1300,25 @@ struct dist_sequences {
 
 #include "erl_rbtree.h"
 
-struct erts_dist_seq_tree_foreach_iter_arg {
-    int (*func)(ErtsDistExternal *, void *, Sint);
+struct erts_debug_dist_seq_tree_foreach_iter_arg {
+    int (*func)(DistSeqNode *, void *, Sint);
     void *arg;
 };
 
 static int
-erts_dist_seq_tree_foreach_iter(DistSeqNode *seq, void *arg, Sint reds)
+erts_debug_dist_seq_tree_foreach_iter(DistSeqNode *seq, void *arg, Sint reds)
 {
-    struct erts_dist_seq_tree_foreach_iter_arg *state = arg;
-    return state->func(erts_get_dist_ext(&seq->hfrag), state->arg, reds);
+    struct erts_debug_dist_seq_tree_foreach_iter_arg *state = arg;
+    return state->func(seq, state->arg, reds);
 }
 
 void
-erts_dist_seq_tree_foreach(DistEntry *dep, int (*func)(ErtsDistExternal *, void *, Sint), void *arg)
+erts_debug_dist_seq_tree_foreach(DistEntry *dep, int (*func)(DistSeqNode *, void *, Sint), void *arg)
 {
-    struct erts_dist_seq_tree_foreach_iter_arg state;
+    struct erts_debug_dist_seq_tree_foreach_iter_arg state;
     state.func = func;
     state.arg = arg;
-    dist_seq_rbt_foreach(dep->sequences, erts_dist_seq_tree_foreach_iter, &state);
+    dist_seq_rbt_foreach(dep->sequences, erts_debug_dist_seq_tree_foreach_iter, &state);
 }
 
 static int dist_seq_cleanup(DistSeqNode *seq, void *unused, Sint reds)
@@ -1462,7 +1450,7 @@ int erts_net_message(Port *prt,
 #endif
         goto data_error;
     case ERTS_PREP_DIST_EXT_SUCCESS:
-	ctl_len = erts_decode_dist_ext_size(&ede, 1);
+	ctl_len = erts_decode_dist_ext_size(&ede, 1, 0);
         if (ctl_len < 0) {
 #ifdef ERTS_DIST_MSG_DBG
             erts_fprintf(dbg_file, "DIST MSG DEBUG: erts_decode_dist_ext_size(CTL) failed:\n");
@@ -1543,39 +1531,6 @@ int erts_net_message(Port *prt,
         edep = erts_get_dist_ext(&seq->hfrag);
         ede_hfrag = &seq->hfrag;
 
-        /* If the sequence consisted of more than 1 fragment we create one large
-           binary out of all of the fragments. This because erts_decode_ext
-           cannot handle a segmented buffer.
-           TODO: Move this copy to as late as possible, preferably in in the
-           erts_decode_dist_ext in the receiving process.
-        */
-        if (edep->data->frag_id > 1) {
-            Uint sz = 0;
-            Binary *bin;
-            int i;
-            byte *ep;
-
-            for (i = 0; i < edep->data->frag_id; i++)
-                sz += edep->data[i].ext_endp - edep->data[i].extp;
-
-            bin = erts_bin_nrml_alloc(sz);
-            ep = (byte*)bin->orig_bytes;
-
-            for (i = 0; i < edep->data->frag_id; i++) {
-                sys_memcpy(ep, edep->data[i].extp, edep->data[i].ext_endp - edep->data[i].extp);
-                ep += edep->data[i].ext_endp - edep->data[i].extp;
-                erts_bin_release(edep->data[i].binp);
-                edep->data[i].binp = NULL;
-                edep->data[i].extp = NULL;
-                edep->data[i].ext_endp = NULL;
-            }
-
-            edep->data->frag_id = 1;
-            edep->data->extp = (byte*)bin->orig_bytes;
-            edep->data->ext_endp = ep;
-            edep->data->binp = bin;
-        }
-
         break;
     }
     default:
@@ -2055,10 +2010,17 @@ int erts_net_message(Port *prt,
             token = tuple[4];
         }
 	if (is_not_pid(from)
-            || dep != external_pid_dist_entry(from)
-            || is_not_internal_pid(to)) {
+            || dep != external_pid_dist_entry(from)) {
 	    goto invalid_message;
 	}
+        if (is_not_internal_pid(to)) {
+            if (is_external_pid(to)) {
+		DistEntry *dep = external_pid_dist_entry(to);
+		if (dep == erts_this_dist_entry)
+                    break; /* Old incarnation of this node... */
+            }
+            goto invalid_message;
+        }
 
         if (!erts_proc_lookup(to)) {
             if (ede_hfrag != NULL) {
@@ -3368,7 +3330,7 @@ dist_get_stat_1(BIF_ALIST_1)
                              am_ok,
                              erts_bld_sint64(hpp, szp, read),
                              erts_bld_sint64(hpp, szp, write),
-                             pend ? am_true : am_false);
+                             erts_bld_sint64(hpp, szp, pend));
         if (hpp)
             break;
         hp = HAlloc(BIF_P, sz);