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/emulator/beam/erl_process.h | |
| 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/emulator/beam/erl_process.h')
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 2 |
1 files changed, 2 insertions, 0 deletions
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) |