Merge branch 'maint'

4 files changed, 38 insertions, 15 deletions

diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 8ffe718334..46f0eba5e0 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -4484,7 +4484,7 @@ make_port_info_term(Eterm **hpp_start,
 	int len;
 	int start;
 	static Eterm item[] = ERTS_PORT_INFO_1_ITEMS;
-	static Eterm value[sizeof(item)/sizeof(item[0])];
+        Eterm value[sizeof(item)/sizeof(item[0])];
 
 	start = 0;
 	len = sizeof(item)/sizeof(item[0]);
diff --git a/erts/emulator/test/port_bif_SUITE.erl b/erts/emulator/test/port_bif_SUITE.erl
index f439867e9c..0c5b09d45a 100644
--- a/erts/emulator/test/port_bif_SUITE.erl
+++ b/erts/emulator/test/port_bif_SUITE.erl
@@ -24,7 +24,7 @@
 	 init_per_group/2,end_per_group/2, command/1,
 	 command_e_1/1, command_e_2/1, command_e_3/1, command_e_4/1,
 	 port_info1/1, port_info2/1,
-	 port_info_os_pid/1,
+	 port_info_os_pid/1, port_info_race/1,
 	 connect/1, control/1, echo_to_busy/1]).
 
 -export([do_command_e_1/1, do_command_e_2/1, do_command_e_4/1]).
@@ -42,7 +42,8 @@ all() ->
 groups() -> 
     [{command_e, [],
       [command_e_1, command_e_2, command_e_3, command_e_4]},
-     {port_info, [], [port_info1, port_info2, port_info_os_pid]}].
+     {port_info, [],
+      [port_info1, port_info2, port_info_os_pid, port_info_race]}].
 
 init_per_suite(Config) ->
     Config.
@@ -254,6 +255,28 @@ do_port_info_os_pid() ->
     true = erlang:port_close(P),
     ok.
 
+port_info_race(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Program = filename:join(DataDir, "port_test"),
+    Top = self(),
+    P1 = open_port({spawn,Program}, [{packet,1}]),
+    P2 = open_port({spawn,Program}, [{packet,1}]),
+    Info1 = erlang:port_info(P1),
+    Info2 = erlang:port_info(P2),
+    F = fun Loop(Port, _, 0) ->
+                Top ! {ok,Port};
+            Loop(Port, Info, N) ->
+                Info = erlang:port_info(Port),
+                Loop(Port, Info, N - 1)
+        end,
+    spawn_link(fun () -> F(P1, Info1, 1000) end),
+    spawn_link(fun () -> F(P2, Info2, 1000) end),
+    receive {ok,P1} -> ok end,
+    receive {ok,P2} -> ok end,
+    true = erlang:port_close(P1),
+    true = erlang:port_close(P2),
+    ok.
+
 output_test(_, _, Input, Output) when Output > 16#1fffffff ->
     io:format("~p bytes received\n", [Input]);
 output_test(P, Bin, Input0, Output0) ->
diff --git a/lib/diameter/src/base/diameter_lib.erl b/lib/diameter/src/base/diameter_lib.erl
index b9defbd077..51d203d722 100644
--- a/lib/diameter/src/base/diameter_lib.erl
+++ b/lib/diameter/src/base/diameter_lib.erl
@@ -130,12 +130,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
 %% ---------------------------------------------------------------------------
@@ -165,9 +166,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
@@ -179,9 +178,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)).
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),