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

2 files changed, 28 insertions, 16 deletions

diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 5bd73fe44d..a94719194c 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -899,36 +899,39 @@ garbage_collect(Pid) ->
 	error:Error -> erlang:error(Error, [Pid])
     end.
 
+-record(gcopt, {
+    async = sync :: sync | {async, _},
+    type = major % default major, can also be minor
+    }).
+
 %% garbage_collect/2
 -spec garbage_collect(Pid, OptionList) -> GCResult | async when
       Pid :: pid(),
       RequestId :: term(),
-      Option :: {async, RequestId},
+      Option :: {async, RequestId} | {type, 'major' | 'minor'},
       OptionList :: [Option],
       GCResult :: boolean().
 garbage_collect(Pid, OptionList)  ->
     try
-	Async = get_gc_opts(OptionList, sync),
-	case Async of
+	GcOpts = get_gc_opts(OptionList, #gcopt{}),
+	case GcOpts#gcopt.async of
 	    {async, ReqId} ->
 		{priority, Prio} = erlang:process_info(erlang:self(),
 						       priority),
-		erts_internal:request_system_task(Pid,
-						  Prio,
-						  {garbage_collect, ReqId}),
+		erts_internal:request_system_task(
+                    Pid, Prio, {garbage_collect, ReqId, GcOpts#gcopt.type}),
 		async;
 	    sync ->
 		case Pid == erlang:self() of
 		    true ->
-			erlang:garbage_collect();
+			erts_internal:garbage_collect(GcOpts#gcopt.type);
 		    false ->
 			{priority, Prio} = erlang:process_info(erlang:self(),
 							       priority),
 			ReqId = erlang:make_ref(),
-			erts_internal:request_system_task(Pid,
-							  Prio,
-							  {garbage_collect,
-							   ReqId}),
+			erts_internal:request_system_task(
+                            Pid, Prio,
+                            {garbage_collect, ReqId, GcOpts#gcopt.type}),
 			receive
 			    {garbage_collect, ReqId, GCResult} ->
 				GCResult
@@ -940,10 +943,12 @@ garbage_collect(Pid, OptionList)  ->
     end.
 
 % gets async opt and verify valid option list
-get_gc_opts([{async, _ReqId} = AsyncTuple | Options], _OldAsync) ->
-    get_gc_opts(Options, AsyncTuple);
-get_gc_opts([], Async) ->
-    Async.
+get_gc_opts([{async, _ReqId} = AsyncTuple | Options], GcOpt = #gcopt{}) ->
+    get_gc_opts(Options, GcOpt#gcopt{ async = AsyncTuple });
+get_gc_opts([{type, T} | Options], GcOpt = #gcopt{}) ->
+    get_gc_opts(Options, GcOpt#gcopt{ type = T });
+get_gc_opts([], GcOpt) ->
+    GcOpt.
 
 %% garbage_collect_message_area/0
 -spec erlang:garbage_collect_message_area() -> boolean().
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) ->