Merge branch 'maint'

* maint:
  Print process memory usage info in crash dump

7 files changed, 68 insertions, 56 deletions

diff --git a/erts/doc/src/crash_dump.xml b/erts/doc/src/crash_dump.xml
index 7f17ef2632..c59741f250 100644
--- a/erts/doc/src/crash_dump.xml
+++ b/erts/doc/src/crash_dump.xml
@@ -290,6 +290,10 @@
       <em>Stack+heap</em>, <em>OldHeap</em>, <em>Heap unused</em>
        and <em>OldHeap unused</em> do not exist. Instead this field
        presents the size of the process' stack.</item>
+      <tag><em>Memory</em></tag>
+      <item>The total memory used by this process. This includes call stack,
+      heap and internal structures. Same as <seealso marker="erlang#process_info-2">erlang:process_info(Pid,memory)</seealso>.
+      </item>
       <tag><em>Program counter</em></tag>
       <item>The current instruction pointer. This is only interesting for
        runtime system developers. The function into which the program
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index 9aa1e5f30d..e34fc8388c 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -331,6 +331,7 @@ print_process_info(int to, void *to_arg, Process *p)
     erts_print(to, to_arg, "Heap unused: %bpu\n", (p->hend - p->htop));
     erts_print(to, to_arg, "OldHeap unused: %bpu\n",
 	       (OLD_HEAP(p) == NULL) ? 0 : (OLD_HEND(p) - OLD_HTOP(p)) );
+    erts_print(to, to_arg, "Memory: %beu\n", erts_process_memory(p));
 
     if (garbing) {
 	print_garb_info(to, to_arg, p);
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 379d3eecc6..f65396df55 100755
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -486,27 +486,6 @@ collect_one_suspend_monitor(ErtsSuspendMonitor *smon, void *vsmicp)
     }
 }
 
-
-static void one_link_size(ErtsLink *lnk, void *vpu)
-{
-    Uint *pu = vpu;
-    *pu += ERTS_LINK_SIZE*sizeof(Uint);
-    if(!IS_CONST(lnk->pid))
-	*pu += NC_HEAP_SIZE(lnk->pid)*sizeof(Uint);
-    if (lnk->type != LINK_NODE && ERTS_LINK_ROOT(lnk) != NULL) {
-	erts_doforall_links(ERTS_LINK_ROOT(lnk),&one_link_size,vpu);
-    }
-}
-static void one_mon_size(ErtsMonitor *mon, void *vpu)
-{
-    Uint *pu = vpu;
-    *pu += ERTS_MONITOR_SIZE*sizeof(Uint);
-    if(!IS_CONST(mon->pid))
-	*pu += NC_HEAP_SIZE(mon->pid)*sizeof(Uint);
-    if(!IS_CONST(mon->ref))
-	*pu += NC_HEAP_SIZE(mon->ref)*sizeof(Uint);
-}
-
 /*
  * process_info/[1,2]
  */
@@ -1420,41 +1399,8 @@ process_info_aux(Process *BIF_P,
     }
 
     case am_memory: { /* Memory consumed in bytes */
-	ErlMessage *mp;
-	Uint size = 0;
 	Uint hsz = 3;
-	struct saved_calls *scb;
-	size += sizeof(Process);
-
-	ERTS_SMP_MSGQ_MV_INQ2PRIVQ(rp);
-
-	erts_doforall_links(ERTS_P_LINKS(rp), &one_link_size, &size);
-	erts_doforall_monitors(ERTS_P_MONITORS(rp), &one_mon_size, &size);
-	size += (rp->heap_sz + rp->mbuf_sz) * sizeof(Eterm);
-	if (rp->old_hend && rp->old_heap)
-	    size += (rp->old_hend - rp->old_heap) * sizeof(Eterm);
-
-	size += rp->msg.len * sizeof(ErlMessage);
-
-	for (mp = rp->msg.first; mp; mp = mp->next)
-	    if (mp->data.attached)
-		size += erts_msg_attached_data_size(mp)*sizeof(Eterm);
-
-	if (rp->arg_reg != rp->def_arg_reg) {
-	    size += rp->arity * sizeof(rp->arg_reg[0]);
-	}
-
-	if (rp->psd)
-	    size += sizeof(ErtsPSD);
-
-	scb = ERTS_PROC_GET_SAVED_CALLS_BUF(rp);
-	if (scb) {
-	    size += (sizeof(struct saved_calls)
-		     + (scb->len-1) * sizeof(scb->ct[0]));
-	}
-
-	size += erts_dicts_mem_size(rp);
-
+	Uint size = erts_process_memory(rp);
 	(void) erts_bld_uint(NULL, &hsz, size);
 	hp = HAlloc(BIF_P, hsz);
 	res = erts_bld_uint(&hp, NULL, size);
@@ -2863,7 +2809,7 @@ erts_bld_port_info(Eterm **hpp, ErlOffHeap *ohp, Uint *szp, Port *prt, Eterm ite
 	Uint size = 0;
 	ErlHeapFragment* bp;
 
-	erts_doforall_links(ERTS_P_LINKS(prt), &one_link_size, &size);
+	erts_doforall_links(ERTS_P_LINKS(prt), &erts_one_link_size, &size);
 
 	for (bp = prt->bp; bp; bp = bp->next)
 	    size += sizeof(ErlHeapFragment) + (bp->alloc_size - 1)*sizeof(Eterm);
diff --git a/erts/emulator/beam/erl_monitors.c b/erts/emulator/beam/erl_monitors.c
index 70e592cc5f..244a2b26db 100644
--- a/erts/emulator/beam/erl_monitors.c
+++ b/erts/emulator/beam/erl_monitors.c
@@ -1024,3 +1024,23 @@ Eterm erts_debug_dump_links_1(BIF_ALIST_1)
 	}
     }
 }
