Merge branch 'bmk/erts/esock/20190529/expose_select_to_the_caller/OTP-15731' into maint

2 files changed, 39 insertions, 7 deletions

diff --git a/erts/emulator/test/esock_ttest/esock-ttest b/erts/emulator/test/esock_ttest/esock-ttest
index cf1d9cd9ab..9adc51fc8b 100755
--- a/erts/emulator/test/esock_ttest/esock-ttest
+++ b/erts/emulator/test/esock_ttest/esock-ttest
@@ -60,6 +60,9 @@ usage() ->
               "~n                                  Which domain to use."
               "~n                                  Only valid for server."
               "~n                                  Defaults to: inet"
+              "~n     --async                      Asynchronous mode (Timeout = nowait)"
+              "~n                                  This option is only valid for transport = sock."
+              "~n                                  Also, its only used when active =/= false."
               "~n     --active <active>            boolean() | once."
               "~n                                  Valid for both client and server."
               "~n                                  Defaults to: false"
@@ -111,6 +114,7 @@ process_args(Args) ->
 process_server_args(Args) ->
     Defaults = #{role      => server,
                  domain    => inet,
+                 async     => false,
                  active    => false,
                  transport => {sock, plain}},
     process_server_args(Args, Defaults).
@@ -124,6 +128,9 @@ process_server_args(["--domain", Domain|Args], State)
         (Domain =:= "inet6")) ->
     process_server_args(Args, State#{domain => list_to_atom(Domain)});
 
+process_server_args(["--async"|Args], State) ->
+    process_server_args(Args, State#{async => true});
+
 process_server_args(["--active", Active|Args], State) 
   when ((Active =:= "false") orelse
         (Active =:= "once") orelse
@@ -145,6 +152,7 @@ process_server_args([Arg|_], _State) ->
 
 process_client_args(Args) ->
     Defaults = #{role            => client,
+                 async           => false,
                  active          => false,
                  transport       => {sock, plain},
                  %% Will cause error if not provided
@@ -159,10 +167,13 @@ process_client_args(Args) ->
 process_client_args([], State) ->
     process_client_args_ensure_max_outstanding(State);
 
+process_client_args(["--async"|Args], State) ->
+    process_client_args(Args, State#{async => true});
+
 process_client_args(["--active", Active|Args], State) 
-  when ((Active =:= "false") orelse
-        (Active =:= "once") orelse
-        (Active =:= "true")) ->
+  when (Active =:= "false") orelse
+       (Active =:= "once") orelse
+       (Active =:= "true") ->
     process_client_args(Args, State#{active => list_to_atom(Active)});
 
 process_client_args(["--transport", "gen" | Args], State) ->
@@ -280,9 +291,10 @@ exec(#{role      := server,
     end;
 exec(#{role      := server,
        domain    := Domain,
+       async     := Async,
        active    := Active,
        transport := {sock, Method}}) ->
-    case socket_test_ttest_tcp_server_socket:start(Method, Domain, Active) of
+    case socket_test_ttest_tcp_server_socket:start(Method, Domain, Async, Active) of
         {ok, {Pid, _}} ->
             MRef = erlang:monitor(process, Pid),
             receive
@@ -323,12 +335,14 @@ exec(#{role            := client,
     end;
 exec(#{role            := client,
        server          := ServerInfo,
+       async           := Async,
        active          := Active,
        transport       := {sock, Method},
        msg_id          := MsgID,
        max_outstanding := MaxOutstanding,
        runtime         := RunTime}) ->
     case socket_test_ttest_tcp_client_socket:start(true,
+                                                   Async,
                                                    Method,
                                                    ServerInfo,
                                                    Active,
diff --git a/erts/emulator/test/esock_ttest/esock-ttest-server-sock b/erts/emulator/test/esock_ttest/esock-ttest-server-sock
index 4ec0d335d9..fc87499f09 100755
--- a/erts/emulator/test/esock_ttest/esock-ttest-server-sock
+++ b/erts/emulator/test/esock_ttest/esock-ttest-server-sock
@@ -24,9 +24,27 @@ EMU=$ERL_TOP/erts/emulator
 EMU_TEST=$EMU/test
 ESOCK_TTEST=$EMU_TEST/esock_ttest
 
-if [ $# = 1 ]; then
-    ACTIVE="--active $1"
+# $1 - async  - boolean()
+# $2 - active - once | boolean()
+if [ $# = 2 ]; then
+
+    async=$1
+    active=$2
+
+    if [ $async = true ]; then
+	ASYNC="--async"
+    else
+	ASYNC=
+    fi
+
+    ACTIVE="--active $active"
+
+else
+    echo "<ERROR> Missing args: async and active"
+    echo ""
+    exit 1
 fi
 
-$ESOCK_TTEST/esock-ttest --server --transport sock $ACTIVE
+
+$ESOCK_TTEST/esock-ttest --server $ASYNC --transport sock $ACTIVE