aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-05-16 09:46:42 +0200
committerLukas Larsson <[email protected]>2013-05-16 09:46:42 +0200
commit54f5cea53853351ecd0042ebe0e9b9bdc1ba4449 (patch)
tree8958c9619f1a0958894c3e3dfa41f06b4f42b722 /erts/doc
parent8992e61d3fe98c246f00a2b701fba6c54567582e (diff)
parent9116b4b6a19e18c926d218b325dfa6ddd4e04f41 (diff)
downloadotp-54f5cea53853351ecd0042ebe0e9b9bdc1ba4449.tar.gz
otp-54f5cea53853351ecd0042ebe0e9b9bdc1ba4449.tar.bz2
otp-54f5cea53853351ecd0042ebe0e9b9bdc1ba4449.zip
Merge branch 'lukas/erts/process_memory_crash_dump/OTP-11098' into maint
* lukas/erts/process_memory_crash_dump/OTP-11098: Print process memory usage info in crash dump
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/crash_dump.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/doc/src/crash_dump.xml b/erts/doc/src/crash_dump.xml
index b3c4671c3d..73212e6143 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