diff options
| author | Sverker Eriksson <[email protected]> | 2013-06-19 18:37:36 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-06-19 19:39:43 +0200 |
| commit | 8212fdf19997e08a52ff9374283ff5e148561a0c (patch) | |
| tree | b859c265692793d857db0e1e2cfe94bd05d8741f /erts | |
| parent | 5d67cc7f4c176ea6ab4d2538443d5fe264152861 (diff) | |
| download | otp-8212fdf19997e08a52ff9374283ff5e148561a0c.tar.gz otp-8212fdf19997e08a52ff9374283ff5e148561a0c.tar.bz2 otp-8212fdf19997e08a52ff9374283ff5e148561a0c.zip | |
erts: Make aoffcbf default when migration is enabled
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/erts_alloc.xml | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml index 5e008493b9..6ce2261430 100644 --- a/erts/doc/src/erts_alloc.xml +++ b/erts/doc/src/erts_alloc.xml @@ -344,7 +344,7 @@ <seealso marker="#M_t">multiple thread specific instances</seealso> to be enabled. When enabling this feature, multiple thread specific instances will be enabled if not already enabled, and the - <c>aoffcaobf</c> strategy will be enabled if current strategy does not + <c>aoffcbf</c> strategy will be enabled if current strategy does not support abandoned carriers. This feature can be enabled on all allocators based on the <c>alloc_util</c> framework with the exception of <c>temp_alloc</c> (which would be pointless). diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index 7b77bcca58..306a4f24de 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -245,7 +245,7 @@ set_default_acul(struct au_init *ip, int acul) { ip->thr_spec = 1; ip->atype = AOFIRSTFIT; - ip->init.aoff.flavor = AOFF_AOBF; + ip->init.aoff.flavor = AOFF_BF; ip->init.util.acul = acul; } @@ -581,9 +581,9 @@ ensure_carrier_migration_support(struct au_init *auip) * default to a strategy that can... */ if (!strategy_support_carrier_migration(auip)) { - /* Default to aoffcaobf */ + /* Default to aoffcbf */ auip->atype = AOFIRSTFIT; - auip->init.aoff.flavor = AOFF_AOBF; + auip->init.aoff.flavor = AOFF_BF; } } |