diff options
| author | Rickard Green <[email protected]> | 2015-12-08 15:11:51 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-12-08 15:11:51 +0100 |
| commit | 40beec43a477062dc81c4dd29eb9dc6a1db0ee9a (patch) | |
| tree | 1695f93aed4ca1760a2b4c94f19e83d119ae3866 /erts/emulator/hipe | |
| parent | 4b17e3d6585bac8411d8f58d65d05e90156f5664 (diff) | |
| parent | 19c4689eea86f26c5af9b8f712c227ce4f62310b (diff) | |
| download | otp-40beec43a477062dc81c4dd29eb9dc6a1db0ee9a.tar.gz otp-40beec43a477062dc81c4dd29eb9dc6a1db0ee9a.tar.bz2 otp-40beec43a477062dc81c4dd29eb9dc6a1db0ee9a.zip | |
Merge branch 'rickard/ohmq-fixup/OTP-13047'
* rickard/ohmq-fixup/OTP-13047:
Replace off_heap_message_queue option with message_queue_data option
Always use literal_alloc
Distinguish between GC disabled by BIFs and other disabled GC
Fix process_info(_, off_heap_message_queue)
Off heap message queue test suite
Remove unused variable
Fix memory leaks
Diffstat (limited to 'erts/emulator/hipe')
| -rw-r--r-- | erts/emulator/hipe/hipe_native_bif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/hipe/hipe_native_bif.c b/erts/emulator/hipe/hipe_native_bif.c index ad8fb685e5..1bfee94e9e 100644 --- a/erts/emulator/hipe/hipe_native_bif.c +++ b/erts/emulator/hipe/hipe_native_bif.c @@ -164,7 +164,7 @@ void hipe_select_msg(Process *p) JOIN_MESSAGE(p); CANCEL_TIMER(p); /* calls erts_cancel_proc_timer() */ erts_save_message_in_proc(p, msgp); - p->flags &= ~F_DISABLE_GC; + p->flags &= ~F_DELAY_GC; if (ERTS_IS_GC_DESIRED(p)) { /* * We want to GC soon but we leave a few @@ -519,7 +519,7 @@ Eterm hipe_check_get_msg(Process *c_p) { ErtsMessage *msgp; - c_p->flags |= F_DISABLE_GC; + c_p->flags |= F_DELAY_GC; next_message: @@ -541,7 +541,7 @@ Eterm hipe_check_get_msg(Process *c_p) /* XXX: BEAM doesn't need this */ c_p->hipe_smp.have_receive_locks = 1; #endif - c_p->flags &= ~F_DISABLE_GC; + c_p->flags &= ~F_DELAY_GC; return THE_NON_VALUE; #ifdef ERTS_SMP } |