aboutsummaryrefslogtreecommitdiffstats
path: root/lib/runtime_tools
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-02-12 13:33:29 +0100
committerSverker Eriksson <[email protected]>2018-02-12 13:33:29 +0100
commit7d390f2dd10f7a746a45a8c5b82af55f86e41f52 (patch)
tree85abb79ad1b6754f504e60debfdecd057b9afd20 /lib/runtime_tools
parentcd9b6371a13c37f8f82586fcd82f212d306d8fad (diff)
parent06e88d07a4719a0e15b4e666b16347fad463cee6 (diff)
downloadotp-7d390f2dd10f7a746a45a8c5b82af55f86e41f52.tar.gz
otp-7d390f2dd10f7a746a45a8c5b82af55f86e41f52.tar.bz2
otp-7d390f2dd10f7a746a45a8c5b82af55f86e41f52.zip
Merge 'sverker/maint-20/alloc-n-migration/ERIERL-88'
into 'sverker/master/alloc-n-migration/ERIERL-88'
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 342363d08d..6c1a945484 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