diff options
| author | Sverker Eriksson <[email protected]> | 2011-07-29 17:42:02 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-07-29 17:42:02 +0200 |
| commit | 07936436b8a8b18b80451a09e040283ebecbd43b (patch) | |
| tree | 351efbc05604fa0df288662f9071bd8912954d0c /erts/emulator/test/alloc_SUITE_data/allocator_test.h | |
| parent | 388bb54ba7128c1242c3fbee8a45168bd20110a4 (diff) | |
| parent | 94ad6bd0aec9dd41b1bb4d789df313ddcad5af5b (diff) | |
| download | otp-07936436b8a8b18b80451a09e040283ebecbd43b.tar.gz otp-07936436b8a8b18b80451a09e040283ebecbd43b.tar.bz2 otp-07936436b8a8b18b80451a09e040283ebecbd43b.zip | |
Merge branch 'sverker/allocator-aoff/OTP-9424' into dev
* sverker/allocator-aoff/OTP-9424:
New allocator: Address order first fit (aoff)
Diffstat (limited to 'erts/emulator/test/alloc_SUITE_data/allocator_test.h')
| -rw-r--r-- | erts/emulator/test/alloc_SUITE_data/allocator_test.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/erts/emulator/test/alloc_SUITE_data/allocator_test.h b/erts/emulator/test/alloc_SUITE_data/allocator_test.h index b869a4079c..8b34375980 100644 --- a/erts/emulator/test/alloc_SUITE_data/allocator_test.h +++ b/erts/emulator/test/alloc_SUITE_data/allocator_test.h @@ -82,15 +82,17 @@ typedef void* erts_cond; #define NO_OF_BKTS ((Ulong) ALC_TEST0(0x102)) #define FIND_BKT(A, I) ((int) ALC_TEST2(0x103, (A), (I))) -/* From erl_bestfit_alloc.c */ -#define IS_AOBF(A) ((Ulong) ALC_TEST1(0x200, (A))) -#define RBT_ROOT(A) ((RBT_t *) ALC_TEST1(0x201, (A))) -#define RBT_PARENT(T) ((RBT_t *) ALC_TEST1(0x202, (T))) -#define RBT_LEFT(T) ((RBT_t *) ALC_TEST1(0x203, (T))) -#define RBT_RIGHT(T) ((RBT_t *) ALC_TEST1(0x204, (T))) -#define RBT_NEXT(T) ((RBTL_t *) ALC_TEST1(0x205, (T))) -#define RBT_IS_BLACK(T) ((Ulong) ALC_TEST1(0x206, (T))) -#define RBT_IS_TREE(T) ((Ulong) ALC_TEST1(0x207, (T))) +/* From erl_bestfit_alloc.c and erl_ao_firstfit_alloc.c */ +#define IS_AOBF(A) ((Ulong) ALC_TEST1(RBT_OP(0), (A))) +#define RBT_ROOT(A) ((RBT_t *) ALC_TEST1(RBT_OP(1), (A))) +#define RBT_PARENT(T) ((RBT_t *) ALC_TEST1(RBT_OP(2), (T))) +#define RBT_LEFT(T) ((RBT_t *) ALC_TEST1(RBT_OP(3), (T))) +#define RBT_RIGHT(T) ((RBT_t *) ALC_TEST1(RBT_OP(4), (T))) +#define RBT_NEXT(T) ((RBTL_t *) ALC_TEST1(RBT_OP(5), (T))) +#define RBT_IS_BLACK(T) ((Ulong) ALC_TEST1(RBT_OP(6), (T))) +#define RBT_IS_TREE(T) ((Ulong) ALC_TEST1(RBT_OP(7), (T))) +#define IS_AOFF(A) ((Ulong) ALC_TEST1(RBT_OP(8), (A))) +#define RBT_MAX_SZ(T) ((Ulong) ALC_TEST1(RBT_OP(9), (T))) /* From erl_mseg.c */ #define HAVE_MSEG() ((int) ALC_TEST0(0x400)) |