diff options
| author | Erlang/OTP <[email protected]> | 2017-06-07 15:19:26 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-06-07 15:19:26 +0200 |
| commit | c64686a632a550b7c227307ec9af43857c2fd6d9 (patch) | |
| tree | 5c0972d701fb19f85d6cc567bb4d04e0001cd90c /erts/emulator/beam/erl_gc.c | |
| parent | 4310a9d387999ada6135082961350b6f4324dcb7 (diff) | |
| parent | 39a41b0472f275e71ae9bb6abf3bb8b3c995b8e3 (diff) | |
| download | otp-c64686a632a550b7c227307ec9af43857c2fd6d9.tar.gz otp-c64686a632a550b7c227307ec9af43857c2fd6d9.tar.bz2 otp-c64686a632a550b7c227307ec9af43857c2fd6d9.zip | |
Merge branch 'rickard/purge-hibernated-19/ERIERL-24/OTP-14444' into maint-19
* rickard/purge-hibernated-19/ERIERL-24/OTP-14444:
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
Diffstat (limited to 'erts/emulator/beam/erl_gc.c')
| -rw-r--r-- | erts/emulator/beam/erl_gc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index bb36be0848..d2560cfb49 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -764,7 +764,7 @@ do_major_collection: esdp->gc_info.reclaimed += reclaimed_now; } - FLAGS(p) &= ~F_FORCE_GC; + FLAGS(p) &= ~(F_FORCE_GC|F_HIBERNATED); p->live_hf_end = ERTS_INVALID_HFRAG_PTR; ERTS_MSACC_POP_STATE_M(); @@ -929,6 +929,8 @@ erts_garbage_collect_hibernate(Process* p) ErtsGcQuickSanityCheck(p); + p->flags |= F_HIBERNATED; + erts_smp_atomic32_read_band_nob(&p->state, ~ERTS_PSFLG_GC); reds = gc_cost(actual_size, actual_size); @@ -1158,6 +1160,7 @@ erts_garbage_collect_literals(Process* p, Eterm* literals, /* * Restore status. */ + p->flags &= ~F_HIBERNATED; erts_smp_atomic32_read_band_nob(&p->state, ~ERTS_PSFLG_GC); } |