diff options
| author | Rickard Green <[email protected]> | 2013-06-04 11:45:01 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-06-04 11:45:01 +0200 |
| commit | b7081f310a8503855d10aeda35f4bc056be24bb3 (patch) | |
| tree | 55738ee7d3834407daf2f42b8664ab355dea600c /erts/emulator/beam/erl_alloc.h | |
| parent | a58a2987ab699b452dd1c95dca62147a827e7c7f (diff) | |
| parent | f91c381afa2ebed6e37b49b4cc3f81bb9ca9e3eb (diff) | |
| download | otp-b7081f310a8503855d10aeda35f4bc056be24bb3.tar.gz otp-b7081f310a8503855d10aeda35f4bc056be24bb3.tar.bz2 otp-b7081f310a8503855d10aeda35f4bc056be24bb3.zip | |
Merge branch 'rickard-sverker/carrier-migration/OTP-10279' into maint
* rickard-sverker/carrier-migration/OTP-10279:
erts: Document the +M<S>acul command line argument
erts: Carrier pool information in allocator information
erts: Use carrier pool for migration of carriers
erts: Implement test case for carrier pool
erts: Implement carrier pool
erts: Fix type errors in info functions
erts: Use Uint64 for call counts
erts: Fix failing testcase alloc_SUITE:rbtree
erts: Rename allocator aoffcbf to aoffcaobf
erts: Remove unnecessary flag arguments in allocators
erts: Remove SBMBC allocator
erts: Add test for add_mbc and remove_mbc callbacks
erts: Fix deallocation in removed carrier
erts: Change naive list to rb-tree of carriers in AOFF allocator
erts: Prepare aoff allocator for carrier migration
erts: Make carrier header sizes customizable
erts: Add "bestfit within carrier" for aoff allocator (aoffcbf)
Diffstat (limited to 'erts/emulator/beam/erl_alloc.h')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h index 9cafd8ddc8..d9fdfc6f58 100644 --- a/erts/emulator/beam/erl_alloc.h +++ b/erts/emulator/beam/erl_alloc.h @@ -65,7 +65,7 @@ Eterm erts_allocator_options(void *proc); struct process; int erts_request_alloc_info(struct process *c_p, Eterm ref, Eterm allocs, - int only_sz); + int only_sz, int internal); #define ERTS_ALLOC_INIT_DEF_OPTS_INITER {0} typedef struct { @@ -100,14 +100,6 @@ UWord erts_alc_test(UWord, #define ERTS_ALC_MIN_LONG_LIVED_TIME (10*60*1000) -#if HALFWORD_HEAP -#define ERTS_IS_SBMBC_ALLOCATOR_NO__(NO) \ - ((NO) == ERTS_ALC_A_SBMBC || (NO) == ERTS_ALC_A_SBMBC_LOW) -#else -#define ERTS_IS_SBMBC_ALLOCATOR_NO__(NO) \ - ((NO) == ERTS_ALC_A_SBMBC) -#endif - typedef struct { int alloc_util; int enabled; |