aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-06-05 10:32:38 +0200
committerLukas Larsson <[email protected]>2018-06-05 10:32:38 +0200
commitbc50c1e4e0d7deaae19804964760d4ffa1e13cbb (patch)
tree21f0db5c5832d53be4c8824812b79017492d5395 /erts/emulator
parentcfd29269fa1bbcf16ef38273e6f0c91d727f8c06 (diff)
downloadotp-bc50c1e4e0d7deaae19804964760d4ffa1e13cbb.tar.gz
otp-bc50c1e4e0d7deaae19804964760d4ffa1e13cbb.tar.bz2
otp-bc50c1e4e0d7deaae19804964760d4ffa1e13cbb.zip
erts: Fix emulator log messages to use erlang:system_time
This was changed in the logger in 8aa64c90ddd20ec0ca8cc5fe92a6124324c51da5.
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index d74052d8b2..cd625406f7 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_MONOTONIC_OFFSET_USEC;
+ *ts = ERTS_MONOTONIC_TO_USEC(erts_get_monotonic_time(NULL) + erts_get_time_offset());
erts_bld_sint64(NULL, &sz, *ts);
*bp = new_message_buffer(sz);