aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2019-01-21 14:46:33 +0100
committerSiri Hansen <[email protected]>2019-01-21 14:46:33 +0100
commit9c8075413728e3be373d7dff2a7168b3983e0be3 (patch)
tree35a3ed275f2ea6f333f5be903e39ddbe6c5a9700 /erts
parent88cc8d25abe9e6fb7708a6ea673aa0637a28860a (diff)
parenta8364425a7190b65cd33e58ac3c155a77c462b74 (diff)
downloadotp-9c8075413728e3be373d7dff2a7168b3983e0be3.tar.gz
otp-9c8075413728e3be373d7dff2a7168b3983e0be3.tar.bz2
otp-9c8075413728e3be373d7dff2a7168b3983e0be3.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/preloaded/ebin/erl_prim_loader.beambin53288 -> 53300 bytes
-rw-r--r--erts/preloaded/ebin/init.beambin50688 -> 50696 bytes
-rw-r--r--erts/preloaded/src/erl_prim_loader.erl2
-rw-r--r--erts/preloaded/src/init.erl2
4 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index 61dbaa5a73..bbee904837 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
Binary files differ
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index bc1d341f31..dbc080cf2d 100644
--- a/erts/preloaded/ebin/init.beam
+++ b/erts/preloaded/ebin/init.beam
Binary files differ
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index ae5f86e017..fefdd34292 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -302,7 +302,7 @@ check_file_result(Func, Target, {error,Reason}) ->
logger ! {log,error,#{label=>{?MODULE,file_error},report=>Report},
#{pid=>self(),
gl=>group_leader(),
- time=>erlang:monotonic_time(microsecond),
+ time=>erlang: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 d8f5c9a945..54cbd96710 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -479,7 +479,7 @@ do_handle_msg(Msg,State) ->
X ->
case whereis(user) of
undefined ->
- Time = erlang:monotonic_time(microsecond),
+ Time = erlang:system_time(microsecond),
catch logger ! {log, info, "init got unexpected: ~p", [X],
#{pid=>self(),
gl=>self(),