Merge 'sverker/maint-19/alloc-n-migration/ERIERL-88'

into 'sverker/maint-20/alloc-n-migration/ERIERL-88'

OTP-14915
OTP-14916
OTP-14917
OTP-14918

1 files changed, 9 insertions, 7 deletions

diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.h b/erts/emulator/beam/erl_ao_firstfit_alloc.h
index 7349c6ab19..9cf4fc81a8 100644
--- a/erts/emulator/beam/erl_ao_firstfit_alloc.h
+++ b/erts/emulator/beam/erl_ao_firstfit_alloc.h
@@ -28,14 +28,16 @@
 
 typedef struct AOFFAllctr_t_ AOFFAllctr_t;
 
-enum AOFF_Flavor {
-    AOFF_AOFF = 0,
-    AOFF_AOBF = 1,
-    AOFF_BF   = 2
+enum AOFFSortOrder {
+    FF_AGEFF = 0,
+    FF_AOFF  = 1,
+    FF_AOBF  = 2,
+    FF_BF    = 3
 };
 
 typedef struct {
-    enum AOFF_Flavor flavor;
+    enum AOFFSortOrder blk_order;
+    enum AOFFSortOrder crr_order;
 } AOFFAllctrInit_t;
 
 #define ERTS_DEFAULT_AOFF_ALLCTR_INIT {0/*dummy*/}
@@ -53,12 +55,12 @@ Allctr_t *erts_aoffalc_start(AOFFAllctr_t *, AOFFAllctrInit_t*, AllctrInit_t *);
 #define GET_ERL_ALLOC_UTIL_IMPL
 #include "erl_alloc_util.h"
 
-
 struct AOFFAllctr_t_ {
     Allctr_t		allctr; /* Has to be first! */
 
     struct AOFF_RBTree_t_* mbc_root;
-    enum AOFF_Flavor flavor;
+    enum AOFFSortOrder blk_order;
+    enum AOFFSortOrder crr_order;
 };
 
 UWord erts_aoffalc_test(UWord, UWord, UWord);