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

7 files changed, 143 insertions, 11 deletions

diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index 9dae67cb2d..437cbddde7 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -366,6 +366,7 @@ atom long_schedule
 atom low
 atom Lt='<'
 atom machine
+atom major
 atom match
 atom match_limit
 atom match_limit_recursion
@@ -395,6 +396,7 @@ atom milli_seconds
 atom millisecond
 atom min_heap_size
 atom min_bin_vheap_size
+atom minor
 atom minor_version
 atom Minus='-'
 atom module
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index d9048065c8..84eab5f651 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -3869,7 +3869,24 @@ BIF_RETTYPE garbage_collect_0(BIF_ALIST_0)
 {
     FLAGS(BIF_P) |= F_NEED_FULLSWEEP;
     erts_garbage_collect(BIF_P, 0, NULL, 0);
-    BIF_RET(am_true);
+    return am_true;
+}
+
+/*
+ * Pass atom 'minor' for relaxed generational GC run. This is only
+ * recommendation, major run may still be chosen by VM.
+ * Pass atom 'major' for default behaviour - major GC run (fullsweep)
+ */
+BIF_RETTYPE
+erts_internal_garbage_collect_1(BIF_ALIST_1)
+{
+    switch (BIF_ARG_1) {
+    case am_minor:  break;
+    case am_major:  FLAGS(BIF_P) |= F_NEED_FULLSWEEP; break;
+    default:        BIF_ERROR(BIF_P, BADARG);
+    }
+    erts_garbage_collect(BIF_P, 0, NULL, 0);
+    return am_true;
 }
 
 /**********************************************************************/
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 0bd80ea684..852b1135fe 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -69,6 +69,7 @@ bif erlang:float_to_list/1
 bif erlang:float_to_list/2
 bif erlang:fun_info/2
 bif erlang:garbage_collect/0
