diff options
| author | Sverker Eriksson <[email protected]> | 2013-05-21 20:05:06 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-06-03 14:26:53 +0200 |
| commit | 59ff0ec666601e59e504e05d3333526338f9de9b (patch) | |
| tree | 436246db183a708b8e0b7ea881c84cfe15ef9678 /erts/preloaded | |
| parent | 473612d16e75e8c01cbf7725205418700c389759 (diff) | |
| download | otp-59ff0ec666601e59e504e05d3333526338f9de9b.tar.gz otp-59ff0ec666601e59e504e05d3333526338f9de9b.tar.bz2 otp-59ff0ec666601e59e504e05d3333526338f9de9b.zip | |
erts: Remove SBMBC allocator
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 93520 -> 93444 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 7 |
2 files changed, 3 insertions, 4 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 315f9ebd47..a792d667c8 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 6929ca3fa5..3186ce6e4c 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -3114,8 +3114,8 @@ max(A, _) -> A. | 'atom' | 'atom_used' | 'binary' | 'code' | 'ets' | 'low' | 'maximum'. --define(CARRIER_ALLOCS, [mseg_alloc, sbmbc_alloc, sbmbc_low_alloc]). --define(LOW_ALLOCS, [sbmbc_low_alloc, ll_low_alloc, std_low_alloc]). +-define(CARRIER_ALLOCS, [mseg_alloc]). +-define(LOW_ALLOCS, [ll_low_alloc, std_low_alloc]). -define(ALL_NEEDED_ALLOCS, (erlang:system_info(alloc_util_allocators) -- ?CARRIER_ALLOCS)). @@ -3286,8 +3286,7 @@ get_blocks_size([], Acc) -> Acc. blocks_size([{Carriers, SizeList} | Rest], Acc) when Carriers == mbcs; - Carriers == sbcs; - Carriers == sbmbcs -> + Carriers == sbcs -> blocks_size(Rest, get_blocks_size(SizeList, Acc)); blocks_size([_ | Rest], Acc) -> blocks_size(Rest, Acc); |