+
+void erts_one_link_size(ErtsLink *lnk, void *vpu)
+{
+    Uint *pu = vpu;
+    *pu += ERTS_LINK_SIZE*sizeof(Uint);
+    if(!IS_CONST(lnk->pid))
+	*pu += NC_HEAP_SIZE(lnk->pid)*sizeof(Uint);
+    if (lnk->type != LINK_NODE && ERTS_LINK_ROOT(lnk) != NULL) {
+	erts_doforall_links(ERTS_LINK_ROOT(lnk),&erts_one_link_size,vpu);
+    }
+}
+void erts_one_mon_size(ErtsMonitor *mon, void *vpu)
+{
+    Uint *pu = vpu;
+    *pu += ERTS_MONITOR_SIZE*sizeof(Uint);
+    if(!IS_CONST(mon->pid))
+	*pu += NC_HEAP_SIZE(mon->pid)*sizeof(Uint);
+    if(!IS_CONST(mon->ref))
+	*pu += NC_HEAP_SIZE(mon->ref)*sizeof(Uint);
+}
diff --git a/erts/emulator/beam/erl_monitors.h b/erts/emulator/beam/erl_monitors.h
index 6a360a2336..fb11dbbd22 100644
--- a/erts/emulator/beam/erl_monitors.h
+++ b/erts/emulator/beam/erl_monitors.h
@@ -170,6 +170,8 @@ ErtsSuspendMonitor *erts_lookup_suspend_monitor(ErtsSuspendMonitor *root,
 						Eterm pid);
 void erts_delete_suspend_monitor(ErtsSuspendMonitor **root, Eterm pid);
 void erts_init_monitors(void);
+void erts_one_link_size(ErtsLink *lnk, void *vpu);
+void erts_one_mon_size(ErtsMonitor *mon, void *vpu);
 
 #define erts_doforall_monitors erts_sweep_monitors
 #define erts_doforall_links erts_sweep_links
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index 3d3579fa7e..c40a6f86e4 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -1421,6 +1421,8 @@ Eterm erts_debug_reader_groups_map(Process *c_p, int groups);
 Uint erts_debug_nbalance(void);
 int erts_debug_wait_deallocations(Process *c_p);
 
+Uint erts_process_memory(Process *c_p);
+
 #ifdef ERTS_SMP
 #  define ERTS_GET_SCHEDULER_DATA_FROM_PROC(PROC) ((PROC)->scheduler_data)
 #  define ERTS_PROC_GET_SCHDATA(PROC) ((PROC)->scheduler_data)
diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c
index a93229c473..6cd0d23b97 100644
--- a/erts/emulator/beam/erl_process_dump.c
+++ b/erts/emulator/beam/erl_process_dump.c
@@ -76,6 +76,43 @@ erts_deep_process_dump(int to, void *to_arg)
     dump_binaries(to, to_arg, all_binaries);
 }
 
+Uint erts_process_memory(Process *p) {
+  ErlMessage *mp;
+  Uint size = 0;
+  struct saved_calls *scb;
+  size += sizeof(Process);
+
+  ERTS_SMP_MSGQ_MV_INQ2PRIVQ(p);
+
+  erts_doforall_links(ERTS_P_LINKS(p), &erts_one_link_size, &size);
+  erts_doforall_monitors(ERTS_P_MONITORS(p), &erts_one_mon_size, &size);
+  size += (p->heap_sz + p->mbuf_sz) * sizeof(Eterm);
+  if (p->old_hend && p->old_heap)
+    size += (p->old_hend - p->old_heap) * sizeof(Eterm);
+
+  size += p->msg.len * sizeof(ErlMessage);
+
+  for (mp = p->msg.first; mp; mp = mp->next)
+    if (mp->data.attached)
+      size += erts_msg_attached_data_size(mp)*sizeof(Eterm);
+
+  if (p->arg_reg != p->def_arg_reg) {
+    size += p->arity * sizeof(p->arg_reg[0]);
+  }
+
+  if (p->psd)
+    size += sizeof(ErtsPSD);
+
+  scb = ERTS_PROC_GET_SAVED_CALLS_BUF(p);
+  if (scb) {
+    size += (sizeof(struct saved_calls)
+	     + (scb->len-1) * sizeof(scb->ct[0]));
+  }
+
+  size += erts_dicts_mem_size(p);
+  return size;
+}
+
 static void
 dump_process_info(int to, void *to_arg, Process *p)
 {