diff options
| author | Rickard Green <[email protected]> | 2013-05-17 09:36:44 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-06-04 11:34:51 +0200 |
| commit | 32a73196379a8c3e6083104e2d235f35b5bcbbbf (patch) | |
| tree | 4b5e51280b8b6b68b341cce9ee794e4f409206a8 /erts/emulator/beam/erl_ao_firstfit_alloc.c | |
| parent | 6aa140d2e9c0a810e057a140a3fdc252acf658d1 (diff) | |
| download | otp-32a73196379a8c3e6083104e2d235f35b5bcbbbf.tar.gz otp-32a73196379a8c3e6083104e2d235f35b5bcbbbf.tar.bz2 otp-32a73196379a8c3e6083104e2d235f35b5bcbbbf.zip | |
erts: Use carrier pool for migration of carriers
Diffstat (limited to 'erts/emulator/beam/erl_ao_firstfit_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_ao_firstfit_alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.c b/erts/emulator/beam/erl_ao_firstfit_alloc.c index 3bb0bf146e..953569f437 100644 --- a/erts/emulator/beam/erl_ao_firstfit_alloc.c +++ b/erts/emulator/beam/erl_ao_firstfit_alloc.c @@ -664,7 +664,7 @@ aoff_link_free_block(Allctr_t *allctr, Block_t *block) AOFF_Carrier_t *blk_crr = (AOFF_Carrier_t*) FBLK_TO_MBC(block); Uint blk_sz = AOFF_BLK_SZ(blk); - ASSERT(allctr == blk_crr->crr.allctr); + ASSERT(allctr == ERTS_ALC_CARRIER_TO_ALLCTR(&blk_crr->crr)); ASSERT(blk_crr->rbt_node.hdr.bhdr == (blk_crr->root ? blk_crr->root->max_sz : 0)); HARD_CHECK_IS_MEMBER(alc->mbc_root, &blk_crr->rbt_node); HARD_CHECK_TREE(&blk_crr->crr, alc->bf_within_carrier, blk_crr->root, 0); @@ -854,7 +854,7 @@ static void aoff_remove_mbc(Allctr_t *allctr, Carrier_t *carrier) AOFF_Carrier_t *crr = (AOFF_Carrier_t*) carrier; AOFF_RBTree_t **root = &alc->mbc_root; - ASSERT(allctr == carrier->allctr); + ASSERT(allctr == ERTS_ALC_CARRIER_TO_ALLCTR(carrier)); HARD_CHECK_TREE(NULL, 0, *root, 0); rbt_delete(root, &crr->rbt_node); @@ -870,7 +870,7 @@ static UWord aoff_largest_fblk_in_mbc(Allctr_t* allctr, Carrier_t* carrier) { AOFF_Carrier_t *crr = (AOFF_Carrier_t*) carrier; - ASSERT(allctr == carrier->allctr); + ASSERT(allctr == ERTS_ALC_CARRIER_TO_ALLCTR(carrier)); ASSERT(crr->rbt_node.hdr.bhdr == (crr->root ? crr->root->max_sz : 0)); return crr->rbt_node.hdr.bhdr; } |