diff options
| author | Sverker Eriksson <[email protected]> | 2018-02-12 13:25:02 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-02-12 13:25:02 +0100 |
| commit | ecea4b22696dc2aaa57d9f9750fe07efb6b71cde (patch) | |
| tree | c6b7f5fc93465d5a766c6056deb8aa3633b28b0a /erts/preloaded | |
| parent | d1e89f8df4be7197fdab36a3e1662183a7dfe6ae (diff) | |
| parent | d74796ecb17a68d442e846c4032a57cb2c083686 (diff) | |
| download | otp-ecea4b22696dc2aaa57d9f9750fe07efb6b71cde.tar.gz otp-ecea4b22696dc2aaa57d9f9750fe07efb6b71cde.tar.bz2 otp-ecea4b22696dc2aaa57d9f9750fe07efb6b71cde.zip | |
Merge 'sverker/carrier-migration-improvements'
into 'sverker/maint-19/alloc-n-migration/ERIERL-88'
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 105140 -> 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 7a2d9e5a81..24d3d8fc84 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 6030f7312d..1bd3d14826 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -3717,15 +3717,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 -> |