From 955dc3a824e8ceaace25196574902eab93a53454 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Fri, 13 Mar 2015 19:55:36 +0100
Subject: Adapt app suite to changes in time api

erlang:time_resolution/0 has been removed,
erlang:convert_time_resolution/3 has been renamed convert_time_unit, and
{os,erlang}:system_time/0,1 have been added. Modify the list of ignored
undefined function calls accordingly.
---
 lib/diameter/test/diameter_app_SUITE.erl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'lib/diameter')

diff --git a/lib/diameter/test/diameter_app_SUITE.erl b/lib/diameter/test/diameter_app_SUITE.erl
index cf34c762e1..6975e83830 100644
--- a/lib/diameter/test/diameter_app_SUITE.erl
+++ b/lib/diameter/test/diameter_app_SUITE.erl
@@ -226,15 +226,18 @@ ignored({FromMod,_,_}, {ToMod,_,_} = To, Rel)->
 
 %% New time api in OTP 18.
 time_api() ->
-    [{erlang, F, A} || {F,A} <- [{convert_time_resolution,3},
+    [{erlang, F, A} || {F,A} <- [{convert_time_unit,3},
                                  {monotonic_time,0},
                                  {monotonic_time,1},
+                                 {system_time,0},
+                                 {system_time,1},
                                  {time_offset,0},
                                  {time_offset,1},
-                                 {time_resolution,0},
                                  {timestamp,0},
                                  {unique_integer,0},
-                                 {unique_integer,1}]].
+                                 {unique_integer,1}]]
+        ++ [{os, system_time, 0},
+            {os, system_time, 1}].
 
 release() ->
     Rel = erlang:system_info(otp_release),
-- 
cgit v1.2.3


From d43862545fcab2c976ecf30a0620ac971e16ba8e Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Fri, 13 Mar 2015 17:55:34 +0100
Subject: Adapt to changes in time api

erlang:convert_time_resolution/3 has been renamed to convert_time_unit.
erlang:time_resolution/0 has been removed: use new time resolution
values instead.
---
 lib/diameter/src/base/diameter_lib.erl | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'lib/diameter')

diff --git a/lib/diameter/src/base/diameter_lib.erl b/lib/diameter/src/base/diameter_lib.erl
index 6dd1d5f6ed..4ffe69112d 100644
--- a/lib/diameter/src/base/diameter_lib.erl
+++ b/lib/diameter/src/base/diameter_lib.erl
@@ -129,12 +129,13 @@ timestamp({_,_,_} = T) ->  %% erlang:now()
     T;
 
 timestamp(MonoT) ->  %% monotonic time
-    MicroSecs = erlang:convert_time_resolution(MonoT + erlang:time_offset(),
-                                               erlang:time_resolution(),
-                                               1000000),
+    MicroSecs = monotonic_to_microseconds(MonoT + erlang:time_offset()),
     Secs = MicroSecs div 1000000,
     {Secs div 1000000, Secs rem 1000000, MicroSecs rem 1000000}.
 
+monotonic_to_microseconds(MonoT) ->
+    erlang:convert_time_unit(MonoT, native, micro_seconds).
+
 %% ---------------------------------------------------------------------------
 %% # now_diff/1
 %% ---------------------------------------------------------------------------
@@ -164,9 +165,7 @@ 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).
+    monotonic_to_microseconds(erlang:monotonic_time() - T0).
 
 %% ---------------------------------------------------------------------------
 %% # micro_diff/2
@@ -178,9 +177,7 @@ micro_diff(T0) ->  %% monotonic time
 
 micro_diff(T1, T0)
   when is_integer(T1), is_integer(T0) ->  %% monotonic time
-    erlang:convert_time_resolution(T1 - T0,
-                                   erlang:time_resolution(),
-                                   1000000);
+    monotonic_to_microseconds(T1 - T0);
 
 micro_diff(T1, T0) ->  %% at least one erlang:now()
     timer:now_diff(timestamp(T1), timestamp(T0)).
-- 
cgit v1.2.3