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 /lib/runtime_tools/src | |
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 'lib/runtime_tools/src')
-rw-r--r-- | lib/runtime_tools/src/erts_alloc_config.erl | 8 |
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 |