diff options
| author | Siri Hansen <[email protected]> | 2019-03-04 12:07:02 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2019-03-04 12:07:02 +0100 |
| commit | 4d72eedc0d3573e9709b8f2c8773429e85529d7f (patch) | |
| tree | 1205a9db5d6dda3e1db50bdd221d9bb802089647 /erts/emulator/beam | |
| parent | 2a527454677dc0216c5d47ad580aad2e913e1b9a (diff) | |
| parent | 6d795779f770deb1829e1df2fa4a75f41e602d35 (diff) | |
| download | otp-4d72eedc0d3573e9709b8f2c8773429e85529d7f.tar.gz otp-4d72eedc0d3573e9709b8f2c8773429e85529d7f.tar.bz2 otp-4d72eedc0d3573e9709b8f2c8773429e85529d7f.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam')
| -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 36a492f00d..36cfe0548e 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); |