diff options
| author | Sverker Eriksson <[email protected]> | 2017-11-13 20:36:21 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-11-13 20:40:33 +0100 |
| commit | b1d720eff3f3b59a8a5261a14728336d306ca70b (patch) | |
| tree | 9ffcbde247fbd521ec5171f85a50c99a56270eb9 /erts | |
| parent | 374623c53c7b7f613eb9aa20deb06d7425697086 (diff) | |
| download | otp-b1d720eff3f3b59a8a5261a14728336d306ca70b.tar.gz otp-b1d720eff3f3b59a8a5261a14728336d306ca70b.tar.bz2 otp-b1d720eff3f3b59a8a5261a14728336d306ca70b.zip | |
Fix erlang:memory
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 105124 -> 105092 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 72898e6d8a..ae3f11cd9d 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 8771089b65..3abb4538dc 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -3713,15 +3713,14 @@ memory_is_supported() -> get_blocks_size([{blocks_size, Sz, _, _} | Rest], Acc) -> get_blocks_size(Rest, Acc+Sz); -get_blocks_size([{_, _, _, _} | Rest], Acc) -> - get_blocks_size(Rest, Acc); get_blocks_size([{blocks_size, Sz} | Rest], Acc) -> get_blocks_size(Rest, Acc+Sz); -get_blocks_size([{_, _} | Rest], Acc) -> +get_blocks_size([_ | Rest], Acc) -> get_blocks_size(Rest, Acc); get_blocks_size([], Acc) -> Acc. + blocks_size([{Carriers, SizeList} | Rest], Acc) when Carriers == mbcs; Carriers == mbcs_pool; Carriers == sbcs -> |