From 0eb29c0eebd4e58f294005dbe355e270208756d9 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 23 May 2019 15:14:29 +0200
Subject: [esock|ttest] Make it possible use local for ttest

Make Unix Domain (stream) socket work with the ttest
command line tool (for esock server and client).

OTP-15822
---
 erts/emulator/test/esock_ttest/esock-ttest         | 100 ++++++++++++---------
 erts/emulator/test/esock_ttest/esock-ttest-client  |  63 +++++++------
 .../test/socket_test_ttest_tcp_client_socket.erl   |  25 ++++++
 .../emulator/test/socket_test_ttest_tcp_server.erl |  15 ++--
 .../emulator/test/socket_test_ttest_tcp_socket.erl |  28 +++---
 5 files changed, 141 insertions(+), 90 deletions(-)

diff --git a/erts/emulator/test/esock_ttest/esock-ttest b/erts/emulator/test/esock_ttest/esock-ttest
index c48201da7c..cf1d9cd9ab 100755
--- a/erts/emulator/test/esock_ttest/esock-ttest
+++ b/erts/emulator/test/esock_ttest/esock-ttest
@@ -50,43 +50,47 @@ usage() ->
               "~n   units (server or client)."
               "~n"
               "~n   options: "
-              "~n     --help                    Display this info and exit. "
-              "~n     --server [server-options] Start a server. "
-              "~n                               There are no mandatory server options."
-              "~n     --client client-options   Start a client"
-              "~n                               Some client options are mandatory and"
-              "~n                               others optional."
-              "~n     --active <active>         boolean() | once."
-              "~n                               Valid for both client and server."
-              "~n                               Defaults to: false"
-              "~n     --transport <transport>   Which transport to use: gen|sock[:plain|msg]"
-              "~n                                 gen:  gen_tcp"
-              "~n                                 sock: socket"
-              "~n                                       plain: recv/send (default)"
-              "~n                                       msg:   recvmsg/sendmsg"
-              "~n                               Defaults to: sock:plain"
-              "~n     --scon <addr>:<port>      Address and port of the server."
-              "~n                               The address part is in the standard form:"
-              "~n                               \"a.b.c.d\"."
-              "~n                               Only valid for client."
-              "~n                               Mandatory."
-              "~n     --msg-id <1|2|3>          Choose which message to use during the test."
-              "~n                               Basically: "
-              "~n                                  1: small"
-              "~n                                  2: medium"
-              "~n                                  3: large"
-              "~n                               Defaults to: 1"
-              "~n     --max-outstanding <Num>   How many messages to send before waiting for"
-              "~n                               a reply."
-              "~n                               Valid only for client."
-              "~n                               Defaults to: "
-              "~n                                  MsgID 1: 100"
-              "~n                                  MsgID 2:  10"
-              "~n                                  MsgID 3:   1"
-              "~n     --runtime <Time>          Time of the test in seconds."
-              "~n                               Only valid for client."
-              "~n                               Mandatory."
-              "~n                               Defaults to: 60 (seconds)"
+              "~n     --help                       Display this info and exit. "
+              "~n     --server [server-options]    Start a server. "
+              "~n                                  There are no mandatory server options."
+              "~n     --client client-options      Start a client"
+              "~n                                  Some client options are mandatory and"
+              "~n                                  others optional."
+              "~n     --domain <domain>            local | inet | inet6"
+              "~n                                  Which domain to use."
+              "~n                                  Only valid for server."
+              "~n                                  Defaults to: inet"
+              "~n     --active <active>            boolean() | once."
+              "~n                                  Valid for both client and server."
+              "~n                                  Defaults to: false"
+              "~n     --transport <transport>      Which transport to use: gen|sock[:plain|msg]"
+              "~n                                     gen:  gen_tcp"
+              "~n                                     sock: socket"
+              "~n                                          plain: recv/send (default)"
+              "~n                                          msg:   recvmsg/sendmsg"
+              "~n                                  Defaults to: sock:plain"
+              "~n     --scon <addr>:<port>|<path>  Server info."
+              "~n                                  The address part is in the standard form:"
+              "~n                                       \"a.b.c.d\"."
+              "~n                                  <path> is used for Unix Domain sockets (local)."
+              "~n                                  Only valid, and mandatory, for client."
+              "~n     --msg-id <1|2|3>             Choose which message to use during the test."
+              "~n                                  Basically: "
+              "~n                                     1: small"
+              "~n                                     2: medium"
+              "~n                                     3: large"
+              "~n                                  Defaults to: 1"
+              "~n     --max-outstanding <Num>      How many messages to send before waiting for"
+              "~n                                  a reply."
+              "~n                                  Valid only for client."
+              "~n                                  Defaults to: "
+              "~n                                     MsgID 1: 100"
+              "~n                                     MsgID 2:  10"
+              "~n                                     MsgID 3:   1"
+              "~n     --runtime <Time>             Time of the test in seconds."
+              "~n                                  Only valid for client."
+              "~n                                  Mandatory."
+              "~n                                  Defaults to: 60 (seconds)"
               "~n"
               "~n"
               "~n", 