+bif erts_internal:garbage_collect/1
 bif erlang:get/0
 bif erlang:get/1
 bif erlang:get_keys/1
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 02a430609a..269518d8d6 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -446,7 +446,8 @@ int erts_system_profile_ts_type = ERTS_TRACE_FLG_NOW_TIMESTAMP;
 #endif
 
 typedef enum {
-    ERTS_PSTT_GC,	/* Garbage Collect */
+    ERTS_PSTT_GC_MAJOR,	/* Garbage Collect: Fullsweep */
+    ERTS_PSTT_GC_MINOR,	/* Garbage Collect: Generational */
     ERTS_PSTT_CPC,	/* Check Process Code */
     ERTS_PSTT_CLA,	/* Copy Literal Area */
     ERTS_PSTT_COHMQ,    /* Change off heap message queue */
@@ -10413,7 +10414,8 @@ execute_sys_tasks(Process *c_p, erts_aint32_t *statep, int in_reds)
 	    break;
 
 	switch (st->type) {
-	case ERTS_PSTT_GC:
+        case ERTS_PSTT_GC_MAJOR:
+        case ERTS_PSTT_GC_MINOR:
 	    if (c_p->flags & F_DISABLE_GC) {
 		save_gc_task(c_p, st, st_prio);
 		st = NULL;
@@ -10421,7 +10423,9 @@ execute_sys_tasks(Process *c_p, erts_aint32_t *statep, int in_reds)
 	    }
 	    else {
 		if (!garbage_collected) {
-		    FLAGS(c_p) |= F_NEED_FULLSWEEP;
+                    if (st->type == ERTS_PSTT_GC_MAJOR) {
+                        FLAGS(c_p) |= F_NEED_FULLSWEEP;
+                    }
 		    reds -= scheduler_gc_proc(c_p, reds);
 		    garbage_collected = 1;
 		}
@@ -10515,7 +10519,8 @@ cleanup_sys_tasks(Process *c_p, erts_aint32_t in_state, int in_reds)
 	    break;
 
 	switch (st->type) {
-	case ERTS_PSTT_GC:
+        case ERTS_PSTT_GC_MAJOR:
+        case ERTS_PSTT_GC_MINOR:
 	case ERTS_PSTT_CPC:
 	case ERTS_PSTT_COHMQ:
 	    st_res = am_false;
@@ -10688,9 +10693,13 @@ request_system_task(Process *c_p, Eterm requester, Eterm target,
     switch (req_type) {
 
     case am_garbage_collect:
-	st->type = ERTS_PSTT_GC;
-	noproc_res = am_false;
-	if (!rp)
+        switch (st->arg[0]) {
+        case am_minor:  st->type = ERTS_PSTT_GC_MINOR; break;
+        case am_major:  st->type = ERTS_PSTT_GC_MAJOR; break;
+        default: goto badarg;
+        }
+        noproc_res = am_false;
+        if (!rp)
 	    goto noproc;
 	break;
 
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index b467c5a9b6..4ef04d020a 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -811,6 +811,10 @@ call_ext u==0 Bif=u$bif:erlang:garbage_collect/0 => i_call_ext Bif
 call_ext_last u==0 Bif=u$bif:erlang:garbage_collect/0 D => i_call_ext_last Bif D
 call_ext_only u==0 Bif=u$bif:erlang:garbage_collect/0 => i_call_ext_only Bif
 
+call_ext u==1 Bif=u$bif:erts_internal:garbage_collect/1 => i_call_ext Bif
+call_ext_last u==1 Bif=u$bif:erts_internal:garbage_collect/1 D => i_call_ext_last Bif D
+call_ext_only u==1 Bif=u$bif:erts_internal:garbage_collect/1 => i_call_ext_only Bif
+
 #
 # put/2 and erase/1 must be able to do garbage collection, so we must call
 # them like functions.
diff --git a/erts/emulator/test/gc_SUITE.erl b/erts/emulator/test/gc_SUITE.erl
index 8a600b7d9f..35dd147550 100644
--- a/erts/emulator/test/gc_SUITE.erl
+++ b/erts/emulator/test/gc_SUITE.erl
@@ -23,15 +23,26 @@
 -module(gc_SUITE).
 
 -include_lib("common_test/include/ct.hrl").
+-include_lib("eunit/include/eunit.hrl").
+
 -export([all/0, suite/0]).
 
--export([grow_heap/1, grow_stack/1, grow_stack_heap/1, max_heap_size/1]).
+-export([
+    grow_heap/1,
+    grow_stack/1,
+    grow_stack_heap/1,
+    max_heap_size/1,
+    minor_major_gc_option_async/1,
+    minor_major_gc_option_self/1
+]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [grow_heap, grow_stack, grow_stack_heap, max_heap_size].
+    [grow_heap, grow_stack, grow_stack_heap, max_heap_size,
+    minor_major_gc_option_self,
+    minor_major_gc_option_async].
 
 
 %% Produce a growing list of elements,
@@ -190,3 +201,91 @@ long_receive() ->
     after 10000 ->
             ok
     end.
+
+minor_major_gc_option_self(_Config) ->
+    Endless = fun Endless() ->
+                receive
+                    {gc, Type} -> erlang:garbage_collect(self(), [{type, Type}])
+                    after 100 -> ok end,
+                Endless()
+              end,
+
+    %% Try as major, a test process will self-trigger GC
+    P1 = spawn(Endless),
+    erlang:garbage_collect(P1, []),
+    erlang:trace(P1, true, [garbage_collection]),
+    P1 ! {gc, major},
+    expect_trace_messages(P1, [gc_major_start, gc_major_end]),
+    erlang:trace(P1, false, [garbage_collection]),
+    erlang:exit(P1, kill),
+
+    %% Try as minor, a test process will self-trigger GC
+    P2 = spawn(Endless),
+    erlang:garbage_collect(P2, []),
+    erlang:trace(P2, true, [garbage_collection]),
+    P2 ! {gc, minor},
+    expect_trace_messages(P2, [gc_minor_start, gc_minor_end]),
+    erlang:trace(P2, false, [garbage_collection]),
+    erlang:exit(P2, kill).
+
+minor_major_gc_option_async(_Config) ->
+    Endless = fun Endless() ->
+                  receive after 100 -> ok end,
+                  Endless()
+              end,
+
+    %% Try with default option, must be major gc
+    P1 = spawn(Endless),
+    erlang:garbage_collect(P1, []),
+    erlang:trace(P1, true, [garbage_collection]),
+    erlang:garbage_collect(P1, []),
+    expect_trace_messages(P1, [gc_major_start, gc_major_end]),
+    erlang:trace(P1, false, [garbage_collection]),
+    erlang:exit(P1, kill),
+
+    %% Try with the 'major' type
+    P2 = spawn(Endless),
+    erlang:garbage_collect(P2, []),
+    erlang:trace(P2, true, [garbage_collection]),
+    erlang:garbage_collect(P2, [{type, major}]),
+    expect_trace_messages(P2, [gc_major_start, gc_major_end]),
+    erlang:trace(P2, false, [garbage_collection]),
+    erlang:exit(P2, kill),
+
+    %% Try with 'minor' option, once
+    P3 = spawn(Endless),
+    erlang:garbage_collect(P3, []),
+    erlang:trace(P3, true, [garbage_collection]),
+    erlang:garbage_collect(P3, [{type, minor}]),
+    expect_trace_messages(P3, [gc_minor_start, gc_minor_end]),
+    erlang:trace(P3, false, [garbage_collection]),
+    erlang:exit(P3, kill),
+
+    %% Try with 'minor' option, once, async
+    P4 = spawn(Endless),
+    Ref = erlang:make_ref(),
+    erlang:garbage_collect(P4, []),
+    erlang:trace(P4, true, [garbage_collection]),
+    ?assertEqual(async,
+                 erlang:garbage_collect(P4, [{type, minor}, {async, Ref}])),
+    expect_trace_messages(P4, [gc_minor_start, gc_minor_end]),
+    erlang:trace(P4, false, [garbage_collection]),
+    receive {garbage_collect, Ref, true} -> ok;
+        Other4 -> ct:pal("Unexpected message: ~p~n"
+                         ++ "while waiting for async gc result", [Other4])
+    after 2000 -> ?assert(false)
+    end,
+    erlang:exit(P4, kill).
+
+%% Given a list of atoms, trace tags - receives messages and checks if they are
+%% trace events, and if the tag matches. Else will crash failing the test.
+expect_trace_messages(_Pid, []) -> ok;
+expect_trace_messages(Pid, [Tag | TraceTags]) ->
+    receive
+        {trace, Pid, Tag, _Data} -> ok;
+        AnythingElse ->
+            ct:pal("Unexpected message: ~p~nWhile expected {trace, _, ~p, _}",
+                   [AnythingElse, Tag]),
+            ?assert(false)
+    end,
+    expect_trace_messages(Pid, TraceTags).
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index 0f999e0efe..e035fc64fe 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -2428,7 +2428,7 @@ no_priority_inversion2(Config) when is_list(Config) ->
 
 request_gc(Pid, Prio) ->
     Ref = make_ref(),
-    erts_internal:request_system_task(Pid, Prio, {garbage_collect, Ref}),
+    erts_internal:request_system_task(Pid, Prio, {garbage_collect, Ref, major}),
     Ref.
 
 system_task_blast(Config) when is_list(Config) ->