File 1048-observer-Add-all-socket-options-to-Options... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1048-observer-Add-all-socket-options-to-Options-list.patch of Package erlang (Revision c37f636f556d133a129c9e9a7093d763)

Currently displaying revision c37f636f556d133a129c9e9a7093d763 , Show latest

From 955446c40b133d52ba8213e338b29c8d6684fcc0 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 11 May 2021 17:36:52 +0200
Subject: [PATCH 08/17] [observer] Add all socket options to Options list

Add even not supported sockets to the list, whith the
value set to 'Not Supported'.

OTP-17346
---
 lib/runtime_tools/src/observer_backend.erl | 83 ++++++++++++----------
 1 file changed, 44 insertions(+), 39 deletions(-)

diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index 0895ce04ce..0efe648d83 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -216,6 +216,42 @@ inet_port_extra(_,_) ->
 
 
 get_socket_list() ->
+    GetOpt = fun(_Sock, {Opt, false}) ->
+		     {Opt, "Not Supported"};
+		(Sock, {Opt, true}) ->
+		     case socket:getopt(Sock, Opt) of
+			 %% Convert to string?
+			 {ok, Value0} ->
+			     %% d("get_socket_list -> ok: "
+			     %% 	"~n   Option: ~p"
+			     %% 	"~n   Value:  ~p", [Opt, Value]),
+			     Value =
+				 if
+				     (Value0 =:= []) -> "-";
+				     true -> Value0
+				 end,
+			     {Opt, Value};
+			 %% We need to handle error cases and convert them
+			 %% to something useful ("Not Supported")
+			 {error, enotsup} = _ERROR ->
+			     %% d("get_socket_list -> error: enotsup"),
+			     {Opt, "Not Supported"};
+			 {error, enoprotoopt} = _ERROR ->
+			     %% d("get_socket_list -> error: enoprotoopt"),
+			     {Opt, "Not Supported"};
+			 {error, enotconn} = _ERROR ->
+			     %% d("get_socket_list -> error: enotconn"),
+			     {Opt, "Not Connected"};
+			 {error, {invalid, _}} = _ERROR ->
+			     %% d("get_socket_list -> error: invalid"),
+			     {Opt, "Not Implemented"};
+			 {error, Reason} ->
+			     %% d("get_socket_list -> error: "
+			     %% 	"~n   Option: ~p"
+			     %% 	"~n   Reason: ~p", [Opt, _Reason]),
+			     {Opt, f("error:~p", [Reason])}
+		     end
+	     end,
     [begin
 	 Kind  = socket:which_socket_kind(S),
 	 FD    = case socket:getopt(S, otp, fd) of
@@ -258,15 +294,15 @@ get_socket_list() ->
 		     Info6
 	     end,
 	 SockOpts =
-	     [{socket, Opt} || {Opt, true} <-
+	     [{{socket, Opt}, Supported} || {Opt, Supported} <-
 				   socket:supports(options, socket)],
 	 DomainOpts =
 	     case Info7 of
 		 #{domain := inet6} ->
-		     [{ipv6, Opt} || {Opt, true} <-
+		     [{{ipv6, Opt}, Supported} || {Opt, Supported} <-
 					 socket:supports(options, ipv6)];
 		 _ ->
-		     [{ip, Opt} || {Opt, true} <-
+		     [{{ip, Opt}, Supported} || {Opt, Supported} <-
 				       socket:supports(options, ip)]
 	     end,
 	 ProtoOpts =
@@ -275,56 +311,25 @@ get_socket_list() ->
 		   type     := stream,
 		   protocol := tcp} when (Domain =:= inet) orelse
 					 (Domain =:= inet6) ->
-		     [{tcp, Opt} || {Opt, true} <-
+		     [{{tcp, Opt}, Supported} || {Opt, Supported} <-
 					socket:supports(options, tcp)];
 		 #{domain   := Domain,
 		   type     := dgram,
 		   protocol := udp} when (Domain =:= inet) orelse
 					 (Domain =:= inet6) ->
-		     [{udp, Opt} || {Opt, true} <-
+		     [{{udp, Opt}, Supported} || {Opt, Supported} <-
 					socket:supports(options, udp)];
 		 #{domain   := Domain,
 		   type     := seqpacket,
 		   protocol := sctp} when (Domain =:= inet) orelse
 					  (Domain =:= inet6) ->
-		     [{sctp, Opt} || {Opt, true} <-
+		     [{{sctp, Opt}, Supported} || {Opt, Supported} <-
 					 socket:supports(options, sctp)];
 		 _ ->
 		     []
 	     end,
-	 %% d("get_socket_list -> "
-	 %%   "~n   Socket Opts: ~p"
-	 %%   "~n   Domain Opts: ~p"
-	 %%   "~n   Proto Opts:  ~p", [SockOpts, DomainOpts, ProtoOpts]),
-	 Opts = SockOpts ++ DomainOpts ++ ProtoOpts,
-	 Options =
-	     [case socket:getopt(S, Opt) of
-		  %% Convert to string?
-		  {ok, Value} ->
-		      %% d("get_socket_list -> ok: "
-		      %% 	"~n   Option: ~p"
-		      %% 	"~n   Value:  ~p", [Opt, Value]),
-		      {Opt, if (Value =:= []) -> "-"; true -> Value end};
-		  %% We need to handle error cases and convert them
-		  %% to something useful ("Not Supported")
-		  {error, enotsup} = _ERROR ->
-		      %% d("get_socket_list -> error: enotsup"),
-		      {Opt, "Not Supported"};
-		  {error, enoprotoopt} = _ERROR ->
-		      %% d("get_socket_list -> error: enoprotoopt"),
-		      {Opt, "Not Supported"};
-		  {error, enotconn} = _ERROR ->
-		      %% d("get_socket_list -> error: enotconn"),
-		      {Opt, "Not Connected"};
-		  {error, {invalid, _}} = _ERROR ->
-		      %% d("get_socket_list -> error: invalid"),
-		      {Opt, "Not Implemented"};
-		  {error, Reason} ->
-		      %% d("get_socket_list -> error: "
-		      %% 	"~n   Option: ~p"
-		      %% 	"~n   Reason: ~p", [Opt, _Reason]),
-		      {Opt, f("error:~p", [Reason])}
-	      end || Opt <- Opts],
+	 Opts    = SockOpts ++ DomainOpts ++ ProtoOpts,
+	 Options = [GetOpt(S, Opt) || Opt <- Opts],
 	 %% d("get_socket_list -> "
 	 %%   "~n   Options:  ~p", [Options]),
 	 Info7#{id           => S,
-- 
2.26.2

Places

File 1048-observer-Add-all-socket-options-to-Options-list.patch of Package erlang (Revision c37f636f556d133a129c9e9a7093d763)

Places