diff options
| author | Sverker Eriksson <[email protected]> | 2012-11-14 19:25:09 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-11-15 18:20:48 +0100 |
| commit | 1ff4fffe893346160e5136a3e4a1999e8927b5ec (patch) | |
| tree | c2f3e13ad5acbce2089ddf08366177a8a75c8936 /erts/emulator/beam/erl_goodfit_alloc.c | |
| parent | 51277f5dcf29a085dc478e560d3b92a438c8ae2f (diff) | |
| download | otp-1ff4fffe893346160e5136a3e4a1999e8927b5ec.tar.gz otp-1ff4fffe893346160e5136a3e4a1999e8927b5ec.tar.bz2 otp-1ff4fffe893346160e5136a3e4a1999e8927b5ec.zip | |
erts: Add carrier pointer to header of free block
Diffstat (limited to 'erts/emulator/beam/erl_goodfit_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_goodfit_alloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_goodfit_alloc.c b/erts/emulator/beam/erl_goodfit_alloc.c index 9db89652f7..264561a965 100644 --- a/erts/emulator/beam/erl_goodfit_alloc.c +++ b/erts/emulator/beam/erl_goodfit_alloc.c @@ -363,7 +363,7 @@ search_bucket(Allctr_t *allctr, int ix, Uint size) blk && i < max_blk_search; blk = blk->next, i++) { - blk_sz = MBC_BLK_SZ(&blk->block_head); + blk_sz = MBC_FBLK_SZ(&blk->block_head); blk_on_lambc = (((char *) blk) < gfallctr->last_aux_mbc_end && gfallctr->last_aux_mbc_start <= ((char *) blk)); @@ -402,7 +402,7 @@ get_free_block(Allctr_t *allctr, Uint size, if (min_bi == unsafe_bi) { blk = search_bucket(allctr, min_bi, size); if (blk) { - if (cand_blk && cand_size <= MBC_BLK_SZ(blk)) + if (cand_blk && cand_size <= MBC_FBLK_SZ(blk)) return NULL; /* cand_blk was better */ unlink_free_block(allctr, blk, flags); return blk; @@ -422,7 +422,7 @@ get_free_block(Allctr_t *allctr, Uint size, /* We are guaranteed to find a block that fits in this bucket */ blk = search_bucket(allctr, min_bi, size); ASSERT(blk); - if (cand_blk && cand_size <= MBC_BLK_SZ(blk)) + if (cand_blk && cand_size <= MBC_FBLK_SZ(blk)) return NULL; /* cand_blk was better */ unlink_free_block(allctr, blk, flags); return blk; @@ -435,7 +435,7 @@ link_free_block(Allctr_t *allctr, Block_t *block, Uint32 flags) { GFAllctr_t *gfallctr = (GFAllctr_t *) allctr; GFFreeBlock_t *blk = (GFFreeBlock_t *) block; - Uint sz = MBC_BLK_SZ(&blk->block_head); + Uint sz = MBC_FBLK_SZ(&blk->block_head); int i = BKT_IX(gfallctr, sz); ASSERT(sz >= MIN_BLK_SZ); @@ -456,7 +456,7 @@ unlink_free_block(Allctr_t *allctr, Block_t *block, Uint32 flags) { GFAllctr_t *gfallctr = (GFAllctr_t *) allctr; GFFreeBlock_t *blk = (GFFreeBlock_t *) block; - Uint sz = MBC_BLK_SZ(&blk->block_head); + Uint sz = MBC_FBLK_SZ(&blk->block_head); int i = BKT_IX(gfallctr, sz); if (!blk->prev) { |