diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2013-02-13 19:00:16 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2013-02-13 19:00:16 +0100 |
| commit | 33168981eda974653471b13e328fa2a9d3c9d9f3 (patch) | |
| tree | 780ce95a21e73a79387e405b963f8f5c80452385 /erts/emulator/beam | |
| parent | 7fda8c136ae1561aa10e00ce2537b48b7051dc36 (diff) | |
| parent | def1a47fc6674fc87b74ba727054c5104694b00c (diff) | |
| download | otp-33168981eda974653471b13e328fa2a9d3c9d9f3.tar.gz otp-33168981eda974653471b13e328fa2a9d3c9d9f3.tar.bz2 otp-33168981eda974653471b13e328fa2a9d3c9d9f3.zip | |
Merge branch 'egil/enhance-mseg-cache/OTP-10840'
* egil/enhance-mseg-cache/OTP-10840:
erts: Utilize even more cached sbc segments
erts: Prefer sbc segment caching over mbc segments
erts: Segment allocator CircleQ API
erts: Increase default #cached segments to 10
erts: Evict old cached segments for newer ones
erts: Refactor mseg cache
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c index 187bc2b48b..ac7f420708 100644 --- a/erts/emulator/beam/erl_alloc_util.c +++ b/erts/emulator/beam/erl_alloc_util.c @@ -643,9 +643,9 @@ alcu_mseg_realloc(Allctr_t *allctr, void *seg, Uint old_size, Uint *new_size_p) } static ERTS_INLINE void -alcu_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size) +alcu_mseg_dealloc(Allctr_t *allctr, void *seg, Uint size, Uint flags) { - erts_mseg_dealloc_opt(allctr->alloc_no, seg, size, &allctr->mseg_opt); + erts_mseg_dealloc_opt(allctr->alloc_no, seg, size, flags, &allctr->mseg_opt); INC_CC(allctr->calls.mseg_dealloc); } @@ -2276,7 +2276,7 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags) (void *) BLK2UMEM(old_blk), MIN(new_blk_sz, old_blk_sz) - ABLK_HDR_SZ); unlink_carrier(&allctr->sbc_list, old_crr); - alcu_mseg_dealloc(allctr, old_crr, old_crr_sz); + alcu_mseg_dealloc(allctr, old_crr, old_crr_sz, ERTS_MSEG_FLG_NONE); } else { /* Old carrier unchanged; restore stat */ @@ -2352,6 +2352,7 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk) Carrier_t *crr; #if HAVE_ERTS_MSEG Uint is_mseg = 0; + Uint mseg_flags = ERTS_MSEG_FLG_NONE; #endif if (IS_SBC_BLK(blk)) { @@ -2398,6 +2399,7 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk) is_mseg++; ASSERT(crr_sz % MSEG_UNIT_SZ == 0); STAT_MSEG_MBC_FREE(allctr, crr_sz); + mseg_flags = ERTS_MSEG_FLG_2POW; } else #endif @@ -2411,7 +2413,7 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk) #if HAVE_ERTS_MSEG if (is_mseg) { - alcu_mseg_dealloc(allctr, crr, crr_sz); + alcu_mseg_dealloc(allctr, crr, crr_sz, mseg_flags); } else #endif |