diff options
| author | Rickard Green <[email protected]> | 2013-06-04 11:48:13 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-06-04 11:48:13 +0200 |
| commit | e4f06fc54f6a8ae3bcdc5faa646a7bc720fe7479 (patch) | |
| tree | 8d55ef4992ddccf03999da08adfb0d7957fbf5ad /erts/emulator/beam/erl_process.c | |
| parent | 4a25ec13e624989af191a2297f904df87d8e3248 (diff) | |
| parent | b7081f310a8503855d10aeda35f4bc056be24bb3 (diff) | |
| download | otp-e4f06fc54f6a8ae3bcdc5faa646a7bc720fe7479.tar.gz otp-e4f06fc54f6a8ae3bcdc5faa646a7bc720fe7479.tar.bz2 otp-e4f06fc54f6a8ae3bcdc5faa646a7bc720fe7479.zip | |
Merge branch 'maint'
* maint:
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)
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 81799ddbb1..88eb224f84 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -1327,6 +1327,17 @@ erts_alloc_notify_delayed_dealloc(int ix) ERTS_SSI_AUX_WORK_DD); } +void +erts_alloc_ensure_handle_delayed_dealloc_call(int ix) +{ +#ifdef DEBUG + ErtsSchedulerData *esdp = erts_get_scheduler_data(); + ASSERT(!esdp || ix == (int) esdp->no); +#endif + set_aux_work_flags_wakeup_nob(ERTS_SCHED_SLEEP_INFO_IX(ix-1), + ERTS_SSI_AUX_WORK_DD); +} + static ERTS_INLINE erts_aint32_t handle_delayed_dealloc(ErtsAuxWorkData *awdp, erts_aint32_t aux_work, int waiting) { |