aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-02-02 16:21:15 +0100
committerRickard Green <[email protected]>2016-02-02 16:21:15 +0100
commit876af25b600bf698cac95cd1902fa16aeecc0c7e (patch)
tree1692da4f540f75506f88fe06715c1cfe7cafdc4f /erts/emulator/beam
parent61ef7511c5ffae0b061d7cc45e9d564b02b891db (diff)
parent18f0707c218ebdeb6024ecffd7704d3582e0b91c (diff)
downloadotp-876af25b600bf698cac95cd1902fa16aeecc0c7e.tar.gz
otp-876af25b600bf698cac95cd1902fa16aeecc0c7e.tar.bz2
otp-876af25b600bf698cac95cd1902fa16aeecc0c7e.zip
Merge branch 'rickard/monotonic-time-improvements/OTP-13222' into maint
* rickard/monotonic-time-improvements/OTP-13222: Use nano second time unit in tracing
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_trace.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index 2243639099..8a4c0ab1f2 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -165,7 +165,8 @@ take_timestamp(ErtsTraceTimeStamp *tsp, int ts_type)
case ERTS_TRACE_FLG_STRICT_MONOTONIC_TIMESTAMP: {
Uint hsz = 0;
ErtsMonotonicTime mtime = erts_get_monotonic_time(NULL);
- mtime += ERTS_MONOTONIC_OFFSET_NATIVE;
+ mtime = ERTS_MONOTONIC_TO_NSEC(mtime);
+ mtime += ERTS_MONOTONIC_OFFSET_NSEC;
hsz = (IS_SSMALL(mtime) ?
(Uint) 0
: ERTS_SINT64_HEAP_SIZE((Sint64) mtime));