diff options
| author | Erlang/OTP <[email protected]> | 2015-08-13 12:34:03 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-08-13 12:34:03 +0200 |
| commit | 2c7132e3f6dc670a177aac804fe12702dbc9ed7d (patch) | |
| tree | f684c2a7881b2fb3eb44312df3770432de01b86d /lib/diameter/test/diameter_ct.erl | |
| parent | 0c21fb612b736f53dcc04face42bd106c50287ae (diff) | |
| parent | 96d63dca845e18f86488db9d8dfb33eb76ad0467 (diff) | |
| download | otp-2c7132e3f6dc670a177aac804fe12702dbc9ed7d.tar.gz otp-2c7132e3f6dc670a177aac804fe12702dbc9ed7d.tar.bz2 otp-2c7132e3f6dc670a177aac804fe12702dbc9ed7d.zip | |
Merge branch 'anders/diameter/17/time/OTP-12926' into maint-17
* anders/diameter/17/time/OTP-12926:
Simplify time manipulation
Remove use of monotonic time in pre-18 code
Remove unnecessary redefinition of erlang:max/2
Diffstat (limited to 'lib/diameter/test/diameter_ct.erl')
| -rw-r--r-- | lib/diameter/test/diameter_ct.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/test/diameter_ct.erl b/lib/diameter/test/diameter_ct.erl index 85c502ea7f..788cbbbe3e 100644 --- a/lib/diameter/test/diameter_ct.erl +++ b/lib/diameter/test/diameter_ct.erl @@ -43,7 +43,7 @@ ct_run(Opts) -> info(Start , info()). info() -> - [{time, diameter_lib:now()}, + [{time, now()}, {process_count, erlang:system_info(process_count)} | erlang:memory()]. @@ -56,6 +56,6 @@ info(L0, L1) -> io:format("INFO: ~p~n", [Diff]). diff(time, T0, T1) -> - diameter_lib:micro_diff(T1, T0); + timer:now_diff(T1, T0); diff(_, N0, N1) -> N1 - N0. |