File 0208-kernel-Improve-inet-info-1.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0208-kernel-Improve-inet-info-1.patch of Package erlang (Revision 146c22f3078afb21ca566b2f59ce9bb4)

Currently displaying revision 146c22f3078afb21ca566b2f59ce9bb4 , Show latest

From 269a7d1961b3e61237afc4378b2046c298b2c76f Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Mon, 14 Jun 2021 18:21:12 +0200
Subject: [PATCH 1/2] [kernel] Improve inet:info/1

The info function did not handle a closed socket well.
A 'closed' socket is represented by a info map with *only*
the one or two states-attributes, with the value(s) set to
[closed].
Also if the function is called for a non-socket port, behave
as well as possible (no status or statistics).

OTP-17492

[kernel] More tweaking
---
 lib/kernel/src/gen_tcp_socket.erl | 12 +++++-
 lib/kernel/src/inet.erl           | 64 +++++++++++++++++--------------
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/lib/kernel/src/gen_tcp_socket.erl b/lib/kernel/src/gen_tcp_socket.erl
index 83e897326d..46b8b1f0db 100644
--- a/lib/kernel/src/gen_tcp_socket.erl
+++ b/lib/kernel/src/gen_tcp_socket.erl
@@ -85,6 +85,9 @@
 -define(select_info(SelectRef),
         {select_info, _, (SelectRef)}).
 
+-define(CLOSED_SOCKET, #{rstates => [closed], wstates => [closed]}).
+
+
 %%% ========================================================================
 %%% API
 %%%
@@ -570,7 +573,12 @@ getstat(?MODULE_socket(Server, _Socket), What) when is_list(What) ->
 %% -------------------------------------------------------------------------
 
 info(?MODULE_socket(Server, _Socket)) ->
-    call(Server, info).
+    case call(Server, info) of
+	{error, closed} ->
+	    ?CLOSED_SOCKET;
+	Other ->
+	    Other
+    end.
 
 
 %% -------------------------------------------------------------------------
@@ -1468,7 +1476,7 @@ handle_event({call, From}, info, State, {P, D}) ->
     case State of
         'closed' ->
             {keep_state_and_data,
-             [{reply, From, #{}}]};
+             [{reply, From, ?CLOSED_SOCKET}]};
         _ ->
             {D_1, Result} = handle_info(P#params.socket, P#params.owner, D),
             {keep_state, {P, D_1},
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index b5b7b0a3eb..e5bf891e73 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -674,37 +674,43 @@ socket_to_list(Socket) when is_port(Socket) ->
 info({'$inet', GenSocketMod, _} = Socket)
   when is_atom(GenSocketMod) ->
     GenSocketMod:?FUNCTION_NAME(Socket);
-info(Socket) ->
-    PortInfo = port_info(Socket),
-    States =
-        case prim_inet:getstatus(Socket) of
-            {ok, State0} ->
-                State0;
-            _ ->
-                #{}
-        end,
-    Stats =
-        case getstat(Socket) of
-            {ok, Stats0} ->
-                maps:from_list(Stats0);
-            _ ->
-                []
-        end,
-    PortInfo#{counters => Stats,
-              states   => States}.
+info(Socket) when is_port(Socket) ->
+    case port_info(Socket) of
+	#{states := _} = PortInfo ->
+	    PortInfo;
+	PortInfo0 ->
+	    %% Its actually possible to call this function for non-socket ports,
+	    %% but in that case we have no status or statistics.
+	    PortInfo1 =
+		case prim_inet:getstatus(Socket) of
+		    {ok, State} ->
+			PortInfo0#{states => State};
+		    _ ->
+			PortInfo0
+		end,
+	    case getstat(Socket) of
+		{ok, Stats0} ->
+		    PortInfo1#{counters => maps:from_list(Stats0)};
+		_ ->
+		    PortInfo1
+	    end
+    end.
 
 port_info(P) when is_port(P) ->
-    PI0 = port_info(erlang:port_info(P),
-                    [connected, links, input, output]) ++
-        [erlang:port_info(P, memory),
-         erlang:port_info(P, monitors)],
-    PI = pi_replace([{connected, owner}], PI0),
-    maps:from_list(PI);
-port_info(_) ->
-    #{}.
-
-port_info(PI, Items) ->
-    port_info(PI, Items, []).
+    case erlang:port_info(P) of
+	PI0 when is_list(PI0) ->
+	    PI1 = port_info(PI0, [connected, links, input, output]) ++
+		[erlang:port_info(P, memory), erlang:port_info(P, monitors)],
+	    PI2 = pi_replace([{connected, owner}], PI1),
+	    maps:from_list(PI2);
+	_ ->
+	    #{states => [closed]}
+    end.
+
+port_info(PI, Items) when is_list(PI) ->
+    port_info(PI, Items, []);
+port_info(_, _) ->
+    [].
 
 port_info(_PI, [], Acc) ->
     Acc;
-- 
2.26.2

Places

File 0208-kernel-Improve-inet-info-1.patch of Package erlang (Revision 146c22f3078afb21ca566b2f59ce9bb4)

Places