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

9 files changed, 25 insertions, 42 deletions

diff --git a/lib/diameter/test/diameter_codec_test.erl b/lib/diameter/test/diameter_codec_test.erl
index 5f1dbfbd61..17f5833101 100644
--- a/lib/diameter/test/diameter_codec_test.erl
+++ b/lib/diameter/test/diameter_codec_test.erl
@@ -229,7 +229,7 @@ v(Max, Ord, E)
   when Ord =< Max ->
     diameter_enum:to_list(E);
 v(Max, Ord, E) ->
-    random:seed(diameter_util:seed()),
+    random:seed(now()),
     v(Max, Ord, E, []).
 
 v(0, _, _, Acc) ->
@@ -522,7 +522,7 @@ random(Mn,Mx) ->
 
 seed(undefined) ->
     put({?MODULE, seed}, true),
-    random:seed(diameter_util:seed());
+    random:seed(now());
 
 seed(true) ->
     ok.
diff --git a/lib/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl
index 4bcaa8119f..bbdf672291 100644
--- a/lib/diameter/test/diameter_config_SUITE.erl
+++ b/lib/diameter/test/diameter_config_SUITE.erl
@@ -50,7 +50,7 @@
                 {request_errors, RE},
                 {call_mutates_state, C}]]
               || D <- [diameter_gen_base_rfc3588, diameter_gen_base_rfc6733],
-                 M <- [?MODULE, [?MODULE, diameter_lib:now()]],
+                 M <- [?MODULE, [?MODULE, now()]],
                  A <- [0, common, make_ref()],
                  S <- [[], make_ref()],
                  AE <- [report, callback, discard],
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.
diff --git a/lib/diameter/test/diameter_event_SUITE.erl b/lib/diameter/test/diameter_event_SUITE.erl
index bfe160203c..8ede8a51a8 100644
--- a/lib/diameter/test/diameter_event_SUITE.erl
+++ b/lib/diameter/test/diameter_event_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-15. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2015. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -174,9 +174,9 @@ event(Name) ->
     receive #diameter_event{service = Name, info = T} -> T end.
 
 event(Name, TL, TH) ->
-    T0 = diameter_lib:now(),
+    T0 = now(),
     Event = event(Name),
-    DT = diameter_lib:micro_diff(T0) div 1000,
+    DT = timer:now_diff(now(), T0) div 1000,
     {true, true, DT, Event} = {TL < DT, DT < TH, DT, Event},
     Event.
 
diff --git a/lib/diameter/test/diameter_examples_SUITE.erl b/lib/diameter/test/diameter_examples_SUITE.erl
index ef8e459175..dc0b466b59 100644
--- a/lib/diameter/test/diameter_examples_SUITE.erl
+++ b/lib/diameter/test/diameter_examples_SUITE.erl
@@ -295,15 +295,15 @@ slave() ->
     [{timetrap, {minutes, 10}}].
 
 slave(_) ->
-    T0 = diameter_lib:now(),
+    T0 = now(),
     {ok, Node} = ct_slave:start(?MODULE, ?TIMEOUTS),
-    T1 = diameter_lib:now(),
+    T1 = now(),
     T2 = rpc:call(Node, erlang, now, []),
     {ok, Node} = ct_slave:stop(?MODULE),
-    now_diff([T0, T1, T2, diameter_lib:now()]).
+    now_diff([T0, T1, T2, now()]).
 
 now_diff([T1,T2|_] = Ts) ->
-    [diameter_lib:micro_diff(T2,T1) | now_diff(tl(Ts))];
+    [timer:now_diff(T2,T1) | now_diff(tl(Ts))];
 now_diff(_) ->
     [].
 
diff --git a/lib/diameter/test/diameter_gen_sctp_SUITE.erl b/lib/diameter/test/diameter_gen_sctp_SUITE.erl
index 4ea5e80095..ced897c714 100644
--- a/lib/diameter/test/diameter_gen_sctp_SUITE.erl
+++ b/lib/diameter/test/diameter_gen_sctp_SUITE.erl
@@ -296,12 +296,12 @@ connect2(Pid, PortNr, Bin) ->
     %% T2 = time after listening process received our message
     %% T3 = time after reply is received
 
-    T1 = diameter_util:timestamp(),
+    T1 = now(),
     ok = send(Sock, Id, Bin),
     T2 = unmark(recv(Sock, Id)),
-    T3 = diameter_util:timestamp(),
-    {diameter_lib:micro_diff(T2, T1),  %% Outbound
-     diameter_lib:micro_diff(T3, T2)}. %% Inbound
+    T3 = now(),
+    {timer:now_diff(T2, T1),  %% Outbound
+     timer:now_diff(T3, T2)}. %% Inbound
 
 %% recv/2
 
