diff options
author | Rickard Green <[email protected]> | 2017-06-01 20:25:00 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2017-06-01 20:25:00 +0200 |
commit | 222fa490201b33c27b2770e265c3e0594ac74959 (patch) | |
tree | 49a85f2b548e65ed271c9a6e772caf90b8054540 /erts/emulator/beam/erl_process.h | |
parent | d106c5fffb3832fffbdf99cca905390fe15d489f (diff) | |
parent | 5f902e2dbc791373d66f4542a153b827d6b34cb7 (diff) | |
download | otp-222fa490201b33c27b2770e265c3e0594ac74959.tar.gz otp-222fa490201b33c27b2770e265c3e0594ac74959.tar.bz2 otp-222fa490201b33c27b2770e265c3e0594ac74959.zip |
Merge branch 'rickard/purge-hibernated-19' into rickard/purge-hibernated-20
* rickard/purge-hibernated-19:
Do not GC hibernated process from other processes
Fix check_process_code() on hibernated process
Conflicts:
erts/emulator/beam/beam_bif_load.c
erts/emulator/beam/erl_process.c
erts/emulator/beam/erl_process.h
Diffstat (limited to 'erts/emulator/beam/erl_process.h')
-rw-r--r-- | erts/emulator/beam/erl_process.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index d44e8c252d..9d7ba27c50 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -1422,6 +1422,7 @@ extern int erts_system_profile_ts_type; #define F_DIRTY_GC_HIBERNATE (1 << 22) /* Dirty GC hibernate scheduled */ #define F_DIRTY_MAJOR_GC (1 << 23) /* Dirty major GC scheduled */ #define F_DIRTY_MINOR_GC (1 << 24) /* Dirty minor GC scheduled */ +#define F_HIBERNATED (1 << 25) /* Hibernated */ /* * F_DISABLE_GC and F_DELAY_GC are similar. Both will prevent |