diff options
| author | Rickard Green <[email protected]> | 2015-03-29 01:29:23 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-05-06 15:58:32 +0200 |
| commit | f0d51083a6cda851ed60578a7679e20b1fe5678a (patch) | |
| tree | 5a226fc49118adf9b42f4594c843082d9328a03f /erts/emulator/test/mtx_SUITE.erl | |
| parent | e135070d4c7135228756e6a43dbdd638b565a499 (diff) | |
| download | otp-f0d51083a6cda851ed60578a7679e20b1fe5678a.tar.gz otp-f0d51083a6cda851ed60578a7679e20b1fe5678a.tar.bz2 otp-f0d51083a6cda851ed60578a7679e20b1fe5678a.zip | |
Replace erlang:now() usage in emulator suite
Diffstat (limited to 'erts/emulator/test/mtx_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/mtx_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/test/mtx_SUITE.erl b/erts/emulator/test/mtx_SUITE.erl index a492501959..8dcd21f303 100644 --- a/erts/emulator/test/mtx_SUITE.erl +++ b/erts/emulator/test/mtx_SUITE.erl @@ -441,10 +441,10 @@ hammer_ets_rwlock_test(XOpts, UW, C, N, NP, SC) -> receive after infinity -> ok end end) | Ps0] end, - Start = now(), + Start = erlang:monotonic_time(), lists:foreach(fun (P) -> P ! go end, Ps), lists:foreach(fun (P) -> receive {done, P} -> ok end end, Ps), - Stop = now(), + Stop = erlang:monotonic_time(), lists:foreach(fun (P) -> unlink(P), exit(P, bang), @@ -453,7 +453,7 @@ hammer_ets_rwlock_test(XOpts, UW, C, N, NP, SC) -> {'DOWN', M, process, P, _} -> ok end end, Ps), - Res = timer:now_diff(Stop, Start)/1000000, + Res = (Stop-Start)/erlang:convert_time_unit(1,seconds,native), Caller ! {?MODULE, self(), Res} end, TP = spawn_link(T), |