Merge branch 'bmk/esock/20250319/post_merge_fixup/OTP-19469'

bmk · bmk · commit 5187d4e3cf43 · 2025-03-24T18:10:08.000+01:00
diff --git a/erts/emulator/nifs/win32/win_socket_asyncio.c b/erts/emulator/nifs/win32/win_socket_asyncio.c
@@ -9433,10 +9433,32 @@ ERL_NIF_TERM esaio_completion_recv_partial_part(ErlNifEnv*       env,
                                                 ssize_t          read,
                                                 DWORD            flags)
 {
-    /* This is just a "placeholder". Is this really all we need to do? */
-    return esaio_completion_recv_partial_done(env, descP,
-                                              opEnv, opDataP,
-                                              read, flags);
+    ERL_NIF_TERM sockRef = opDataP->sockRef;
+    ERL_NIF_TERM data;
+
+    ESOCK_CNT_INC(env, descP, sockRef,
+                  esock_atom_read_pkg, &descP->readPkgCnt, 1);
+    ESOCK_CNT_INC(env, descP, sockRef,
+                  esock_atom_read_byte, &descP->readByteCnt, read);
+
+    if (read > descP->readPkgMax)
+        descP->readPkgMax = read;
+
+    /* This transfers "ownership" of the *allocated* binary to an
+     * erlang term (no need for an explicit free).
+     */
+    data = MKBIN(opEnv, &opDataP->buf);
+    data = MKSBIN(opEnv, data, 0, read);
+
+    (void) flags;
+
+    SSDBG( descP,
+           ("WIN-ESAIO",
+            "esaio_completion_recv_partial_part(%T) {%d} -> done\r\n",
+            sockRef, descP->sock) );
+
+    return MKT2(env, esock_atom_more, data);
+
 }
 
 
diff --git a/lib/kernel/src/gen_tcp_socket.erl b/lib/kernel/src/gen_tcp_socket.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2019-2024. All Rights Reserved.
+%% Copyright Ericsson AB 2019-2025. 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.
@@ -60,6 +60,9 @@
 %% -define(DBG(T),
 %% 	erlang:display({{self(), ?MODULE, ?LINE, ?FUNCTION_NAME}, T})).
 
+%% -define(P(F),    ?P(F, [])).
+%% -define(P(F, A), d("~w:~w(~w) -> " ++ F, [?MODULE, ?FUNCTION_NAME, ?LINE | A])).
+
 
 %% -------------------------------------------------------------------------
 
@@ -879,20 +882,23 @@ socket_sendv(Socket, Data, Timeout) ->
 end.
 
 -compile({inline, [socket_send_error/1]}).
