diff options
| author | Rickard Green <[email protected]> | 2017-06-08 14:41:24 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-06-08 14:41:24 +0200 |
| commit | 94379b22116ec5d1efd56a0ace837054b3da6fa2 (patch) | |
| tree | 505a13ccadad53d80ac8fba058be6f79916dcc71 /erts/emulator/beam/erl_process.c | |
| parent | b85e77fb68add53eefa8aaa89a1e6f923fda9565 (diff) | |
| parent | b1f76e2f15c9d8c741ecb4bddc0b38740f3e7143 (diff) | |
| download | otp-94379b22116ec5d1efd56a0ace837054b3da6fa2.tar.gz otp-94379b22116ec5d1efd56a0ace837054b3da6fa2.tar.bz2 otp-94379b22116ec5d1efd56a0ace837054b3da6fa2.zip | |
Merge branch 'maint-19' into maint
* maint-19:
Updated OTP version
Update release notes
Update version numbers
erts: Fix so that 81b628 (sigterm=kill) works
Updated OTP version
Prepare release
Update testcase to check that purge handle hibernated process correct
Do not GC hibernated process from other processes
Fix check_process_code() on hibernated process
Unconditionally clear IO buffers on send/shutdown errors
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 5c0322a7f6..54724fd62d 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -10476,7 +10476,8 @@ execute_sys_tasks(Process *c_p, erts_aint32_t *statep, int in_reds) reds--; } else { - if (!garbage_collected) { + if (!garbage_collected + && !(c_p->flags & F_HIBERNATED)) { FLAGS(c_p) |= F_NEED_FULLSWEEP; reds -= scheduler_gc_proc(c_p, reds); garbage_collected = 1; |