diff options
| author | Sverker Eriksson <[email protected]> | 2011-07-26 17:09:22 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-07-26 17:09:22 +0200 |
| commit | 9cd77a455b7faa05e8f9364bdbd16c57836e71c9 (patch) | |
| tree | 15d3682abe4c128ccdaf8b13d70a11cc751b481f /erts/emulator/beam/erl_alloc_util.c | |
| parent | 25bbf48a7cf7576ba18e95dd268c66b63ec698e0 (diff) | |
| parent | 11c1e9cb50a86f193bbd9be033b75298de85875f (diff) | |
| download | otp-9cd77a455b7faa05e8f9364bdbd16c57836e71c9.tar.gz otp-9cd77a455b7faa05e8f9364bdbd16c57836e71c9.tar.bz2 otp-9cd77a455b7faa05e8f9364bdbd16c57836e71c9.zip | |
Merge branch 'sverker/sbmbc-fixup' into dev
* sverker/sbmbc-fixup:
Small fixups for rickard/sbmbc/OTP-9339
Diffstat (limited to 'erts/emulator/beam/erl_alloc_util.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c index 19c552d8cd..d51ed0c36d 100644 --- a/erts/emulator/beam/erl_alloc_util.c +++ b/erts/emulator/beam/erl_alloc_util.c @@ -3436,10 +3436,7 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init) allctr->sbmbc_threshold = init->sbmbct; if (!erts_have_sbmbc_alloc -#if HALFWORD_HEAP - || allctr->alloc_no == ERTS_ALC_A_SBMBC_LOW -#endif - || allctr->alloc_no == ERTS_ALC_A_SBMBC) + || ERTS_IS_SBMBC_ALLOCATOR_NO__(allctr->alloc_no)) allctr->sbmbc_threshold = 0; if (!allctr->sbmbc_threshold) @@ -3466,14 +3463,14 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init) #ifdef ERTS_ENABLE_LOCK_COUNT erts_mtx_init_x_opt(&allctr->mutex, - allctr->alloc_no == ERTS_ALC_A_SBMBC + ERTS_IS_SBMBC_ALLOCATOR_NO__(allctr->alloc_no) ? "sbmbc_alloc" : "alcu_allocator", make_small(allctr->alloc_no), ERTS_LCNT_LT_ALLOC); #else erts_mtx_init_x(&allctr->mutex, - allctr->alloc_no == ERTS_ALC_A_SBMBC + ERTS_IS_SBMBC_ALLOCATOR_NO__(allctr->alloc_no) ? "sbmbc_alloc" : "alcu_allocator", make_small(allctr->alloc_no)); |