diff options
| author | Sverker Eriksson <[email protected]> | 2018-05-22 16:09:02 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-05-22 19:20:36 +0200 |
| commit | ab4b203b84eb59e1a86551a91056ab10aa47bb59 (patch) | |
| tree | 4b94694de57210202ff4cc069b1ad09238d71b81 | |
| parent | 48f2d66707330667c6d3e268466b5440d1b930ab (diff) | |
| download | otp-ab4b203b84eb59e1a86551a91056ab10aa47bb59.tar.gz otp-ab4b203b84eb59e1a86551a91056ab10aa47bb59.tar.bz2 otp-ab4b203b84eb59e1a86551a91056ab10aa47bb59.zip | |
erts: Fix erlang:memory for 'processes' and 'processes_used'
to include links and monitors which were lost at
4bc282d812cc2c49aa3e2d073e96c720f16aa270
where these fix_alloc types changed names.
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 103344 -> 103296 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 5 |
2 files changed, 2 insertions, 3 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 52f4c686a9..99f11495a5 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 3a42e841e2..f4f31b1e4b 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -3778,8 +3778,8 @@ blocks_size([], Acc) -> Acc. get_fix_proc([{ProcType, A1, U1}| Rest], {A0, U0}) when ProcType == proc; - ProcType == monitor_sh; - ProcType == nlink_sh; + ProcType == monitor; + ProcType == link; ProcType == msg_ref; ProcType == ll_ptimer; ProcType == hl_ptimer; @@ -3903,7 +3903,6 @@ aa_mem_data(#memory{processes = Proc, processes_used = ProcU, system = Sys} = Mem, [{ProcData, Sz} | Rest]) when ProcData == bif_timer; - ProcData == link_lh; ProcData == process_table -> aa_mem_data(Mem#memory{processes = Proc+Sz, processes_used = ProcU+Sz, |