diff options
| author | Erlang/OTP <[email protected]> | 2018-02-12 13:38:23 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-02-12 13:38:23 +0100 |
| commit | 8cfaa0cf95da91be39d116c2fb3b9d3419c9cfa6 (patch) | |
| tree | b45e01c062de78b9229556faed6ce70d532dce57 /erts/etc/common/erlexec.c | |
| parent | 5fcbb31beb1437124a181be4bd1cb2649d79c0b3 (diff) | |
| parent | 06e88d07a4719a0e15b4e666b16347fad463cee6 (diff) | |
| download | otp-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 'erts/etc/common/erlexec.c')
| -rw-r--r-- | erts/etc/common/erlexec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index eaa94cd5e4..793cb532b3 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -85,6 +85,8 @@ static char *plusM_au_alloc_switches[] = { "as", "asbcst", "acul", + "acnl", + "acfml", "e", "t", "lmbcs", |