diff options
| author | Sverker Eriksson <[email protected]> | 2013-06-20 15:06:34 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-06-20 15:06:57 +0200 |
| commit | 6898b6285f443e9ad8d01ce17b08bb7991c6ea5f (patch) | |
| tree | 00649c7883aa6424a3e7eb18cd864db5636c0a5f /erts/emulator/beam/erl_ao_firstfit_alloc.h | |
| parent | 10d93045982fc1477a4dade95d1cc400928fec14 (diff) | |
| parent | 8212fdf19997e08a52ff9374283ff5e148561a0c (diff) | |
| download | otp-6898b6285f443e9ad8d01ce17b08bb7991c6ea5f.tar.gz otp-6898b6285f443e9ad8d01ce17b08bb7991c6ea5f.tar.bz2 otp-6898b6285f443e9ad8d01ce17b08bb7991c6ea5f.zip | |
Merge branch 'sverk/aoffcbf' into maint
* sverk/aoffcbf:
erts: Make aoffcbf default when migration is enabled
erts: Add new allocator strategy aoffcbf
OTP-11174
Diffstat (limited to 'erts/emulator/beam/erl_ao_firstfit_alloc.h')
| -rw-r--r-- | erts/emulator/beam/erl_ao_firstfit_alloc.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.h b/erts/emulator/beam/erl_ao_firstfit_alloc.h index e92cb5abb6..25b344c6a8 100644 --- a/erts/emulator/beam/erl_ao_firstfit_alloc.h +++ b/erts/emulator/beam/erl_ao_firstfit_alloc.h @@ -24,12 +24,17 @@ #include "erl_alloc_util.h" #define ERTS_ALC_AOFF_ALLOC_VSN_STR "0.9" -#define ERTS_ALC_AOFF_CBF_ALLOC_VSN_STR "0.9" typedef struct AOFFAllctr_t_ AOFFAllctr_t; +enum AOFF_Flavor { + AOFF_AOFF = 0, + AOFF_AOBF = 1, + AOFF_BF = 2 +}; + typedef struct { - int bf_within_carrier; + enum AOFF_Flavor flavor; } AOFFAllctrInit_t; #define ERTS_DEFAULT_AOFF_ALLCTR_INIT {0/*dummy*/} @@ -52,7 +57,7 @@ struct AOFFAllctr_t_ { Allctr_t allctr; /* Has to be first! */ struct AOFF_RBTree_t_* mbc_root; - int bf_within_carrier; + enum AOFF_Flavor flavor; }; UWord erts_aoffalc_test(UWord, UWord, UWord); |