diff options
| author | Sverker Eriksson <[email protected]> | 2018-02-12 13:32:51 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-02-12 13:32:51 +0100 |
| commit | 06e88d07a4719a0e15b4e666b16347fad463cee6 (patch) | |
| tree | e340fa0359eeac5906ccb06a6f6adfcc0fc70718 /erts/preloaded | |
| parent | 194513197e19cd592f3f5c2231510542f5193fe4 (diff) | |
| parent | ecea4b22696dc2aaa57d9f9750fe07efb6b71cde (diff) | |
| download | otp-06e88d07a4719a0e15b4e666b16347fad463cee6.tar.gz otp-06e88d07a4719a0e15b4e666b16347fad463cee6.tar.bz2 otp-06e88d07a4719a0e15b4e666b16347fad463cee6.zip | |
Merge 'sverker/maint-19/alloc-n-migration/ERIERL-88'
into 'sverker/maint-20/alloc-n-migration/ERIERL-88'
OTP-14915
OTP-14916
OTP-14917
OTP-14918
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 106344 -> 106384 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 9 |
2 files changed, 6 insertions, 3 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 6fa48e8582..34e8031f2a 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 f796ea64d3..741d47d2fc 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2401,6 +2401,10 @@ subtract(_,_) -> OldDirtyCPUSchedulersOnline when DirtyCPUSchedulersOnline :: pos_integer(), OldDirtyCPUSchedulersOnline :: pos_integer(); + (erts_alloc, {Alloc, F, V}) -> ok | notsup when + Alloc :: atom(), + F :: atom(), + V :: integer(); (fullsweep_after, Number) -> OldNumber when Number :: non_neg_integer(), OldNumber :: non_neg_integer(); @@ -3769,15 +3773,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 -> |