diff options
| author | Lukas Larsson <[email protected]> | 2013-05-16 09:47:43 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-05-16 09:47:43 +0200 |
| commit | c93d43ddb1b6155df44196adbc2667f1a1502bcc (patch) | |
| tree | 0763d00f2f82bf5306723753b97e5ccb6a6d8d3a /erts/doc | |
| parent | 8448e853ee2beaa1bdff4a2e5e0019d739ff31c1 (diff) | |
| parent | 54f5cea53853351ecd0042ebe0e9b9bdc1ba4449 (diff) | |
| download | otp-c93d43ddb1b6155df44196adbc2667f1a1502bcc.tar.gz otp-c93d43ddb1b6155df44196adbc2667f1a1502bcc.tar.bz2 otp-c93d43ddb1b6155df44196adbc2667f1a1502bcc.zip | |
Merge branch 'maint'
* maint:
Print process memory usage info in crash dump
Diffstat (limited to 'erts/doc')
| -rw-r--r-- | erts/doc/src/crash_dump.xml | 4 |
1 files changed, 4 insertions, 0 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 |