Redirect system_flag(scheduler_wall_time,_) to kernel_refc

10 files changed, 77 insertions, 53 deletions

diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index cef633bd93..cb4fab51f1 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -641,6 +641,7 @@ atom suspending
 atom sys_misc
 atom system
 atom system_error
+atom system_flag_scheduler_wall_time
 atom system_limit
 atom system_version
 atom system_architecture
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 50699eac31..6684803bb8 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -59,6 +59,7 @@ Export *erts_convert_time_unit_trap = NULL;
 static Export *await_msacc_mod_trap = NULL;
 static erts_atomic32_t msacc;
 
+static Export *system_flag_scheduler_wall_time_trap;
 static Export *await_sched_wall_time_mod_trap;
 static erts_atomic32_t sched_wall_time;
 
@@ -4496,7 +4497,7 @@ BIF_RETTYPE group_leader_2(BIF_ALIST_2)
 	BIF_ERROR(BIF_P, BADARG);
     }
 }
-    
+
 BIF_RETTYPE system_flag_2(BIF_ALIST_2)    
 {
     Sint n;
@@ -4714,17 +4715,9 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
 
 	BIF_RET(am_true);
     } else if (BIF_ARG_1 == am_scheduler_wall_time) {
-	if (BIF_ARG_2 == am_true || BIF_ARG_2 == am_false) {
-	    erts_aint32_t new = BIF_ARG_2 == am_true ? 1 : 0;
-	    erts_aint32_t old = erts_atomic32_xchg_nob(&sched_wall_time,
-							   new);
-	    Eterm ref = erts_sched_wall_time_request(BIF_P, 1, new, 0, 0);
-	    ASSERT(is_value(ref));
-	    BIF_TRAP2(await_sched_wall_time_mod_trap,
-		      BIF_P,
-		      ref,
-		      old ? am_true : am_false);
-	}
+	if (BIF_ARG_2 == am_true || BIF_ARG_2 == am_false)
+            BIF_TRAP1(system_flag_scheduler_wall_time_trap,
+                      BIF_P, BIF_ARG_2);
     } else if (BIF_ARG_1 == am_dirty_cpu_schedulers_online) {
 	Sint old_no;
 	if (!is_small(BIF_ARG_2))
@@ -4836,6 +4829,17 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
     BIF_ERROR(BIF_P, BADARG);
 }
 
+BIF_RETTYPE erts_internal_scheduler_wall_time_1(BIF_ALIST_1)
+{
+    erts_aint32_t new = BIF_ARG_1 == am_true ? 1 : 0;
+    erts_aint32_t old = erts_atomic32_xchg_nob(&sched_wall_time,
+                                               new);
+    Eterm ref = erts_sched_wall_time_request(BIF_P, 1, new, 0, 0);
+    ASSERT(is_value(ref));
+    BIF_TRAP2(await_sched_wall_time_mod_trap,
+              BIF_P, ref, old ? am_true : am_false);
+}
+
 /**********************************************************************/
 
 BIF_RETTYPE phash_2(BIF_ALIST_2)
@@ -5094,8 +5098,10 @@ void erts_init_bif(void)
     await_proc_exit_trap = erts_export_put(am_erlang,am_await_proc_exit,3);
     await_port_send_result_trap
 	= erts_export_put(am_erts_internal, am_await_port_send_result, 3);
+    system_flag_scheduler_wall_time_trap
+        = erts_export_put(am_erts_internal, am_system_flag_scheduler_wall_time, 1);
     await_sched_wall_time_mod_trap
-        = erts_export_put(am_erlang, am_await_sched_wall_time_modifications, 2);
+        = erts_export_put(am_erts_internal, am_await_sched_wall_time_modifications, 2);
     await_msacc_mod_trap
 	= erts_export_put(am_erts_internal, am_await_microstate_accounting_modifications, 3);
 
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 1bd4acbf95..33f6eef652 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -185,6 +185,8 @@ bif erts_internal:system_check/1
 
 bif erts_internal:release_literal_area_switch/0
 