@@ -326,7 +326,7 @@ send(Sock, Id, Bin) ->
 %% mark/1
 
 mark(Bin) ->
-    Info = term_to_binary(diameter_util:timestamp()),
+    Info = term_to_binary(now()),
     <<Info/binary, Bin/binary>>.
 
 %% unmark/1
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index e26a8946b7..fe6dd7b617 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -895,7 +895,7 @@ call(Config, Req, Opts) ->
     diameter:call(CN,
                   dict(Req, Dict0),
                   msg(Req, ReqEncoding, Dict0),
-                  [{extra, [{Name, Group}, diameter_lib:now()]} | Opts]).
+                  [{extra, [{Name, Group}, now()]} | Opts]).
 
 origin({A,C}) ->
     2*codec(A) + container(C);
@@ -1253,10 +1253,8 @@ app(Req, _, Dict0) ->
 %% handle_error/6
 
 handle_error(timeout = Reason, _Req, [$C|_], _Peer, _, Time) ->
-    Now = diameter_lib:now(),
-    {Reason, {diameter_lib:timestamp(Time),
-              diameter_lib:timestamp(Now),
-              diameter_lib:micro_diff(Now, Time)}};
+    Now = now(),
+    {Reason, {Time, Now, timer:now_diff(Now, Time)}};
 
 handle_error(Reason, _Req, [$C|_], _Peer, _, _Time) ->
     {error, Reason}.
diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl
index 78bddbd1cf..40f713a550 100644
--- a/lib/diameter/test/diameter_transport_SUITE.erl
+++ b/lib/diameter/test/diameter_transport_SUITE.erl
@@ -53,7 +53,7 @@
 
 %% Receive a message.
 -define(RECV(Pat, Ret), receive Pat -> Ret end).
--define(RECV(Pat), ?RECV(Pat, diameter_util:timestamp())).
+-define(RECV(Pat), ?RECV(Pat, now())).
 
 %% Sockets are opened on the loopback address.
 -define(ADDR, {127,0,0,1}).
@@ -335,7 +335,7 @@ make_msg() ->
 %% crypto:rand_bytes/1 isn't available on all platforms (since openssl
 %% isn't) so roll our own.
 rand_bytes(N) ->
-    random:seed(diameter_util:seed()),
+    random:seed(now()),
     rand_bytes(N, <<>>).
 
 rand_bytes(0, Bin) ->
@@ -416,7 +416,7 @@ gen_accept(tcp, LSock) ->
 
 gen_send(sctp, Sock, Bin) ->
     {OS, _IS, Id} = getr(assoc),
-    {_, _, Us} = diameter_util:timestamp(),
+    {_, _, Us} = now(),
     gen_sctp:send(Sock, Id, Us rem OS, Bin);
 gen_send(tcp, Sock, Bin) ->
     gen_tcp:send(Sock, Bin).
diff --git a/lib/diameter/test/diameter_util.erl b/lib/diameter/test/diameter_util.erl
index df7d268429..e8fab18a45 100644
--- a/lib/diameter/test/diameter_util.erl
+++ b/lib/diameter/test/diameter_util.erl
@@ -30,8 +30,6 @@
          fold/3,
          foldl/3,
          scramble/1,
-         timestamp/0,
-         seed/0,
          unique_string/0,
          have_sctp/0]).
 
@@ -178,7 +176,7 @@ scramble(L) ->
           [[fun s/1, L]]).
 
 s(L) ->
-    random:seed(seed()),
+    random:seed(now()),
     s([], L).
 
 s(Acc, []) ->
@@ -188,19 +186,6 @@ s(Acc, L) ->
     s([T|Acc], H ++ Rest).
 
 %% ---------------------------------------------------------------------------
-%% timestamp/0
-
-timestamp() ->
-    diameter_lib:timestamp(diameter_lib:now()).
-
-%% ---------------------------------------------------------------------------
-%% seed/0
-
-seed() ->
-    {_,T} = diameter_lib:seed(),
-    T.
-
-%% ---------------------------------------------------------------------------
 %% unique_string/0
 
 unique_string() ->
@@ -209,7 +194,7 @@ unique_string() ->
             integer_to_list(N)
     catch
         error: undef ->  %% OTP < 18
-            {M,S,U} = timestamp(),
+            {M,S,U} = now(),
             tl(lists:append(["-" ++ integer_to_list(N) || N <- [M,S,U]]))
     end.