Use new time api in implementation

In particular, deal with the deprecation of erlang:now/0 in OTP 18. Be
backwards compatible with older releases: the new api is only used when
available.

The test suites have not been modified.

10 files changed, 134 insertions, 22 deletions

diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl
index 270faa9542..c0a4f7df69 100644
--- a/lib/diameter/src/base/diameter_config.erl
+++ b/lib/diameter/src/base/diameter_config.erl
@@ -35,10 +35,11 @@
 %%
 
 -module(diameter_config).
--compile({no_auto_import, [monitor/2]}).
-
 -behaviour(gen_server).
 
+-compile({no_auto_import, [monitor/2, now/0]}).
+-import(diameter_lib, [now/0]).
+
 -export([start_service/2,
          stop_service/1,
          add_transport/2,
diff --git a/lib/diameter/src/base/diameter_lib.erl b/lib/diameter/src/base/diameter_lib.erl
index 23eba7e80c..6dd1d5f6ed 100644
--- a/lib/diameter/src/base/diameter_lib.erl
+++ b/lib/diameter/src/base/diameter_lib.erl
@@ -18,12 +18,18 @@
 %%
 
 -module(diameter_lib).
+-compile({no_auto_import, [now/0]}).
 
 -export([info_report/2,
          error_report/2,
          warning_report/2,
+         now/0,
+         timestamp/1,
          now_diff/1,
+         micro_diff/1,
+         micro_diff/2,
          time/1,
+         seed/0,
          eval/1,
          eval_name/1,
          get_stacktrace/0,
@@ -92,13 +98,50 @@ fmt(T) ->
     end.
 
 %% ---------------------------------------------------------------------------
+%% # now/0
+%% ---------------------------------------------------------------------------
+
+-type timestamp() :: {non_neg_integer(), 0..999999, 0..999999}.
+-type now() :: integer() %% monotonic time
+             | timestamp().
+
+-spec now()
+   -> now().
+
+%% Use monotonic time if it exists, fall back to erlang:now()
+%% otherwise.
+
+now() ->
+    try
+        erlang:monotonic_time() 
+    catch
+        error: undef -> erlang:now()
+    end.
+
+%% ---------------------------------------------------------------------------
+%% # timestamp/1
+%% ---------------------------------------------------------------------------
+
+-spec timestamp(NowT :: now())
+   -> timestamp().
+
+timestamp({_,_,_} = T) ->  %% erlang:now()
+    T;
+
+timestamp(MonoT) ->  %% monotonic time
+    MicroSecs = erlang:convert_time_resolution(MonoT + erlang:time_offset(),
+                                               erlang:time_resolution(),
+                                               1000000),
+    Secs = MicroSecs div 1000000,
+    {Secs div 1000000, Secs rem 1000000, MicroSecs rem 1000000}.
+
+%% ---------------------------------------------------------------------------
 %% # now_diff/1
 %% ---------------------------------------------------------------------------
 
--spec now_diff(NowT)
+-spec now_diff(NowT :: now())
    -> {Hours, Mins, Secs, MicroSecs}
- when NowT  :: {non_neg_integer(), 0..999999, 0..999999},
-      Hours :: non_neg_integer(),
+ when Hours :: non_neg_integer(),
       Mins  :: 0..59,
       Secs  :: 0..59,
       MicroSecs :: 0..999999.
@@ -106,8 +149,41 @@ fmt(T) ->
 %% Return timer:now_diff(now(), NowT) as an {H, M, S, MicroS} tuple
 %% instead of as integer microseconds.
 
-now_diff({_,_,_} = Time) ->
-    time(timer:now_diff(now(), Time)).
+now_diff(Time) ->
+    time(micro_diff(Time)).
+
+%% ---------------------------------------------------------------------------
+%% # micro_diff/1
+%% ---------------------------------------------------------------------------
+
+-spec micro_diff(NowT :: now())
+   -> MicroSecs
+ when MicroSecs :: non_neg_integer().
+
+micro_diff({_,_,_} = T0) ->
+    timer:now_diff(erlang:now(), T0);
+
+micro_diff(T0) ->  %% monotonic time
+    erlang:convert_time_resolution(erlang:monotonic_time() - T0,
+                                   erlang:time_resolution(),
+                                   1000000).
+
+%% ---------------------------------------------------------------------------
+%% # micro_diff/2
+%% ---------------------------------------------------------------------------
+
+-spec micro_diff(T1 :: now(), T0 :: now())
+   -> MicroSecs
+ when MicroSecs :: non_neg_integer().
+
+micro_diff(T1, T0)
+  when is_integer(T1), is_integer(T0) ->  %% monotonic time
+    erlang:convert_time_resolution(T1 - T0,
+                                   erlang:time_resolution(),
+                                   1000000);
+
+micro_diff(T1, T0) ->  %% at least one erlang:now()
+    timer:now_diff(timestamp(T1), timestamp(T0)).
 
 %% ---------------------------------------------------------------------------
 %% # time/1
@@ -117,7 +193,7 @@ now_diff({_,_,_} = Time) ->
 
 -spec time(NowT | Diff)
    -> {Hours, Mins, Secs, MicroSecs}
- when NowT  :: {non_neg_integer(), 0..999999, 0..999999},
+ when NowT  :: timestamp(),
       Diff  :: non_neg_integer(),
       Hours :: non_neg_integer(),
       Mins  :: 0..59,
@@ -136,6 +212,27 @@ time(Micro) ->  %% elapsed time
     {H, M, S, Micro rem 1000000}.
 
 %% ---------------------------------------------------------------------------
+%% # seed/0
+%% ---------------------------------------------------------------------------
+
+-spec seed()
+   -> {timestamp(), {integer(), integer(), integer()}}.
+
+%% Return an argument for random:seed/1.
+
+seed() ->
+    T = now(),
+    {timestamp(T), seed(T)}.
+
+%% seed/1
+
+seed({_,_,_} = T) ->
+    T;
+
+seed(T) ->  %% monotonic time
+    {erlang:phash2(node()), T, erlang:unique_integer()}.
+
+%% ---------------------------------------------------------------------------
 %% # eval/1
 %%
 %% Evaluate a function in various forms.
diff --git a/lib/diameter/src/base/diameter_peer.erl b/lib/diameter/src/base/diameter_peer.erl
index e5d4b28766..ea326dd03e 100644
--- a/lib/diameter/src/base/diameter_peer.erl
+++ b/lib/diameter/src/base/diameter_peer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -18,9 +18,11 @@
 %%
 
 -module(diameter_peer).
-
 -behaviour(gen_server).
 
+-compile({no_auto_import, [now/0]}).
+-import(diameter_lib, [now/0]).
+
 %% Interface towards transport modules ...
 -export([recv/2,
          up/1,
diff --git a/lib/diameter/src/base/diameter_reg.erl b/lib/diameter/src/base/diameter_reg.erl
index 3197c1aee1..f785777874 100644
--- a/lib/diameter/src/base/diameter_reg.erl
+++ b/lib/diameter/src/base/diameter_reg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -22,10 +22,11 @@
 %%
 
 -module(diameter_reg).
--compile({no_auto_import, [monitor/2]}).
-
 -behaviour(gen_server).
 
+-compile({no_auto_import, [monitor/2, now/0]}).
+-import(diameter_lib, [now/0]).
+
 -export([add/1,
          add_new/1,
          del/1,
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 96897c71eb..694d64336c 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -24,6 +24,9 @@
 -module(diameter_service).
 -behaviour(gen_server).
 
+-compile({no_auto_import, [now/0]}).
+-import(diameter_lib, [now/0]).
+
 %% towards diameter_service_sup
 -export([start_link/1]).
 
@@ -1196,7 +1199,7 @@ connect_timer(Opts, Def0) ->
 %% continuous restarted in case of faulty config or other problems.
 tc(Time, Tc) ->
     choose(Tc > ?RESTART_TC
-             orelse timer:now_diff(now(), Time) > 1000*?RESTART_TC,
+             orelse diameter_lib:micro_diff(Time) > 1000*?RESTART_TC,
            Tc,
            ?RESTART_TC).
 
diff --git a/lib/diameter/src/base/diameter_session.erl b/lib/diameter/src/base/diameter_session.erl
index 3b236f109a..c5ea0428b5 100644
--- a/lib/diameter/src/base/diameter_session.erl
+++ b/lib/diameter/src/base/diameter_session.erl
@@ -157,8 +157,8 @@ session_id(Host) ->
 %% ---------------------------------------------------------------------------
 
 init() ->
-    Now = now(),
-    random:seed(Now),
+    {Now, Seed} = diameter_lib:seed(),
+    random:seed(Seed),
     Time = time32(Now),
     Seq  = (?INT32 band (Time bsl 20)) bor (random:uniform(1 bsl 20) - 1),
     ets:insert(diameter_sequence, [{origin_state_id, Time},
diff --git a/lib/diameter/src/base/diameter_stats.erl b/lib/diameter/src/base/diameter_stats.erl
index 8353613d32..64ea082be0 100644
--- a/lib/diameter/src/base/diameter_stats.erl
+++ b/lib/diameter/src/base/diameter_stats.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -22,9 +22,11 @@
 %%
 
 -module(diameter_stats).
-
 -behaviour(gen_server).
 
+-compile({no_auto_import, [now/0]}).
+-import(diameter_lib, [now/0]).
+
 -export([reg/2, reg/1,
          incr/3, incr/1,
          read/1,
diff --git a/lib/diameter/src/base/diameter_sync.erl b/lib/diameter/src/base/diameter_sync.erl
index ce2db4b3a2..90eabece3d 100644
--- a/lib/diameter/src/base/diameter_sync.erl
+++ b/lib/diameter/src/base/diameter_sync.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -27,6 +27,9 @@
 -module(diameter_sync).
 -behaviour(gen_server).
 
+-compile({no_auto_import, [now/0]}).
+-import(diameter_lib, [now/0]).
+
 -export([call/4, call/5,
          cast/4, cast/5,
          carp/1, carp/2]).
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index b7f2d24941..67715906e8 100644
--- a/lib/diameter/src/base/diameter_watchdog.erl
+++ b/lib/diameter/src/base/diameter_watchdog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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
@@ -122,7 +122,8 @@ i({Ack, T, Pid, {RecvData,
                  = Svc}}) ->
     erlang:monitor(process, Pid),
     wait(Ack, Pid),
-    random:seed(now()),
+    {_, Seed} = diameter_lib:seed(),
+    random:seed(Seed),
     putr(restart, {T, Opts, Svc}),  %% save seeing it in trace
     putr(dwr, dwr(Caps)),           %%
     {_,_} = Mask = proplists:get_value(sequence, SvcOpts),
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl
index 66cffa41c0..2c8d6f0a14 100644
--- a/lib/diameter/src/transport/diameter_sctp.erl
+++ b/lib/diameter/src/transport/diameter_sctp.erl
@@ -18,9 +18,11 @@
 %%
 
 -module(diameter_sctp).
-
 -behaviour(gen_server).
 
+-compile({no_auto_import, [now/0]}).
+-import(diameter_lib, [now/0]).
+
 %% interface
 -export([start/3]).