@@ -106,6 +110,7 @@ process_args(Args) ->
 
 process_server_args(Args) ->
     Defaults = #{role      => server,
+                 domain    => inet,
                  active    => false,
                  transport => {sock, plain}},
     process_server_args(Args, Defaults).
@@ -113,6 +118,12 @@ process_server_args(Args) ->
 process_server_args([], State) ->
     State;
 
+process_server_args(["--domain", Domain|Args], State) 
+  when ((Domain =:= "local") orelse
+        (Domain =:= "inet") orelse
+        (Domain =:= "inet6")) ->
+    process_server_args(Args, State#{domain => list_to_atom(Domain)});
+
 process_server_args(["--active", Active|Args], State) 
   when ((Active =:= "false") orelse
         (Active =:= "once") orelse
@@ -137,7 +148,7 @@ process_client_args(Args) ->
                  active          => false,
                  transport       => {sock, plain},
                  %% Will cause error if not provided
-                 %% Should be "addr:port"
+                 %% Should be "addr:port or string()
                  server          => undefined,
                  msg_id          => 1,
                  %% Will be filled in based on msg_id if not provided
@@ -199,6 +210,8 @@ process_client_args(["--scon", Server|Args], State) ->
                            usage(f("Invalid Server Port: ~s", [PortStr]))
                    end,
             process_client_args(Args, State#{server => {Addr, Port}});
+        [Path] ->
+            process_client_args(Args, State#{server => Path});
         _ ->
             usage(f("Invalid Server: ~s", [Server]))
     end;
@@ -249,9 +262,11 @@ process_client_args_ensure_max_outstanding(
 %% ==========================================================================
 
 exec(#{role      := server,
+       domain    := Domain,
        active    := Active,
-       transport := gen}) ->
-    case socket_test_ttest_tcp_server_gen:start(Active) of
+       transport := gen})
+  when (Domain =:= inet) orelse (Domain =:= inet6) ->
+    case socket_test_ttest_tcp_server_gen:start(Domain, Active) of
         {ok, {Pid, _}} ->
             MRef = erlang:monitor(process, Pid),
             receive
@@ -264,9 +279,10 @@ exec(#{role      := server,
             error
     end;
 exec(#{role      := server,
+       domain    := Domain,
        active    := Active,
        transport := {sock, Method}}) ->
-    case socket_test_ttest_tcp_server_socket:start(Method, inet, Active) of
+    case socket_test_ttest_tcp_server_socket:start(Method, Domain, Active) of
         {ok, {Pid, _}} ->
             MRef = erlang:monitor(process, Pid),
             receive
@@ -306,7 +322,7 @@ exec(#{role            := client,
             error
     end;
 exec(#{role            := client,
-       server          := {_Addr, _Port} = ServerInfo,
+       server          := ServerInfo,
        active          := Active,
        transport       := {sock, Method},
        msg_id          := MsgID,
diff --git a/erts/emulator/test/esock_ttest/esock-ttest-client b/erts/emulator/test/esock_ttest/esock-ttest-client
index 1ab56f2d44..7c90ae6391 100755
--- a/erts/emulator/test/esock_ttest/esock-ttest-client
+++ b/erts/emulator/test/esock_ttest/esock-ttest-client
@@ -26,33 +26,46 @@ ESOCK_TTEST=$EMU_TEST/esock_ttest
 
 RUNTIME=30
 
-MSGID=$1
-SERVER_ADDR=$2
-SERVER_PORT=$3
+if [ $# = 3 ]; then
+    MSGID=$1
+    SERVER_INFO=$2:$3
+
+    ITERATIONS="\
+       gen  false  $MSGID
+       gen  true   $MSGID
+       gen  once   $MSGID
+       sock false  $MSGID
+       sock true   $MSGID
+       sock once   $MSGID"
+
+else
+    if [ $# = 2 ]; then
+	MSGID=$1
+	SERVER_INFO=$2
+
+	ITERATIONS="\
+           sock false  $MSGID
+           sock true   $MSGID
+           sock once   $MSGID"
+
+    else
+	echo "Invalid number of args"
+	exit 1;
+    fi
+fi
+
 
 # ---------------------------------------------------------------------------
 
-ITERATIONS="\
-    gen  false  $MSGID
-    gen  true   $MSGID
-    gen  once   $MSGID
-    sock false  $MSGID
-    sock true   $MSGID
-    sock once   $MSGID"
-
-#     gen  false  2
-#     gen  true   2
-#     gen  once   2
-#     sock false  2
-#     sock true   2
-#     sock once   2
-#     gen  false  3
-#     gen  true   3
-#     gen  once   3
-#     sock false  3
-#     sock true   3
-#     sock once   3
-# 
+# For when we have figured out how to configure local for gen_tcp...
+
+#ITERATIONS="\
+#   gen  false  $MSGID
+#   gen  true   $MSGID
+#   gen  once   $MSGID
+#   sock false  $MSGID
+#   sock true   $MSGID
+#   sock once   $MSGID"
 
 # ---------------------------------------------------------------------------
 
@@ -64,7 +77,7 @@ echo "$ITERATIONS" |
       # The /dev/null at the end is necessary because erlang "does things" with stdin
       # and this case would cause the 'while read' to "fail" so that we only would
       # loop one time
-      $ESOCK_TTEST/esock-ttest --client --transport $TRANSPORT --active $ACTIVE --msg-id $MSG_ID --scon $SERVER_ADDR:$SERVER_PORT --runtime $RUNTIME </dev/null
+      $ESOCK_TTEST/esock-ttest --client --transport $TRANSPORT --active $ACTIVE --msg-id $MSG_ID --scon $SERVER_INFO --runtime $RUNTIME </dev/null
       echo ""
 
   done
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 5b2a494ba0..ccace2a560 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl
@@ -28,6 +28,11 @@
 -define(TRANSPORT_MOD, socket_test_ttest_tcp_socket).
 -define(MOD(D, M),     {?TRANSPORT_MOD, #{domain => D, method => M}}).
 
+start(Method, ServerInfo, Active)
+  when is_list(ServerInfo) ->
+    Domain = local,
+    socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Method),
+                                               ServerInfo, Active);
 start(Method, ServerInfo = {Addr, _}, Active)
   when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
     Domain = inet,
@@ -39,6 +44,12 @@ start(Method, ServerInfo = {Addr, _}, Active)
     socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Method),
                                                ServerInfo, Active).
 
+start(Method, ServerInfo, Active, MsgID)
+  when is_list(ServerInfo) ->
+    %% This is just a simplification
+    Domain = local,
+    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) =:= 4) ->
     %% This is just a simplification
@@ -51,6 +62,13 @@ start(Method, ServerInfo = {Addr, _}, Active, MsgID)
     socket_test_ttest_tcp_client:start(?MOD(Domain, Method),
                                        ServerInfo, Active, MsgID).
 
+start(Method, ServerInfo, Active, MsgID, MaxOutstanding, RunTime)
+  when is_list(ServerInfo) ->
+    Domain = local,
+    socket_test_ttest_tcp_client:start(false,
+				       ?MOD(Domain, Method),
+                                       ServerInfo, Active,
+                                       MsgID, MaxOutstanding, RunTime);
 start(Method, ServerInfo = {Addr, _}, Active, MsgID, MaxOutstanding, RunTime)
   when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
     Domain = inet,
@@ -66,6 +84,13 @@ start(Method, ServerInfo = {Addr, _}, Active, MsgID, MaxOutstanding, RunTime)
                                        ServerInfo, Active,
                                        MsgID, MaxOutstanding, RunTime).
 
+start(Quiet, Method, ServerInfo, Active, MsgID, MaxOutstanding, RunTime)
+  when is_list(ServerInfo) ->
+    Domain = local,
+    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) =:= 4) ->
     Domain = inet,
