diff options
| author | Lukas Larsson <[email protected]> | 2016-09-06 09:56:53 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-09-06 09:56:53 +0200 |
| commit | 64a986cda04f70cc071e047ea3ae19e324ea6397 (patch) | |
| tree | b29aaa78db2b90d51889888cdbaa5e5b4b49c4b2 /erts/preloaded/src/erts_internal.erl | |
| parent | 678238add716b10731688de4d9e4144d04e0a55d (diff) | |
| parent | 99701ee7b52f5010da7c8540bbb35481bee053bf (diff) | |
| download | otp-64a986cda04f70cc071e047ea3ae19e324ea6397.tar.gz otp-64a986cda04f70cc071e047ea3ae19e324ea6397.tar.bz2 otp-64a986cda04f70cc071e047ea3ae19e324ea6397.zip | |
Merge branch 'kvakvs/erts/gc_minor_option/OTP-11695'
* kvakvs/erts/gc_minor_option/OTP-11695:
erts: Fix req_system_task gc typespec
Fix process_SUITE system_task_blast and no_priority_inversion2
Option to erlang:garbage_collect to request minor (generational) GC
Conflicts:
erts/emulator/beam/erl_process.c
erts/preloaded/src/erts_internal.erl
Diffstat (limited to 'erts/preloaded/src/erts_internal.erl')
| -rw-r--r-- | erts/preloaded/src/erts_internal.erl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl index e9b99e2745..438fa477e6 100644 --- a/erts/preloaded/src/erts_internal.erl +++ b/erts/preloaded/src/erts_internal.erl @@ -39,6 +39,7 @@ gather_system_check_result/1]). -export([request_system_task/3, request_system_task/4]). +-export([garbage_collect/1]). -export([check_process_code/3]). -export([check_dirty_process_code/2]). @@ -205,7 +206,8 @@ port_info(_Result, _Item) -> -spec request_system_task(Pid, Prio, Request) -> 'ok' when Prio :: 'max' | 'high' | 'normal' | 'low', - Request :: {'garbage_collect', term()} + Type :: 'major' | 'minor', + Request :: {'garbage_collect', term(), Type} | {'check_process_code', term(), module()} | {'copy_literals', term(), boolean()}, Pid :: pid(). @@ -224,6 +226,11 @@ request_system_task(_Pid, _Prio, _Request) -> request_system_task(_RequesterPid, _TargetPid, _Prio, _Request) -> erlang:nif_error(undefined). +-spec garbage_collect(Mode) -> 'true' when Mode :: 'major' | 'minor'. + +garbage_collect(_Mode) -> + erlang:nif_error(undefined). + -spec check_process_code(Module) -> boolean() when Module :: module(). check_process_code(_Module) -> |