[esock|ttest] Updated the ttest command line tool

Updated the ttest command line tool to the new API.

OTP-15822

7 files changed, 99 insertions, 70 deletions

diff --git a/erts/emulator/test/esock_ttest/esock-ttest b/erts/emulator/test/esock_ttest/esock-ttest
index f0d363ab30..c48201da7c 100755
--- a/erts/emulator/test/esock_ttest/esock-ttest
+++ b/erts/emulator/test/esock_ttest/esock-ttest
@@ -266,7 +266,7 @@ exec(#{role      := server,
 exec(#{role      := server,
        active    := Active,
        transport := {sock, Method}}) ->
-    case socket_test_ttest_tcp_server_socket:start(Method, Active) of
+    case socket_test_ttest_tcp_server_socket:start(Method, inet, Active) of
         {ok, {Pid, _}} ->
             MRef = erlang:monitor(process, Pid),
             receive
@@ -283,15 +283,15 @@ exec(#{role   := client,
        server := undefined}) ->
     usage("Mandatory option 'server' not provided");
 exec(#{role            := client,
-       server          := {Addr, Port},
+       server          := {_Addr, _Port} = ServerInfo,
        active          := Active,
        transport       := gen,
        msg_id          := MsgID,
        max_outstanding := MaxOutstanding,
        runtime         := RunTime}) ->
     case socket_test_ttest_tcp_client_gen:start(true,
+                                                ServerInfo,
                                                 Active,
-                                                Addr, Port,
                                                 MsgID, MaxOutstanding,
                                                 RunTime) of
         {ok, Pid} ->