-socket_send_error(Result) ->
-    case Result of
-        {error, epipe}                          -> {error, econnreset};
-        {error, Reason} when is_atom(Reason)    -> Result;
-        {error, #{info := Reason}} ->
-            case Reason of
-                netname_deleted ->
-                    {error, econnreset};
-                too_many_cmds ->
-                    {error, closed};
-                _ ->
-                    Result
-            end
-    end.
+socket_send_error({error, Reason}) ->
+    {error, socket_send_reason(Reason)}.
+
+-compile({inline, [socket_send_reason/1]}).
+socket_send_reason({completion_status, CS}) ->
+    socket_send_reason(CS);
+socket_send_reason(#{info := Info}) ->
+    socket_send_reason(Info);
+socket_send_reason(epipe) ->
+    econnreset;
+socket_send_reason(netname_deleted) ->
+    econnreset;
+socket_send_reason(too_many_cmds) ->
+    closed;
+socket_send_reason(Reason) ->
+    Reason.
+
 
 
 -compile({inline, [socket_recv/2]}).
@@ -2042,7 +2048,7 @@ handle_event(
   #recv{info = ?completion_info(CompletionRef)} = _State,
   {#params{socket = Socket} = P, D}) ->
     %% ?DBG(['abort msg', {reason, Reason}]),
-    handle_recv_error(P, D, [], completion_status_reason(Reason));
+    handle_recv_error(P, D, [], Reason);
 
 handle_event(
   {timeout, recv}, recv, #recv{info = Info},
@@ -2312,6 +2318,10 @@ handle_recv(P, #{buffer := Buffer} = D, ActionsR, CS) ->
             handle_recv(
               P, D, ActionsR, buffer(Data, Buffer),
               BufferSize + byte_size(Data), recv);
+        {more, <<Data/binary>>} ->
+            handle_recv(
+              P, D, ActionsR, buffer(Data, Buffer),
+              BufferSize + byte_size(Data), recv);
         {error, {Reason, <<Data/binary>>}} ->
             handle_recv(
               P, D, ActionsR, buffer(Data, Buffer),
@@ -2670,14 +2680,22 @@ handle_send_error(#params{socket = Socket} = P, D_0, State, From, Reason) ->
     end.
 
 %% -> CuratedReason
+curated_error_reason(D, {completion_status, CS}) ->
+    curated_error_reason(D, CS);
+curated_error_reason(D, #{info := Info}) ->
+    curated_error_reason(D, Info);
 curated_error_reason(D, Reason) ->
     if
         Reason =:= econnreset;
-        Reason =:= econnaborted ->
+        Reason =:= econnaborted;
+	Reason =:= netname_deleted;
+	Reason =:= epipe ->
             case maps:get(show_econnreset, D) of
                 true  -> econnreset;
                 false -> closed
             end;
+	Reason =:= too_many_commands ->
+	    closed;
         true ->
             Reason
     end.
diff --git a/lib/kernel/src/socket.erl b/lib/kernel/src/socket.erl
@@ -392,6 +392,9 @@ server(Addr, Port) ->
 %% -define(DBG(T),
 %%         erlang:display({{self(), ?MODULE, ?LINE, ?FUNCTION_NAME}, T})).
 
+%% -define(P(F),    ?P(F, [])).
+%% -define(P(F, A), p("~w:~w(~w) -> " ++ F, [?MODULE, ?FUNCTION_NAME, ?LINE | A])).
+
 %% Also in prim_socket
 -define(REGISTRY, socket_registry).
 
@@ -6904,8 +6907,8 @@ f(F, A) ->
 %%                       [YYYY, MM, DD, Hour, Min, Sec] ++ ArgsExtra),
 %%     lists:flatten(FormatDate).
 
-%% p(F) ->
-%%     p(F, []).
+%% %% p(F) ->
+%% %%     p(F, []).
 
 %% p(F, A) ->
 %%     p(get(sname), F, A).
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -29,15 +29,17 @@
 %%
 %% (cd /mnt/c/$LOCAL_TESTS/26/kernel_test/ && $ERL_TOP/bin/win32/erl.exe -sname kernel-26-tester -pa c:$LOCAL_TESTS/26/test_server)
 %% application:set_env(kernel, test_inet_backends, true).
+%%
 %% S = fun() -> ts:run(kernel, gen_tcp_misc_SUITE, [batch]) end.
 %% S = fun(SUITE) -> ts:run(kernel, SUITE, [batch]) end.
-%% S = fun() -> ct:run_test([{suite, gen_tcp_misc_SUITE}]) end.
-%% S = fun(SUITE) -> ct:run_test([{suite, SUITE}]) end.
 %% G = fun(GROUP) -> ts:run(kernel, gen_tcp_misc_SUITE, {group, GROUP}, [batch]) end.
 %% G = fun(SUITE, GROUP) -> ts:run(kernel, SUITE, {group, GROUP}, [batch]) end.
+%% T = fun(TC) -> ts:run(kernel, gen_tcp_misc_SUITE, TC, [batch]) end.
+%%
+%% S = fun() -> ct:run_test([{suite, gen_tcp_misc_SUITE}]) end.
+%% S = fun(SUITE) -> ct:run_test([{suite, SUITE}]) end.
 %% G = fun(GROUP) -> ct:run_test([{suite, gen_tcp_misc_SUITE}, {group, GROUP}]) end.
 %% G = fun(SUITE, GROUP) -> ct:run_test([{suite, SUITE}, {group, GROUP}]) end.
-%% T = fun(TC) -> ts:run(kernel, gen_tcp_misc_SUITE, TC, [batch]) end.
 %% T = fun(TC) -> ct:run_test([{suite, gen_tcp_misc_SUITE}, {testcase, TC}]) end.
 %% T = fun(TC) -> ct:run_test([{suite, gen_tcp_misc_SUITE}, {group, inet_backend_socket}, {testcase, TC}]) end.
 %% T = fun(S, TC) -> ct:run_test([{suite, S}, {testcase, TC}]) end.
@@ -2045,12 +2047,16 @@ do_show_econnreset_active(Config, Addr) ->
     {ok, S1} = gen_tcp:accept(L1),
     ok = gen_tcp:close(L1),
     ok = inet:setopts(Client1, [{linger, {true, 0}}]),
+    %% ok = inet:setopts(S1, [{debug, true}]),
+    ?P("close client(1) socket"),
     ok = gen_tcp:close(Client1),
+    ?P("await accepted socket econnreset tcp-error message"),
     receive
 	{tcp_error, S1, econnreset} ->
+	    ?P("received accepted socket expected tcp-error message (econnreset)"),
 	    receive
 		{tcp_closed, S1} ->
-                    ?P("done"),
+                    ?P("received accepted socket tcp-closed message - done"),
 		    ok;
 		Other1 ->
                     ?P("UNEXPECTED (expected closed):"
diff --git a/lib/kernel/test/socket_traffic_SUITE.erl b/lib/kernel/test/socket_traffic_SUITE.erl