+bif erts_internal:scheduler_wall_time/1
+
 # inet_db support
 bif erlang:port_set_data/2
 bif erlang:port_get_data/1
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 9d05680723..b9d8f9d6e9 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -4758,7 +4758,7 @@ erts_bif_info_init(void)
     alloc_info_trap = erts_export_put(am_erlang, am_alloc_info, 1);
     alloc_sizes_trap = erts_export_put(am_erlang, am_alloc_sizes, 1);
     gather_sched_wall_time_res_trap
-	= erts_export_put(am_erlang, am_gather_sched_wall_time_result, 1);
+	= erts_export_put(am_erts_internal, am_gather_sched_wall_time_result, 1);
     gather_gc_info_res_trap
 	= erts_export_put(am_erlang, am_gather_gc_info_result, 1);
     gather_io_bytes_trap
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 7ee47ee023..f0da8b5869 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index f8871c63eb..7d2edd9845 100644
--- a/erts/preloaded/ebin/erts_internal.beam
+++ b/erts/preloaded/ebin/erts_internal.beam
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 2be053575b..f3c83b9949 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -43,9 +43,7 @@
 -export([memory/0, memory/1]).
 -export([alloc_info/1, alloc_sizes/1]).
 
--export([gather_sched_wall_time_result/1,
-	 await_sched_wall_time_modifications/2,
-	 gather_gc_info_result/1]).
+-export([gather_gc_info_result/1]).
 
 -export([dist_ctrl_input_handler/2,
          dist_ctrl_put_data/2,
@@ -3980,38 +3978,6 @@ receive_allocator(Ref, N, Acc) ->
 	    receive_allocator(Ref, N-1, insert_info(InfoList, Acc))
     end.
 
--spec erlang:await_sched_wall_time_modifications(Ref, Result) -> boolean() when
-      Ref :: reference(),
-      Result :: boolean().
-
-await_sched_wall_time_modifications(Ref, Result) ->
-    sched_wall_time(Ref, erlang:system_info(schedulers)),
-    Result.
-
--spec erlang:gather_sched_wall_time_result(Ref) -> [{pos_integer(),
-						     non_neg_integer(),
-						     non_neg_integer()}] when
-      Ref :: reference().
-
-gather_sched_wall_time_result(Ref) when erlang:is_reference(Ref) ->
-    sched_wall_time(Ref, erlang:system_info(schedulers), []).
-
-sched_wall_time(_Ref, 0) ->
-    ok;
-sched_wall_time(Ref, N) ->
-    receive Ref -> sched_wall_time(Ref, N-1) end.
-
-sched_wall_time(_Ref, 0, Acc) ->
-    Acc;
-sched_wall_time(Ref, N, undefined) ->
-    receive {Ref, _} -> sched_wall_time(Ref, N-1, undefined) end;
-sched_wall_time(Ref, N, Acc) ->
-    receive
-	{Ref, undefined} -> sched_wall_time(Ref, N-1, undefined);
-	{Ref, SWTL} when erlang:is_list(SWTL) -> sched_wall_time(Ref, N-1, Acc ++ SWTL);
-	{Ref, SWT} -> sched_wall_time(Ref, N-1, [SWT|Acc])
-    end.
-
 -spec erlang:gather_gc_info_result(Ref) ->
    {number(),number(),0} when Ref :: reference().
 
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index ffa9217c4d..a083e9ac2f 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -66,6 +66,10 @@
 -export([new_connection/1]).
 -export([abort_connection/2]).
 
+-export([scheduler_wall_time/1, system_flag_scheduler_wall_time/1,
+         gather_sched_wall_time_result/1,
+	 await_sched_wall_time_modifications/2]).
+
 %% Auto import name clash
 -export([check_process_code/1]).
 
@@ -517,3 +521,50 @@ new_connection(_Node) ->
       ConnId :: {integer(), erlang:dist_handle()}.
 abort_connection(_Node, _ConnId) ->
     erlang:nif_error(undefined).
+
+%% Scheduler wall time
+
+-spec erts_internal:system_flag_scheduler_wall_time(Enable) -> boolean() when
+      Enable :: boolean().
+
+system_flag_scheduler_wall_time(Bool) ->
+    kernel_refc:scheduler_wall_time(Bool).
+
+
+-spec erts_internal:await_sched_wall_time_modifications(Ref, Result) -> boolean() when
+      Ref :: reference(),
+      Result :: boolean().
+
+-spec erts_internal:scheduler_wall_time(Enable) -> boolean() when
+      Enable :: boolean().
+
+scheduler_wall_time(_Enable) ->
+    erlang:nif_error(undefined).
+
+await_sched_wall_time_modifications(Ref, Result) ->
+    sched_wall_time(Ref, erlang:system_info(schedulers)),
+    Result.
+
+-spec erts_internal:gather_sched_wall_time_result(Ref) -> [{pos_integer(),
+						     non_neg_integer(),
+						     non_neg_integer()}] when
+      Ref :: reference().
+
+gather_sched_wall_time_result(Ref) when erlang:is_reference(Ref) ->
+    sched_wall_time(Ref, erlang:system_info(schedulers), []).
+
+sched_wall_time(_Ref, 0) ->
+    ok;
+sched_wall_time(Ref, N) ->
+    receive Ref -> sched_wall_time(Ref, N-1) end.
+
+sched_wall_time(_Ref, 0, Acc) ->
+    Acc;
+sched_wall_time(Ref, N, undefined) ->
+    receive {Ref, _} -> sched_wall_time(Ref, N-1, undefined) end;
+sched_wall_time(Ref, N, Acc) ->
+    receive
+	{Ref, undefined} -> sched_wall_time(Ref, N-1, undefined);
+	{Ref, SWTL} when erlang:is_list(SWTL) -> sched_wall_time(Ref, N-1, Acc ++ SWTL);
+	{Ref, SWT} -> sched_wall_time(Ref, N-1, [SWT|Acc])
+    end.
diff --git a/lib/kernel/src/kernel_refc.erl b/lib/kernel/src/kernel_refc.erl
index 3ad68e9ff9..05076dc885 100644
--- a/lib/kernel/src/kernel_refc.erl
+++ b/lib/kernel/src/kernel_refc.erl
@@ -38,7 +38,7 @@ start_link() ->
 
 -spec scheduler_wall_time(boolean()) -> boolean().
 scheduler_wall_time(Bool) ->
-    gen_server:call(kernel_refc, {scheduler_wall_time, self(), Bool}).
+    gen_server:call(kernel_refc, {scheduler_wall_time, self(), Bool}, infinity).
 
 %%-----------------------------------------------------------------
 %% Callback functions from gen_server
@@ -136,4 +136,4 @@ cleanup(Resource, Cnt0, Pid) ->
 any(Cnt) -> maps:size(Cnt) > 0.
 
 resource(scheduler_wall_time, Enable) ->
-    _ = erlang:system_flag(scheduler_wall_time, Enable).
+    _ = erts_internal:scheduler_wall_time(Enable).
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index d9efadf64a..6b93d63182 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -885,7 +885,6 @@ resulting regexp is surrounded by \\_< and \\_>."
       "append"
       "append_element"
       "await_proc_exit"
-      "await_sched_wall_time_modifications"
       "bump_reductions"
       "call_on_load_function"
       "cancel_timer"
@@ -923,7 +922,6 @@ resulting regexp is surrounded by \\_< and \\_>."
       "function_exported"
       "garbage_collect_message_area"
       "gather_gc_info_result"
-      "gather_sched_wall_time_result"
       "get_cookie"
       "get_module_info"
       "get_stacktrace"