Merge branch 'bmk/kernel/20220427/gen_tcp_socket_shutdown_24.3.3/OTP-18080' into maint-24

* bmk/kernel/20220427/gen_tcp_socket_shutdown_24.3.3/OTP-18080:
  [kernel|gen-tcp|test] Tweaked shutdown (api) test case(s)
  [kernel|gen-tcp-socket] Changed the behaviour of shutdown
  [erts|esock] Add caller pid to the initial debug printout for close

Author: Erlang/OTP

erts/emulator/nifs/common/prim_socket_nif.c

@@ -9164,7 +9164,7 @@ ERL_NIF_TERM nif_close(ErlNifEnv*         env,
     return enif_raise_exception(env, MKA(env, "notsup"));
 #else
     ESockDescriptor* descP;
-    ERL_NIF_TERM res;
+    ERL_NIF_TERM     res;
 
     ESOCK_ASSERT( argc == 1 );
 
@@ -9178,8 +9178,16 @@ ERL_NIF_TERM nif_close(ErlNifEnv*         env,
     MLOCK(descP->writeMtx);
 
     SSDBG( descP,
-           ("SOCKET", "nif_close(%T), {%d,0x%X}\r\n",
-            argv[0], descP->sock, descP->readState) );
+           ("SOCKET", "nif_close(%T) ->"
+            "\r\n      Socket:      %d"
+            "\r\n      Read State:  0x%X"
+            "\r\n      Write State: 0x%X"
+            "\r\n      Caller:      %T"
+            "\r\n",
+            argv[0],
+            descP->sock,
+            descP->readState, descP->writeState,
+            esock_self(env)) );
 
     res = esock_close(env, descP);
 

lib/kernel/src/gen_tcp_socket.erl

@@ -1718,9 +1718,19 @@ handle_event(Type, Content, State, P_D) ->
 %% Event handler helpers
 
 
-%% We only accept/perform shutdown when socket is 'connected'.
+%% We only accept/perform shutdown when socket is 'connected'
+%% We only accept/perform shutdown when socket is 'connected'
+%% (or closed_read | closed_write).
 %% This is done to be "compatible" with the inet-driver!
 
+handle_shutdown(#params{socket = Socket},
+                closed_write = _State,
+                read = How) ->
+    handle_shutdown2(Socket, closed_read_write, How);
+handle_shutdown(#params{socket = Socket},
+                closed_read = _State,
+                write = How) ->
+    handle_shutdown2(Socket, closed_read_write, How);
 handle_shutdown(#params{socket = Socket},
                 connected = _State,
                 write = How) ->

lib/kernel/test/gen_tcp_api_SUITE.erl

@@ -437,25 +437,45 @@ do_recv_delim(Config) ->
 %%% gen_tcp:shutdown/2
 
 t_shutdown_write(Config) when is_list(Config) ->
+    ?P("create listen socket"),
     {ok, L} = gen_tcp:listen(0, ?INET_BACKEND_OPTS(Config)),
     {ok, Port} = inet:port(L),
-    {ok, Client} = gen_tcp:connect(localhost, Port,
-                                   ?INET_BACKEND_OPTS(Config) ++
-                                       [{active, false}]),
+    ?P("create connect socket (C)"),
+    {ok, C} = gen_tcp:connect(localhost, Port,
+                              ?INET_BACKEND_OPTS(Config) ++
+                                  [{active, false}]),
+    ?P("create accept socket (A)"),
     {ok, A} = gen_tcp:accept(L),
+    ?P("send message A -> C"),
+    ok = gen_tcp:send(A, "Hej Client"),
+    ?P("socket A shutdown(write)"),
     ok = gen_tcp:shutdown(A, write),
-    {error, closed} = gen_tcp:recv(Client, 0),
+    ?P("socket C recv - expect message"),
+    {ok, "Hej Client"} = gen_tcp:recv(C, 0),
+    ?P("socket C recv - expect closed"),
+    {error, closed} = gen_tcp:recv(C, 0),
+    ?P("done"),
     ok.
 
 t_shutdown_both(Config) when is_list(Config) ->
+    ?P("create listen socket"),
     {ok, L} = gen_tcp:listen(0, ?INET_BACKEND_OPTS(Config)),
     {ok, Port} = inet:port(L),
-    {ok, Client} = gen_tcp:connect(localhost, Port,
-                                   ?INET_BACKEND_OPTS(Config) ++
-                                       [{active, false}]),
+    ?P("create connect socket (C)"),
+    {ok, C} = gen_tcp:connect(localhost, Port,
+                              ?INET_BACKEND_OPTS(Config) ++
+                                  [{active, false}]),
+    ?P("create accept socket (A)"),
     {ok, A} = gen_tcp:accept(L),
+    ?P("send message A -> C"),
+    ok = gen_tcp:send(A, "Hej Client"),
+    ?P("socket A shutdown(read_write)"),
     ok = gen_tcp:shutdown(A, read_write),
-    {error, closed} = gen_tcp:recv(Client, 0),
+    ?P("socket C recv - expect message"),
+    {ok, "Hej Client"} = gen_tcp:recv(C, 0),
+    ?P("socket C recv - expect closed"),
+    {error, closed} = gen_tcp:recv(C, 0),
+    ?P("done"),
     ok.
 
 t_shutdown_error(Config) when is_list(Config) ->