diff options
| author | Siri Hansen <[email protected]> | 2019-03-04 12:02:26 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2019-03-04 12:02:26 +0100 |
| commit | 6d795779f770deb1829e1df2fa4a75f41e602d35 (patch) | |
| tree | e94d7ca27da1b9e5a6fb10e28927518097e57664 /erts/emulator | |
| parent | df25e742f1ab87f8dbb290eed8e24ec919c3780a (diff) | |
| parent | 615d36fab80acb1638f904b16a2f6cec93ce07a6 (diff) | |
| download | otp-6d795779f770deb1829e1df2fa4a75f41e602d35.tar.gz otp-6d795779f770deb1829e1df2fa4a75f41e602d35.tar.bz2 otp-6d795779f770deb1829e1df2fa4a75f41e602d35.zip | |
Merge branch 'siri/logger/os-timestamp/OTP-15625' into maint
* siri/logger/os-timestamp/OTP-15625:
Update preloaded
[logger] Change timestamp from erlang:system_time to os:system_time
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |