File 1505-kernel-gen-tcp-socket-Misc-tweaking.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1505-kernel-gen-tcp-socket-Misc-tweaking.patch of Package erlang (Revision 67b0d44b81f58108cfbcc1786210bcda)

Currently displaying revision 67b0d44b81f58108cfbcc1786210bcda , Show latest

From 84a96fd56691a2aae1e2b5eac2b5cce3b7f34a4f Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 27 Jul 2021 17:57:58 +0200
Subject: [PATCH 05/13] [kernel|gen-tcp-socket] Misc tweaking

Many of the changes here will be "fixed" in a specific
branch, but some of the tweaks will only occur here.

OTP-17156
OTP-17533
---
 lib/kernel/src/gen_tcp_socket.erl | 66 +++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/lib/kernel/src/gen_tcp_socket.erl b/lib/kernel/src/gen_tcp_socket.erl
index 1841623241..12e6e15f4c 100644
--- a/lib/kernel/src/gen_tcp_socket.erl
+++ b/lib/kernel/src/gen_tcp_socket.erl
@@ -50,7 +50,7 @@
 
 -include("inet_int.hrl").
 
--define(DBG(T), erlang:display({{self(), ?MODULE, ?LINE, ?FUNCTION_NAME}, T})).
+%% -define(DBG(T), erlang:display({{self(), ?MODULE, ?LINE, ?FUNCTION_NAME}, T})).
 
 
 %% -------------------------------------------------------------------------
@@ -1127,6 +1127,7 @@ server_opts() ->
 -compile({inline, [meta/1]}).
 meta(D) -> maps:with(maps:keys(server_write_opts()), D).
 
+
 %%% ========================================================================
 %%% State Machine
 %%%
@@ -1249,7 +1250,7 @@ init({prepare, D, Owner}) ->
                        owner_mon = OwnerMon},
     {ok, accept, {P, D#{type => undefined, buffer => <<>>}}};
 init(Arg) ->
-    error_logger:error_report([{badarg, {?MODULE, init, [Arg]}}]),
+    error_report([{badarg, {?MODULE, init, [Arg]}}]),
     error(badarg, [Arg]).
 
 
@@ -1694,17 +1695,15 @@ handle_event(
 %% Handle select done - try recv again
 handle_event(
   info, ?socket_select(Socket, SelectRef),
-  #recv{info = ?select_info(SelectRef)},
+  #recv{info = ?select_info(SelectRef)} = _State,
   {#params{socket = Socket} = P, D}) ->
-    %%
     %% ?DBG([info, {socket, Socket}, {ref, SelectRef}]),
     handle_recv(P, D, []);
 %%
 handle_event(
   info, ?socket_abort(Socket, SelectRef, Reason),
-  #recv{info = ?select_info(SelectRef)},
+  #recv{info = ?select_info(SelectRef)} = _State,
   {#params{socket = Socket} = P, D}) ->
-    %%
     %% ?DBG({abort, Reason}),
     handle_connected(P, cleanup_recv_reply(P, D, [], Reason));
 %%
@@ -1764,9 +1763,9 @@ handle_shutdown2(Socket, NextState, How) ->
 
 
 handle_unexpected(Type, Content, State, {P, _D}) ->
-    error_logger:warning_report(
-      [{module, ?MODULE}, {socket, P#params.socket},
-       {unknown_event, {Type, Content}}, {state, State}]),
+    warning_report([{socket,        P#params.socket},
+                    {unknown_event, {Type, Content}},
+                    {state,         State}]),
     case Type of
         {call, From} ->
             {keep_state_and_data,
@@ -1781,9 +1780,9 @@ handle_closed(Type, Content, State, {P, _D}) ->
             {keep_state_and_data,
              [{reply, From, {error, closed}}]};
         _ ->
-            error_logger:warning_report(
-              [{module, ?MODULE}, {socket, P#params.socket},
-               {unknown_event, {Type, Content}}, {state, State}]),
+            warning_report([{socket,        P#params.socket},
+                            {unknown_event, {Type, Content}},
+                            {state,         State}]),
             keep_state_and_data
     end.
 
@@ -1999,14 +1998,14 @@ handle_buffered(P, #{packet_size := PacketSize} = D,
             %% What do we do here?
             %% Keep the buffer and hope that it will go better with more data?
             %% Or discard it and continue as if nothing happened?
-            error_logger:warning_msg("Failed decoding message"
-                                     "~n   Socket:          ~p"
-                                     "~n   Socket server:   ~p"
-                                     "~n   Packet type:     ~p"
-                                     "~n   byte_size(Data): ~p"
-                                     "~n   Reason:          ~p",
-                                     [P#params.socket, self(),
-                                      Type, byte_size(Data), Reason]),
+            warning_msg("Failed decoding message"
+                        "~n   Socket:          ~p"
+                        "~n   Socket server:   ~p"
+                        "~n   Packet type:     ~p"
+                        "~n   byte_size(Data): ~p"
+                        "~n   Reason:          ~p",
+                        [P#params.socket, self(),
+                         Type, byte_size(Data), Reason]),
             D
     end.
 
@@ -2557,6 +2556,7 @@ state_setopts_server(P, D, State, Opts, {Tag, Value}) ->
     end.
 
 state_setopts_active(P, D, State, Opts, Active) ->
+    %% ?DBG([{active, Active}]),
     if
         Active =:= once;
         Active =:= true ->
@@ -2780,8 +2780,34 @@ timeout(EndTime) ->
 
 -endif. % -ifdef(undefined).
 
+
 %% -------------------------------------------------------------------------
 
 error_msg(F, A) ->
     error_logger:error_msg(F ++ "~n", A).
 
+warning_msg(F, A) ->
+    error_logger:error_msg(F ++ "~n", A).
+
+error_report(Report) ->
+    error_logger:error_report(Report).
+
+warning_report(Report) ->
+    error_logger:warning_report([{module, ?MODULE}|Report]).
+
+
+
+%% -------------------------------------------------------------------------
+
+%% formated_timestamp() ->
+%%     format_timestamp(os:timestamp()).
+
+%% format_timestamp(TS) ->
+%%     megaco:format_timestamp(TS).
+
+%% d(F) ->
+%%     d(F, []).
+
+%% d(F, A) ->
+%%     io:format("*** [~s] ~p ~w " ++ F ++ "~n",
+%%               [formated_timestamp(), self(), ?MODULE | A]).
-- 
2.31.1

Places

File 1505-kernel-gen-tcp-socket-Misc-tweaking.patch of Package erlang (Revision 67b0d44b81f58108cfbcc1786210bcda)

Places