diff --git a/erts/emulator/test/socket_test_ttest_tcp_server.erl b/erts/emulator/test/socket_test_ttest_tcp_server.erl
index cceaf0d0fc..e916fcb93e 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_server.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_server.erl
@@ -206,22 +206,15 @@ server_accept(#{mod      := Mod,
                 {error, CPReason} ->
 		    (catch Mod:close(Sock)),
 		    (catch Mod:close(LSock)),
-                    maybe_unlink(maps:get(port_or_path, State)),
                     exit({controlling_process, CPReason})
             end;
         {error, timeout} ->
             State;
         {error, AReason} ->
 	    (catch Mod:close(LSock)),
-            maybe_unlink(maps:get(port_or_path, State)),
             exit({accept, AReason})
     end.
 
-maybe_unlink(Path) when is_list(Path) ->
-    os:cmd("unlink " ++ Path);
-maybe_unlink(_) ->
-    ok.
-
 format_peername({Addr, Port}) ->
     case inet:gethostbyaddr(Addr) of
         {ok, #hostent{h_name = N}} ->
@@ -241,7 +234,10 @@ maybe_start_stats_timer(_, _) ->
 start_stats_timer(Time, ProcStr, Pid) ->
     erlang:start_timer(Time, self(), {stats, Time, ProcStr, Pid}).
 
-server_handle_message(#{parent := Parent, handlers := H} = State) ->
+server_handle_message(#{mod      := Mod,
+                        lsock    := LSock,
+                        parent   := Parent,
+                        handlers := H} = State) ->
     receive
         {timeout, _TRef, {stats, Interval, ProcStr, Pid}} ->
             case server_handle_stats(ProcStr, Pid) of
@@ -255,8 +251,7 @@ server_handle_message(#{parent := Parent, handlers := H} = State) ->
         {?MODULE, Ref, Parent, stop} ->
             reply(Parent, Ref, ok),
             lists:foreach(fun(P) -> handler_stop(P) end, H),
-            (catch socket:close(maps:get(lsock, State))),
-             maybe_unlink(maps:get(port_or_path, State)),
+            (catch Mod:close(LSock)),
             exit(normal);
 
         {'DOWN', _MRef, process, Pid, Reason} -> 
diff --git a/erts/emulator/test/socket_test_ttest_tcp_socket.erl b/erts/emulator/test/socket_test_ttest_tcp_socket.erl
index 8df1cdfad3..cf68bfe591 100644
--- a/erts/emulator/test/socket_test_ttest_tcp_socket.erl
+++ b/erts/emulator/test/socket_test_ttest_tcp_socket.erl
@@ -111,14 +111,15 @@ close(#{sock := Sock, reader := Pid}) ->
 
 %% Create a socket and connect it to a peer
 connect(ServerPath) when is_list(ServerPath) ->
-    Domain   = local,
-    LocalSA  = #{family => Domain,
-                 path   => mk_unique_path()},
-    ServerSA = #{family => Domain, path => ServerPath},
-    Opts     = #{domain => Domain,
-                 proto  => default,
-                 method => plain},
-    Cleanup = fun() -> os:cmd("unlink " ++ ServerPath), ok end,
+    Domain     = local,
+    ClientPath = mk_unique_path(),
+    LocalSA    = #{family => Domain,
+                   path   => ClientPath},
+    ServerSA   = #{family => Domain, path => ServerPath},
+    Opts       = #{domain => Domain,
+                   proto  => default,
+                   method => plain},
+    Cleanup = fun() -> os:cmd("unlink " ++ ClientPath), ok end,
     do_connect(LocalSA, ServerSA, Cleanup, Opts).
 
 connect(Addr, Port) when is_tuple(Addr) andalso is_integer(Port) ->
@@ -135,11 +136,12 @@ connect(Addr, Port) when is_tuple(Addr) andalso is_integer(Port) ->
 connect(ServerPath,
         #{domain := local = Domain} = Opts)
   when is_list(ServerPath) ->
-    LocalSA  = #{family => Domain,
-                 path   => mk_unique_path()},
-    ServerSA = #{family => Domain,
-                 path   => ServerPath},
-    Cleanup  = fun() -> os:cmd("unlink " ++ ServerPath), ok end,
+    ClientPath = mk_unique_path(),
+    LocalSA    = #{family => Domain,
+                   path   => ClientPath},
+    ServerSA   = #{family => Domain,
+                   path   => ServerPath},
+    Cleanup    = fun() -> os:cmd("unlink " ++ ClientPath), ok end,
     do_connect(LocalSA, ServerSA, Cleanup, Opts#{proto => default}).
 
 connect(Addr, Port, #{domain := Domain} = Opts) ->
-- 
cgit v1.2.3