diff options
| author | Sverker Eriksson <[email protected]> | 2018-02-13 11:59:09 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-02-13 11:59:09 +0100 |
| commit | dc0b345ae5374a422250c9d2e3bec63e6186afca (patch) | |
| tree | 48a5e92b6ef5c327e7e3d0f15278069eaa7dd24c /lib/runtime_tools/src | |
| parent | b1c7c64315ab93bb6fbed51664baf93ee8ee33f8 (diff) | |
| parent | 309ef748ddc5bde4bcba280ce2739385f27a76e6 (diff) | |
| download | otp-dc0b345ae5374a422250c9d2e3bec63e6186afca.tar.gz otp-dc0b345ae5374a422250c9d2e3bec63e6186afca.tar.bz2 otp-dc0b345ae5374a422250c9d2e3bec63e6186afca.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
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"
kernel: Add os:cmd/2 with max_size option
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/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 |