1 files changed, 27 insertions, 26 deletions

diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index 71ab92937d..118adc0c1b 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -696,10 +696,10 @@ erts_send_message(Process* sender,
     erts_aint32_t receiver_state;
 #ifdef SHCOPY_SEND
     erts_shcopy_t info;
+#else
+    erts_literal_area_t litarea;
+    INITIALIZE_LITERAL_PURGE_AREA(litarea);
 #endif
-    BM_STOP_TIMER(system);
-    BM_MESSAGE(message,sender,receiver);
-    BM_START_TIMER(send);
 
 #ifdef USE_VM_PROBES
     *sender_name = *receiver_name = '\0';
@@ -720,7 +720,6 @@ erts_send_message(Process* sender,
 #ifdef USE_VM_PROBES
 	Uint dt_utag_size = 0;
 #endif
-        BM_SWAP_TIMER(send,size);
 
         /* SHCOPY corrupts the heap between
          * copy_shared_calculate, and
@@ -729,7 +728,7 @@ erts_send_message(Process* sender,
          */
         if (have_seqtrace(stoken)) {
 	    seq_trace_update_send(sender);
-	    seq_trace_output(stoken, message, SEQ_TRACE_SEND, 
+	    seq_trace_output(stoken, message, SEQ_TRACE_SEND,
 			     receiver->common.id, sender);
 	    seq_trace_size = 6; /* TUPLE5 */
 	}
@@ -745,10 +744,8 @@ erts_send_message(Process* sender,
         INITIALIZE_SHCOPY(info);
         msize = copy_shared_calculate(message, &info);
 #else
-        msize = size_object(message);
+        msize = size_object_litopt(message, &litarea);
 #endif
-        BM_SWAP_TIMER(size,send);
-
         mp = erts_alloc_message_heap_state(receiver,
                                            &receiver_state,
                                            receiver_locks,
@@ -760,15 +757,13 @@ erts_send_message(Process* sender,
                                            &hp,
                                            &ohp);
 
-        BM_SWAP_TIMER(send,copy);
-
 #ifdef SHCOPY_SEND
 	if (is_not_immed(message))
             message = copy_shared_perform(message, msize, &info, &hp, ohp);
         DESTROY_SHCOPY(info);
 #else
 	if (is_not_immed(message))
-            message = copy_struct(message, msize, &hp, ohp);
+            message = copy_struct_litopt(message, msize, &hp, ohp, &litarea);
 #endif
 	if (is_immed(stoken))
 	    token = stoken;
@@ -792,9 +787,6 @@ erts_send_message(Process* sender,
 		    msize, tok_label, tok_lastcnt, tok_serial);
         }
 #endif
-        BM_MESSAGE_COPIED(msize);
-        BM_SWAP_TIMER(copy,send);
-
     } else {
         Eterm *hp;
 
@@ -803,32 +795,26 @@ erts_send_message(Process* sender,
 	    msize = 0;
 	}
 	else {
-	    BM_SWAP_TIMER(send,size);
 #ifdef SHCOPY_SEND
             INITIALIZE_SHCOPY(info);
             msize = copy_shared_calculate(message, &info);
 #else
-            msize = size_object(message);
+            msize = size_object_litopt(message, &litarea);
 #endif
-	    BM_SWAP_TIMER(size,send);
-
 	    mp = erts_alloc_message_heap_state(receiver,
 					       &receiver_state,
 					       receiver_locks,
 					       msize,
 					       &hp,
 					       &ohp);
-	    BM_SWAP_TIMER(send,copy);
 #ifdef SHCOPY_SEND
             if (is_not_immed(message))
                 message = copy_shared_perform(message, msize, &info, &hp, ohp);
             DESTROY_SHCOPY(info);
 #else
             if (is_not_immed(message))
-                message = copy_struct(message, msize, &hp, ohp);
+                message = copy_struct_litopt(message, msize, &hp, ohp, &litarea);
 #endif
-	    BM_MESSAGE_COPIED(msz);
-	    BM_SWAP_TIMER(copy,send);
 	}
 #ifdef USE_VM_PROBES
         DTRACE6(message_send, sender_name, receiver_name,
@@ -846,8 +832,6 @@ erts_send_message(Process* sender,
 			mp, message,
                         sender->common.id);
 
-    BM_SWAP_TIMER(send,system);
-    
     return res;
 }
 
@@ -1017,8 +1001,8 @@ erts_move_messages_off_heap(Process *c_p)
 	hp = hfrag->mem;
 	if (is_not_immed(ERL_MESSAGE_TERM(mp)))
 	    ERL_MESSAGE_TERM(mp) = copy_struct(ERL_MESSAGE_TERM(mp),
-					       msg_sz, &hp,
-					       &hfrag->off_heap);
+                                               msg_sz, &hp,
+                                               &hfrag->off_heap);
 	if (is_not_immed(ERL_MESSAGE_TOKEN(mp)))
 	    ERL_MESSAGE_TOKEN(mp) = copy_struct(ERL_MESSAGE_TOKEN(mp),
 						token_sz, &hp,
@@ -1861,3 +1845,20 @@ void erts_factory_undo(ErtsHeapFactory* factory)
     factory->heap_frags = NULL;
 #endif
 }
+
+Uint
+erts_mbuf_size(Process *p)
+{
+    Uint sz = 0;
+    ErlHeapFragment* bp;
+    ErtsMessage* mp;
+
+    for (bp = p->mbuf; bp; bp = bp->next)
+	sz += bp->used_size;
+
+    for (mp = p->msg_frag; mp; mp = mp->next)
+	for (bp = erts_message_to_heap_frag(mp); bp; bp = bp->next)
+	    sz += bp->used_size;
+
+    return sz;
+}