aboutsummaryrefslogtreecommitdiffstats
path: root/lib/runtime_tools
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-02-12 13:38:23 +0100
committerErlang/OTP <[email protected]>2018-02-12 13:38:23 +0100
commit8cfaa0cf95da91be39d116c2fb3b9d3419c9cfa6 (patch)
treeb45e01c062de78b9229556faed6ce70d532dce57 /lib/runtime_tools
parent5fcbb31beb1437124a181be4bd1cb2649d79c0b3 (diff)
parent06e88d07a4719a0e15b4e666b16347fad463cee6 (diff)
downloadotp-8cfaa0cf95da91be39d116c2fb3b9d3419c9cfa6.tar.gz
otp-8cfaa0cf95da91be39d116c2fb3b9d3419c9cfa6.tar.bz2
otp-8cfaa0cf95da91be39d116c2fb3b9d3419c9cfa6.zip
Merge branch 'sverker/maint-20/alloc-n-migration/ERIERL-88' into maint-20
* sverker/maint-20/alloc-n-migration/ERIERL-88: erts: Add system_flags(erts_alloc,"+M?sbct *") erts: Add age order first fit allocator strategies erts: Refactor erl_ao_firstfit_alloc erts: Add migration options "acnl" and "acfml" erts: Add more stats for mbcs_pool erts: Fix alloc_SUITE:migration stdlib: Make ets_SUITE memory check try again erts: Improve carrier pool search erts: Improve alloc_SUITE:migration erts: Refactor carrier dealloc migration
Diffstat (limited to 'lib/runtime_tools')
-rw-r--r--lib/runtime_tools/src/erts_alloc_config.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/runtime_tools/src/erts_alloc_config.erl b/lib/runtime_tools/src/erts_alloc_config.erl
index 514530332c..4b028681a0 100644
--- a/lib/runtime_tools/src/erts_alloc_config.erl
+++ b/lib/runtime_tools/src/erts_alloc_config.erl
@@ -265,7 +265,13 @@ strategy_str(aoff) ->
strategy_str(aoffcbf) ->
"Address order first fit carrier best fit";
strategy_str(aoffcaobf) ->
- "Address order first fit carrier adress order best fit".
+ "Address order first fit carrier adress order best fit";
+strategy_str(ageffcaoff) ->
+ "Age order first fit carrier address order first fit";
+strategy_str(ageffcbf) ->
+ "Age order first fit carrier best fit";
+strategy_str(ageffcaobf) ->
+ "Age order first fit carrier adress order best fit".
default_acul(A, S) ->
case carrier_migration_support(S) of