diff options
| author | Dan Gudmundsson <[email protected]> | 2015-08-26 12:57:24 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-08-26 12:57:24 +0200 |
| commit | 5a8f1cb18b6dce3d489b4b77c5e7c82de716ae67 (patch) | |
| tree | cbf839b5b1a51075276a0c9d5b1f2a3d389c5a65 /lib/mnesia/test/mnesia_cost.erl | |
| parent | b78c3b351fc955aa14bdfc3577890031ffffa9f0 (diff) | |
| parent | f940d1cc510b9eb86a2562f190825b17a31acee2 (diff) | |
| download | otp-5a8f1cb18b6dce3d489b4b77c5e7c82de716ae67.tar.gz otp-5a8f1cb18b6dce3d489b4b77c5e7c82de716ae67.tar.bz2 otp-5a8f1cb18b6dce3d489b4b77c5e7c82de716ae67.zip | |
Merge branch 'dgud/mnesia/use_now_in_tests' into maint
* dgud/mnesia/use_now_in_tests:
Remove erlang:now() and random usage in tests
Diffstat (limited to 'lib/mnesia/test/mnesia_cost.erl')
| -rw-r--r-- | lib/mnesia/test/mnesia_cost.erl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/mnesia/test/mnesia_cost.erl b/lib/mnesia/test/mnesia_cost.erl index ff0108ced1..714dbaef27 100644 --- a/lib/mnesia/test/mnesia_cost.erl +++ b/lib/mnesia/test/mnesia_cost.erl @@ -108,11 +108,11 @@ run(What, OtherInfo, Ops, F) -> run(t, What, OtherInfo, Ops, F). run(How, What, OtherInfo, Ops, F) -> - T1 = erlang:now(), + T1 = erlang:monotonic_time(), statistics(runtime), do_times(How, ?TIMES, F), {_, RunTime} = statistics(runtime), - T2 = erlang:now(), + T2 = erlang:monotonic_time(), RealTime = subtr(T1, T2), report(How, What, OtherInfo, Ops, RunTime, RealTime). @@ -140,11 +140,7 @@ report(dirty, What, OtherInfo, Ops, RunTime, RealTime) -> subtr(Before, After) -> - E =(element(1,After)*1000000000000 - +element(2,After)*1000000+element(3,After)) - - (element(1,Before)*1000000000000 - +element(2,Before)*1000000+element(3,Before)), - E div 1000. + erlang:convert_time_unit(After-Before, native, milli_seconds). do_times(t, I, F) -> do_trans_times(I, F); |