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/test/trace_bif_SUITE.erl | |
| 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/test/trace_bif_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/trace_bif_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/test/trace_bif_SUITE.erl b/erts/emulator/test/trace_bif_SUITE.erl index 760666d077..96b7dd159f 100644 --- a/erts/emulator/test/trace_bif_SUITE.erl +++ b/erts/emulator/test/trace_bif_SUITE.erl @@ -314,9 +314,9 @@ receive_trace_msg_ts_return_to({trace_ts, Pid, return_to, {M,F,A}}, PrevTs, TsTy make_ts(timestamp) -> erlang:now(); make_ts(monotonic_timestamp) -> - erlang:monotonic_time(); + erlang:monotonic_time(nano_seconds); make_ts(strict_monotonic_timestamp) -> - MT = erlang:monotonic_time(), + MT = erlang:monotonic_time(nano_seconds), UMI = erlang:unique_integer([monotonic]), {MT, UMI}. |