From 00678f41aaa14191dc333596fee33075ce515e24 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Fri, 22 Feb 2019 14:26:07 +0100
Subject: [logger] Change timestamp from erlang:system_time to os:system_time

This is to align the timestamps with external logs.
---
 erts/emulator/beam/utils.c             | 2 +-
 erts/preloaded/src/erl_prim_loader.erl | 7 ++++---
 erts/preloaded/src/init.erl            | 7 +++++--
 erts/preloaded/src/prim_file.erl       | 7 ++++---
 4 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'erts')

diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index a231638b50..c5deed38ad 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -1946,7 +1946,7 @@ do_allocate_logger_message(Eterm gleader, ErtsMonotonicTime *ts, Eterm *pid,
     else
         sz += MAP4_SZ /* metadata map w gl w pid*/;
 
-    *ts = ERTS_MONOTONIC_TO_USEC(erts_get_monotonic_time(NULL) + erts_get_time_offset());
+    *ts = ERTS_MONOTONIC_TO_USEC(erts_os_system_time());
     erts_bld_sint64(NULL, &sz, *ts);
 
     *bp = new_message_buffer(sz);
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index fefdd34292..1605c20f2c 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -297,12 +297,13 @@ check_file_result(Func, Target, {error,Reason}) ->
                         "Target: " ++ TargetStr ++ ". " ++
                         "Function: " ++ atom_to_list(Func) ++ ". " ++ Process
                 end,
-            %% this is equal to calling error_logger:error_report/1 which
-            %% we don't want to do from code_server during system boot
+            %% This is equal to calling logger:error/2 which
+            %% we don't want to do from code_server during system boot.
+            %% We don't want to call logger:timestamp() either.
             logger ! {log,error,#{label=>{?MODULE,file_error},report=>Report},
                       #{pid=>self(),
                         gl=>group_leader(),
-                        time=>erlang:system_time(microsecond),
+                        time=>os:system_time(microsecond),
                         error_logger=>#{tag=>error_report,
                                         type=>std_error}}},
             error
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index bdcdf72c2f..86b4f35ae5 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -483,13 +483,16 @@ do_handle_msg(Msg,State) ->
 	{From, {ensure_loaded, _}} ->
 	    From ! {init, not_allowed};
 	X ->
+            %% This is equal to calling logger:info/3 which we don't
+            %% want to do from the init process, at least not during
+            %% system boot. We don't want to call logger:timestamp()
+            %% either.
 	    case whereis(user) of
 		undefined ->
-		    Time = erlang:system_time(microsecond),
                     catch logger ! {log, info, "init got unexpected: ~p", [X],
                                     #{pid=>self(),
                                       gl=>self(),
-                                      time=>Time,
+                                      time=>os:system_time(microsecond),
                                       error_logger=>#{tag=>info_msg}}};
 		User ->
 		    User ! X,
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 0994e2a9f4..1aa5d85c64 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -572,12 +572,13 @@ list_dir_convert([RawName | Rest], SkipInvalid, Result) ->
         {error, ignore} ->
             list_dir_convert(Rest, SkipInvalid, Result);
         {error, warning} ->
-            %% this is equal to calling error_logger:warning_msg/2 which
-            %% we don't want to do from code_server during system boot
+            %% This is equal to calling logger:warning/3 which
+            %% we don't want to do from code_server during system boot.
+            %% We don't want to call logger:timestamp() either.
             logger ! {log,warning,"Non-unicode filename ~p ignored\n", [RawName],
                       #{pid=>self(),
                         gl=>group_leader(),
-                        time=>erlang:system_time(microsecond),
+                        time=>os:system_time(microsecond),
                         error_logger=>#{tag=>warning_msg}}},
             list_dir_convert(Rest, SkipInvalid, Result);
         {error, _} ->
-- 
cgit v1.2.3


From 615d36fab80acb1638f904b16a2f6cec93ce07a6 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Fri, 22 Feb 2019 14:28:49 +0100
Subject: Update preloaded

   erts/preloaded/ebin/erl_prim_loader.beam
   erts/preloaded/ebin/init.beam
   erts/preloaded/ebin/prim_file.beam
---
 erts/preloaded/ebin/erl_prim_loader.beam | Bin 54496 -> 54576 bytes
 erts/preloaded/ebin/init.beam            | Bin 51536 -> 51584 bytes
 erts/preloaded/ebin/prim_file.beam       | Bin 28328 -> 28428 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'erts')

diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index 7cb34c2d58..6f5a75a2db 100644
Binary files a/erts/preloaded/ebin/erl_prim_loader.beam and b/erts/preloaded/ebin/erl_prim_loader.beam differ
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index 7d848ba790..d8c3a26674 100644
Binary files a/erts/preloaded/ebin/init.beam and b/erts/preloaded/ebin/init.beam differ
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index ffb349cdf3..d3d4a75a11 100644
Binary files a/erts/preloaded/ebin/prim_file.beam and b/erts/preloaded/ebin/prim_file.beam differ
-- 
cgit v1.2.3