From 1132117b38cfe33e770a0d5b1a782d48667427c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erland=20Sch=C3=B6nbeck?= <erland@erlang.org>
Date: Thu, 5 Mar 2015 13:37:16 +0100
Subject: Use new time API and be back-compatible in inets Remove unused
 functions and removed redundant test

---
 lib/inets/src/ftp/ftp.erl | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'lib/inets/src/ftp')

diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl
index 8e51b1be5a..20f36e6d8a 100644
--- a/lib/inets/src/ftp/ftp.erl
+++ b/lib/inets/src/ftp/ftp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -2176,16 +2176,23 @@ handle_caller(#state{caller = {transfer_data, {Cmd, Bin, RemoteFile}}} =
 %% Connect to FTP server at Host (default is TCP port 21) 
 %% in order to establish a control connection.
 setup_ctrl_connection(Host, Port, Timeout, State) ->
-    MsTime = millisec_time(),
+    %% Adapt to OTP 18 erlang time API and be back-compatible
+    MsTime = try
+                 erlang:monotonic_time()
+             catch
+                 error:undef ->
+                     %% Use Erlang system time as monotonic time
+                     erlang:now()
+             end,
     case connect(Host, Port, Timeout, State) of
 	{ok, IpFam, CSock} ->
 	    NewState = State#state{csock = {tcp, CSock}, ipfamily = IpFam},
 	    activate_ctrl_connection(NewState),
-	    case Timeout - (millisec_time() - MsTime) of
+	    case Timeout - millisec_passed(MsTime) of
 		Timeout2 when (Timeout2 >= 0) ->
 		    {ok, NewState#state{caller = open}, Timeout2};
 		_ ->
-		    %% Oups: Simulate timeout
+                    %% Oups: Simulate timeout
 		    {ok, NewState#state{caller = open}, 0}
 	    end;
 	Error ->
@@ -2501,9 +2508,16 @@ progress_report(Report,  #state{progress = ProgressPid}) ->
     ftp_progress:report(ProgressPid, Report).
 
 
-millisec_time() ->
-    {A,B,C} = erlang:now(),
-    A*1000000000+B*1000+(C div 1000).
+%% Help function, elapsed milliseconds since T0
+millisec_passed({_,_,_} = T0 ) ->
+    %% OTP 17 and earlier
+    timer:now_diff(erlang:now(), T0) div 1000;
+
+millisec_passed(T0) ->
+    %% OTP 18
+    erlang:convert_time_resolution(erlang:monotonic_time() - T0,
+                                   erlang:time_resolution(),
+                                   1000000) div 1000.
 
 peername({tcp, Socket}) -> inet:peername(Socket);
 peername({ssl, Socket}) -> ssl:peername(Socket).
-- 
cgit v1.2.3