diff options
| author | Rickard Green <[email protected]> | 2016-02-02 16:21:46 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-02-02 16:21:46 +0100 |
| commit | f45b817d0da8f9f61d2241d4f0eb06e47a6be86a (patch) | |
| tree | 55648184781e4aecb43f7489b7bc7f82c55c1d2c /erts/emulator/beam | |
| parent | 1a1eaec544987f439061622f0177e424dfd6306a (diff) | |
| parent | 876af25b600bf698cac95cd1902fa16aeecc0c7e (diff) | |
| download | otp-f45b817d0da8f9f61d2241d4f0eb06e47a6be86a.tar.gz otp-f45b817d0da8f9f61d2241d4f0eb06e47a6be86a.tar.bz2 otp-f45b817d0da8f9f61d2241d4f0eb06e47a6be86a.zip | |
Merge branch 'maint'
* maint:
Use nano second time unit in tracing
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_trace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c index 164bfafc02..25393369a7 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)); |