From 96d63dca845e18f86488db9d8dfb33eb76ad0467 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Tue, 4 Aug 2015 23:46:29 +0200
Subject: Simplify time manipulation

By doing away with more wrapping that the parent commit started to
remove.
---
 lib/diameter/src/base/diameter_watchdog.erl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'lib/diameter/src/base/diameter_watchdog.erl')

diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index 66781d7b06..009a766e43 100644
--- a/lib/diameter/src/base/diameter_watchdog.erl
+++ b/lib/diameter/src/base/diameter_watchdog.erl
@@ -124,8 +124,7 @@ i({Ack, T, Pid, {RecvData,
                  = Svc}}) ->
     monitor(process, Pid),
     wait(Ack, Pid),
-    {_, Seed} = diameter_lib:seed(),
-    random:seed(Seed),
+    random:seed(now()),
     putr(restart, {T, Opts, Svc, SvcOpts}),  %% save seeing it in trace
     putr(dwr, dwr(Caps)),                    %%
     {_,_} = Mask = proplists:get_value(sequence, SvcOpts),
@@ -453,7 +452,7 @@ transition({timeout, TRef, tw}, #watchdog{tref = TRef} = S) ->
 %% Message has arrived since the timer was started: subtract time
 %% already elapsed from new timer.
 transition({timeout, _, tw}, #watchdog{tref = T0} = S) ->
-    set_watchdog(diameter_lib:micro_diff(T0) div 1000, S);
+    set_watchdog(timer:now_diff(now(), T0) div 1000, S);
 
 %% State query.
 transition({state, Pid}, #watchdog{status = S}) ->
@@ -535,7 +534,7 @@ set_watchdog(#watchdog{tref = undefined} = S) ->
 
 %% Timer already set: start at new one only at expiry.
 set_watchdog(#watchdog{} = S) ->
-    S#watchdog{tref = diameter_lib:now()};
+    S#watchdog{tref = now()};
 
 set_watchdog(stop = No) ->
     No.
-- 
cgit v1.2.3