@@ -306,7 +306,7 @@ exec(#{role            := client,
             error
     end;
 exec(#{role            := client,
-       server          := {Addr, Port},
+       server          := {_Addr, _Port} = ServerInfo,
        active          := Active,
        transport       := {sock, Method},
        msg_id          := MsgID,
@@ -314,8 +314,8 @@ exec(#{role            := client,
        runtime         := RunTime}) ->
     case socket_test_ttest_tcp_client_socket:start(true,
                                                    Method,
+                                                   ServerInfo,
                                                    Active,
-                                                   Addr, Port,
                                                    MsgID, MaxOutstanding,
                                                    RunTime) of
         {ok, Pid} ->
diff --git a/erts/emulator/test/socket_test_ttest_tcp_client_gen.erl b/erts/emulator/test/socket_test_ttest_tcp_client_gen.erl
index 0ec2e908d7..65a3a94d38 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_client_gen.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_client_gen.erl
@@ -21,28 +21,28 @@
 -module(socket_test_ttest_tcp_client_gen).
 
 -export([
-         start/3, start/4, start/6, start/7,
+         start/2, start/3, start/5, start/6,
          stop/1
         ]).
 
 -define(TRANSPORT_MOD, socket_test_ttest_tcp_gen).
 
-start(Active, Addr, Port) ->
-    socket_test_ttest_tcp_client:start(?TRANSPORT_MOD, Active, Addr, Port).
+start(ServerInfo, Active) ->
+    socket_test_ttest_tcp_client:start(?TRANSPORT_MOD, ServerInfo, Active).
 
-start(Active, Addr, Port, MsgID) ->
-    socket_test_ttest_tcp_client:start(?TRANSPORT_MOD, Active, Addr, Port, MsgID).
+start(ServerInfo, Active, MsgID) ->
+    socket_test_ttest_tcp_client:start(?TRANSPORT_MOD, ServerInfo, Active, MsgID).
 
-start(Active, Addr, Port, MsgID, MaxOutstanding, RunTime) ->
+start(ServerInfo, Active, MsgID, MaxOutstanding, RunTime) ->
     socket_test_ttest_tcp_client:start(false,
 				       ?TRANSPORT_MOD,
-                                       Active, Addr, Port,
+                                       ServerInfo, Active,
                                        MsgID, MaxOutstanding, RunTime).
 
-start(Quiet, Active, Addr, Port, MsgID, MaxOutstanding, RunTime) ->
+start(Quiet, ServerInfo, Active, MsgID, MaxOutstanding, RunTime) ->
     socket_test_ttest_tcp_client:start(Quiet,
 				       ?TRANSPORT_MOD,
-                                       Active, Addr, Port,
+                                       ServerInfo, Active,
                                        MsgID, MaxOutstanding, RunTime).
 
 stop(Pid) ->
diff --git a/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl b/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl
index acf2556793..5b2a494ba0 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl
@@ -21,30 +21,64 @@
 -module(socket_test_ttest_tcp_client_socket).
 
 -export([
-         start/4, start/5, start/7, start/8,
+         start/3, start/4, start/6, start/7,
          stop/1
         ]).
 
 -define(TRANSPORT_MOD, socket_test_ttest_tcp_socket).
--define(MOD(M),        {?TRANSPORT_MOD, #{method => Method}}).
+-define(MOD(D, M),     {?TRANSPORT_MOD, #{domain => D, method => M}}).
 
-start(Method, Active, Addr, Port) ->
-    socket_test_ttest_tcp_client:start_monitor(?MOD(Method), Active, Addr, Port).
+start(Method, ServerInfo = {Addr, _}, Active)
+  when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
+    Domain = inet,
+    socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Method),
+                                               ServerInfo, Active);
+start(Method, ServerInfo = {Addr, _}, Active)
+  when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
+    Domain = inet6,
+    socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Method),
+                                               ServerInfo, Active).
 
-start(Method, Active, Addr, Port, MsgID) ->
-    socket_test_ttest_tcp_client:start(?MOD(Method),
-                                       Active, Addr, Port, MsgID).
+start(Method, ServerInfo = {Addr, _}, Active, MsgID)
+  when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
+    %% This is just a simplification
+    Domain = inet,
+    socket_test_ttest_tcp_client:start(?MOD(Domain, Method),
+                                       ServerInfo, Active, MsgID);
+start(Method, ServerInfo = {Addr, _}, Active, MsgID)
+  when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
+    Domain = inet6,
+    socket_test_ttest_tcp_client:start(?MOD(Domain, Method),
+                                       ServerInfo, Active, MsgID).
 
-start(Method, Active, Addr, Port, MsgID, MaxOutstanding, RunTime) ->
+start(Method, ServerInfo = {Addr, _}, Active, MsgID, MaxOutstanding, RunTime)
+  when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
+    Domain = inet,
     socket_test_ttest_tcp_client:start(false,
-				       ?MOD(Method),
-                                       Active, Addr, Port,
+				       ?MOD(Domain, Method),
+                                       ServerInfo, Active,
+                                       MsgID, MaxOutstanding, RunTime);
+start(Method, ServerInfo = {Addr, _}, Active, MsgID, MaxOutstanding, RunTime)
+  when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
+    Domain = inet6,
+    socket_test_ttest_tcp_client:start(false,
+				       ?MOD(Domain, Method),
+                                       ServerInfo, Active,
                                        MsgID, MaxOutstanding, RunTime).
 
-start(Quiet, Method, Active, Addr, Port, MsgID, MaxOutstanding, RunTime) ->
+start(Quiet, Method, ServerInfo = {Addr, _}, Active, MsgID, MaxOutstanding, RunTime)
+  when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
+    Domain = inet,
+    socket_test_ttest_tcp_client:start(Quiet,
+				       ?MOD(Domain, Method),
+                                       ServerInfo, Active,
+                                       MsgID, MaxOutstanding, RunTime);
+start(Quiet, Method, ServerInfo = {Addr, _}, Active, MsgID, MaxOutstanding, RunTime)
+  when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
+    Domain = inet6,
     socket_test_ttest_tcp_client:start(Quiet,
-				       ?MOD(Method),
-                                       Active, Addr, Port,
+				       ?MOD(Domain, Method),
+                                       ServerInfo, Active,
                                        MsgID, MaxOutstanding, RunTime).
 
 stop(Pid) ->
diff --git a/erts/emulator/test/socket_test_ttest_tcp_gen.erl b/erts/emulator/test/socket_test_ttest_tcp_gen.erl
index 16e7ccf66b..05b250e3d9 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_gen.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_gen.erl
@@ -26,7 +26,7 @@
 	 close/1,
 	 connect/2, connect/3,
 	 controlling_process/2,
-	 listen/0, listen/1,
+	 listen/0, listen/1, listen/2,
 	 peername/1,
 	 port/1,
 	 recv/2, recv/3,
@@ -102,8 +102,12 @@ controlling_process(Sock, NewPid) ->
 listen() ->
     listen(0).
 
-listen(Port) when is_integer(Port) andalso (Port >= 0) ->
-    Opts = [binary, {ip, {0,0,0,0}}, {packet, raw}, {active, false},
+listen(Port) ->
+    listen(Port, #{domain => inet}).
+
+listen(Port, #{domain := Domain}) when is_integer(Port) andalso (Port >= 0) ->
+    Opts = [Domain,
+            binary, {ip, {0,0,0,0}}, {packet, raw}, {active, false},
             {buffer, 32*1024}],
     case gen_tcp:listen(Port, Opts) of
 	{ok, Sock} ->
diff --git a/erts/emulator/test/socket_test_ttest_tcp_server.erl b/erts/emulator/test/socket_test_ttest_tcp_server.erl
index acb940e9cd..cceaf0d0fc 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_server.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_server.erl
@@ -296,28 +296,26 @@ server_handle_handler_down(Pid,
     AccMCnt2    = AccMCnt + MCnt,
     AccBCnt2    = AccBCnt + BCnt,
     AccHCnt2    = AccHCnt + 1,
-    ?I("handler ~p (~w) done => accumulated results: "
-       "~n   Run Time:      ~s ms"
+    MsgCount2Str =
+        fun(RT, ART, MC, AMC) when (RT > 0) ->
+                ?F("~w => ~w (~w) msgs / ms", [MC, MC div RT, AMC div ART]);
+           (_, _, MC, AMC) ->
+                ?F("~w (~w)", [MC, AMC])
+        end,
+    ByteCount2Str =
+        fun(RT, ART, BC, ABC) when (RT > 0) ->
+                ?F("~w => ~w (~w) bytes / ms", [BC, BC div RT, ABC div ART]);
+           (_, _, BC, ABC) ->
+                ?F("~w", [BC, ABC])
+        end,
+    ?I("handler ~p (~w) done: "
+       "~n   Run Time:      ~s"
        "~n   Message Count: ~s"
        "~n   Byte Count:    ~s",
        [Pid, AccHCnt2,
-        ?FORMAT_TIME(AccRunTime2),
-        if (AccRunTime2 > 0) ->
-                ?F("~w => ~w (~w) msgs / ms", 
-                   [AccMCnt2,
-                    AccMCnt2 div AccRunTime2,
-                    (AccMCnt2 div AccHCnt2) div AccRunTime2]);
-           true ->
-                ?F("~w", [AccMCnt2])
-        end,
-        if (AccRunTime2 > 0) ->
-                ?F("~w => ~w (~w) bytes / ms",
-                   [AccBCnt2,
-                    AccBCnt2 div AccRunTime2,
-                    (AccBCnt2 div AccHCnt2) div AccRunTime2]);
-           true ->
-                ?F("~w", [AccBCnt2])
-        end]),
+        ?FORMAT_TIME(RunTime),
+        MsgCount2Str(RunTime, AccRunTime2, MCnt, AccMCnt2),
+        ByteCount2Str(RunTime, AccRunTime2, BCnt, AccBCnt2)]),
     State#{runtime => AccRunTime2,
 	   mcnt    => AccMCnt2,
 	   bcnt    => AccBCnt2,
diff --git a/erts/emulator/test/socket_test_ttest_tcp_server_gen.erl b/erts/emulator/test/socket_test_ttest_tcp_server_gen.erl
index b1b31f5158..fdf40f1369 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_server_gen.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_server_gen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2018-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2018-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,20 +21,18 @@
 -module(socket_test_ttest_tcp_server_gen).
 
 -export([
-         start/1,
+         start/1, start/2,
          stop/1
         ]).
 
 -define(TRANSPORT_MOD, socket_test_ttest_tcp_gen).
+-define(MOD(D),        {?TRANSPORT_MOD, #{domain => D}}).
 
 start(Active) ->
-    socket_test_ttest_tcp_server:start(?TRANSPORT_MOD, Active).
-    %%     {ok, {Pid, AddrPort}} ->
-    %%         MRef = erlang:monitor(process, Pid),
-    %%         {ok, {Pid, MRef, AddrPort}};
-    %%     {error, _} = ERROR ->
-    %%         ERROR
-    %% end.
+    start(inet, Active).
+
+start(Domain, Active) ->
+    socket_test_ttest_tcp_server:start(?MOD(Domain), Active).
             
 
 stop(Pid) ->
diff --git a/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl b/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl
index b7ea1e8e93..d1de230637 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2018-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2018-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -21,23 +21,18 @@
 -module(socket_test_ttest_tcp_server_socket).
 
 -export([
-         start/2,
+         start/3,
          stop/1
         ]).
 
 -define(TRANSPORT_MOD, socket_test_ttest_tcp_socket).
-%% -define(MOD(M),        {?TRANSPORT_MOD, #{method         => M,
+%% -define(MOD(D, M),     {?TRANSPORT_MOD, #{domain         => D,
+%%                                           method         => M,
 %%                                           stats_interval => 10000}}).
--define(MOD(M),        {?TRANSPORT_MOD, #{method => M}}).
+-define(MOD(D, M),     {?TRANSPORT_MOD, #{domain => D, method => M}}).
 
-start(Method, Active) ->
-    socket_test_ttest_tcp_server:start(?MOD(Method), Active).
-    %%     {ok, {Pid, AddrPort}} ->
-    %%         MRef = erlang:monitor(process, Pid),
-    %%         {ok, {Pid, MRef, AddrPort}};
-    %%     {error, _} = ERROR ->
-    %%         ERROR
-    %% end.
+start(Method, Domain, Active) ->
+    socket_test_ttest_tcp_server:start(?MOD(Domain, Method), Active).
 
 stop(Pid) ->
     socket_test_ttest_tcp_server:stop(Pid).