aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-09-06 09:56:53 +0200
committerLukas Larsson <[email protected]>2016-09-06 09:56:53 +0200
commit64a986cda04f70cc071e047ea3ae19e324ea6397 (patch)
treeb29aaa78db2b90d51889888cdbaa5e5b4b49c4b2 /erts/doc
parent678238add716b10731688de4d9e4144d04e0a55d (diff)
parent99701ee7b52f5010da7c8540bbb35481bee053bf (diff)
downloadotp-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/doc')
-rw-r--r--erts/doc/src/erlang.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 18a7a5b777..4a7d240009 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -1679,6 +1679,12 @@ true</pre>
the form <c>{garbage_collect,
<anno>RequestId</anno>, <anno>GCResult</anno>}</c>.
</item>
+
+ <tag><c>{type, 'major' | 'minor'}</c></tag>
+ <item>Triggers garbage collection of requested type. Default value is
+ <c>'major'</c>, which would trigger a fullsweep GC.
+ The option <c>'minor'</c> is considered a hint and may lead to
+ either minor or major GC run.</item>
</taglist>
<p>If <c><anno>Pid</anno></c> equals <c>self()</c>, and
no <c>async</c> option has been passed, the garbage