Merge branch 'erland/ssh/time/OTP-12444' into maint

* erland/ssh/time/OTP-12444:
  Update misleading comment in ssh_basic_SUITE
  Update new time API and be back-compatible in ssh
  Use new time API and be back-compatible in ssh otp_SUITE: Ignore undefined functions in ssh

3 files changed, 41 insertions, 14 deletions

diff --git a/erts/test/otp_SUITE.erl b/erts/test/otp_SUITE.erl
index 171f722357..385353f046 100644
--- a/erts/test/otp_SUITE.erl
+++ b/erts/test/otp_SUITE.erl
@@ -95,7 +95,8 @@ undefined_functions(Config) when is_list(Config) ->
     Undef5 = dialyzer_filter(Undef4),
     Undef6 = wx_filter(Undef5),
     Undef7 = gs_filter(Undef6),
-    Undef = diameter_filter(Undef7),
+    Undef8 = diameter_filter(Undef7),
+    Undef = ssh_filter(Undef8),
 
     case Undef of
 	[] -> ok;
@@ -219,7 +220,7 @@ gs_filter(Undef) ->
     end.
 
 diameter_filter(Undef) ->
-    %% Filter away function calls that are catched.
+    %% Filter away function calls that are catched for OTP 18 time API
     filter(fun({{diameter_lib,_,_},{erlang,convert_time_resolution,3}}) ->
                    false;
               ({{diameter_lib,_,_},{erlang,monotonic_time,0}}) ->
@@ -233,6 +234,13 @@ diameter_filter(Undef) ->
 	      (_) -> true
 	   end, Undef).
 
+ssh_filter(Undef) ->
+    %% Filter away function calls that are catched for OTP 18 time API
+    filter(fun({{ssh_info,_,_},{erlang,timestamp,0}}) ->
+                   false;
+	      (_) -> true
+	   end, Undef).
+
 deprecated_not_in_obsolete(Config) when is_list(Config) ->
     ?line Server = ?config(xref_server, Config),
     ?line {ok,DeprecatedFunctions} = xref:q(Server, "DF"),
diff --git a/lib/ssh/src/ssh_info.erl b/lib/ssh/src/ssh_info.erl
index 9ed598b3ab..e5a8666af0 100644
--- a/lib/ssh/src/ssh_info.erl
+++ b/lib/ssh/src/ssh_info.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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
@@ -179,7 +179,14 @@ line(Len, Char) ->
 	    
 
 datetime() ->
-    {{YYYY,MM,DD}, {H,M,S}} = calendar:now_to_universal_time(now()),
+    %% Adapt to new OTP 18 erlang time API and be back-compatible
+    TimeStamp = try
+                    erlang:timestamp()
+                catch
+                    error:undef ->
+                        erlang:now()
+                end,
+    {{YYYY,MM,DD}, {H,M,S}} = calendar:now_to_universal_time(TimeStamp),
     lists:flatten(io_lib:format('~4w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w UTC',[YYYY,MM,DD, H,M,S])).
 
 
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index cb1b4ae945..b449012ffc 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2008-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
@@ -715,7 +715,14 @@ ssh_connect_arg4_timeout(_Config) ->
 
     %% try to connect with a timeout, but "supervise" it
     Client = spawn(fun() ->
-			   T0 = now(),
+                           %% Adapt to OTP 18 erlang time API and be back-compatible
+                           T0 = try
+                                    erlang:monotonic_time()
+                                catch
+                                    error:undef ->
+                                        %% Use Erlang system time as monotonic time
+                                        erlang:now()
+                                end,
 			   Rc = ssh:connect("localhost",Port,[],Timeout),
 			   ct:log("Client ssh:connect got ~p",[Rc]),
 			   Parent ! {done,self(),Rc,T0}
@@ -724,11 +731,12 @@ ssh_connect_arg4_timeout(_Config) ->
     %% Wait for client reaction on the connection try:
     receive
 	{done, Client, {error,timeout}, T0} ->
-	    Msp = ms_passed(T0, now()),
+            Msp = ms_passed(T0),
 	    exit(Server,hasta_la_vista___baby),
 	    Low = 0.9*Timeout,
 	    High =  1.1*Timeout,
-	    ct:log("Timeout limits: ~p--~p, timeout was ~p, expected ~p",[Low,High,Msp,Timeout]),
+	    ct:log("Timeout limits: ~.4f - ~.4f ms, timeout "
+                   "was ~.4f ms, expected ~p ms",[Low,High,Msp,Timeout]),
 	    if
 		Low<Msp, Msp<High -> ok;
 		true -> {fail, "timeout not within limits"}
@@ -748,12 +756,16 @@ ssh_connect_arg4_timeout(_Config) ->
     end.
 
 
-%% Help function
-%% N2-N1
-ms_passed(N1={_,_,M1}, N2={_,_,M2}) ->
-    {0,{0,Min,Sec}} = calendar:time_difference(calendar:now_to_local_time(N1),
-					       calendar:now_to_local_time(N2)),
-    1000 * (Min*60 + Sec + (M2-M1)/1000000).
+%% Help function, elapsed milliseconds since T0
+ms_passed({_,_,_} = T0 ) ->
+    %% OTP 17 and earlier
+    timer:now_diff(erlang:now(), T0)/1000;
+
+ms_passed(T0) ->
+    %% OTP 18
+    erlang:convert_time_resolution(erlang:monotonic_time() - T0,
+                                   erlang:time_resolution(),
+                                   1000000)/1000.
 
 %%--------------------------------------------------------------------
 ssh_connect_negtimeout_parallel(Config) -> ssh_connect_negtimeout(Config,true).