diff options
| author | Rickard Green <[email protected]> | 2016-09-29 17:27:37 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-09-29 17:27:37 +0200 |
| commit | 4de2006a6fed05e6b524c56ad16b6e62a9d00817 (patch) | |
| tree | 6fbcf7a565a4b5159c118bae3775230e0418252a /lib/stdlib/test/ets_SUITE.erl | |
| parent | 830d1bf2e5acaad3c720a001ad338841993feacc (diff) | |
| parent | 5e57b3faccba1ae66ebd40fed23f5770eee71b04 (diff) | |
| download | otp-4de2006a6fed05e6b524c56ad16b6e62a9d00817.tar.gz otp-4de2006a6fed05e6b524c56ad16b6e62a9d00817.tar.bz2 otp-4de2006a6fed05e6b524c56ad16b6e62a9d00817.zip | |
Merge branch 'rickard/time-unit/OTP-13831'
* rickard/time-unit/OTP-13831:
Replace usage of deprecated time units
Diffstat (limited to 'lib/stdlib/test/ets_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/ets_SUITE.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl index e726a29c9e..9a14c7014c 100644 --- a/lib/stdlib/test/ets_SUITE.erl +++ b/lib/stdlib/test/ets_SUITE.erl @@ -4446,15 +4446,15 @@ build_table2(L1,L2,Num) -> T. time_match_object(Tab,Match, Res) -> - T1 = erlang:monotonic_time(micro_seconds), + T1 = erlang:monotonic_time(microsecond), Res = ets:match_object(Tab,Match), - T2 = erlang:monotonic_time(micro_seconds), + T2 = erlang:monotonic_time(microsecond), T2 - T1. time_match(Tab,Match) -> - T1 = erlang:monotonic_time(micro_seconds), + T1 = erlang:monotonic_time(microsecond), ets:match(Tab,Match), - T2 = erlang:monotonic_time(micro_seconds), + T2 = erlang:monotonic_time(microsecond), T2 - T1. seventyfive_percent_success(_,S,Fa,0) -> @@ -6276,7 +6276,7 @@ do_tc(Do, Report) -> T1 = erlang:monotonic_time(), Do(), T2 = erlang:monotonic_time(), - Elapsed = erlang:convert_time_unit(T2 - T1, native, milli_seconds), + Elapsed = erlang:convert_time_unit(T2 - T1, native, millisecond), Report(Elapsed). syrup_factor() -> |