File 1049-observer-Ifdef-inclusion-of-non-supported-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1049-observer-Ifdef-inclusion-of-non-supported-socket-opt.patch of Package erlang (Revision 0c21b05666799b6f7e661ea62fb04f80)

Currently displaying revision 0c21b05666799b6f7e661ea62fb04f80 , Show latest

From 0ff4819b3a76826e16ff424f264c02dacf063948 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 12 May 2021 15:20:12 +0200
Subject: [PATCH 09/17] [observer] Ifdef inclusion of non-supported socket opts

Make it possible to "configure" the inclusion of non-supported
socket options.

OTP-17346
---
 lib/runtime_tools/src/observer_backend.erl | 43 ++++++++++++++++------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index 0efe648d83..ecbba3d0d8 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -40,8 +40,15 @@
 	 ttb_fetch/3,
          ttb_resume_trace/0,
 	 ttb_get_filenames/1]).
+
 -define(CHUNKSIZE,8191). % 8 kbytes - 1 byte
 
+-ifndef(ESOCK_DONT_SHOW_UNSUPPORTED_OPTS).
+-define(ESOCK_KEEP_UNSUPPORTED_OPT(_),             true).
+-else.
+-define(ESOCK_KEEP_UNSUPPORTED_OPT(__SUPPORTED__), __SUPPORTED__).
+-endif.
+
 vsn() ->
     case application:load(runtime_tools) of
 	R when R=:=ok; R=:={error,{already_loaded,runtime_tools}} -> 
@@ -294,16 +301,22 @@ get_socket_list() ->
 		     Info6
 	     end,
 	 SockOpts =
-	     [{{socket, Opt}, Supported} || {Opt, Supported} <-
-				   socket:supports(options, socket)],
+	     [{{socket, Opt}, Supported} ||
+		 {Opt, Supported} <-
+		     socket:supports(options, socket),
+		 ?ESOCK_KEEP_UNSUPPORTED_OPT(Supported)],
 	 DomainOpts =
 	     case Info7 of
 		 #{domain := inet6} ->
-		     [{{ipv6, Opt}, Supported} || {Opt, Supported} <-
-					 socket:supports(options, ipv6)];
+		     [{{ipv6, Opt}, Supported} ||
+			 {Opt, Supported} <-
+			     socket:supports(options, ipv6),
+			 ?ESOCK_KEEP_UNSUPPORTED_OPT(Supported)];
 		 _ ->
-		     [{{ip, Opt}, Supported} || {Opt, Supported} <-
-				       socket:supports(options, ip)]
+		     [{{ip, Opt}, Supported} ||
+			 {Opt, Supported} <-
+			     socket:supports(options, ip),
+			 ?ESOCK_KEEP_UNSUPPORTED_OPT(Supported)]
 	     end,
 	 ProtoOpts =
 	     case Info7 of
@@ -311,20 +324,26 @@ get_socket_list() ->
 		   type     := stream,
 		   protocol := tcp} when (Domain =:= inet) orelse
 					 (Domain =:= inet6) ->
-		     [{{tcp, Opt}, Supported} || {Opt, Supported} <-
-					socket:supports(options, tcp)];
+		     [{{tcp, Opt}, Supported} ||
+			 {Opt, Supported} <-
+			     socket:supports(options, tcp),
+			 ?ESOCK_KEEP_UNSUPPORTED_OPT(Supported)];
 		 #{domain   := Domain,
 		   type     := dgram,
 		   protocol := udp} when (Domain =:= inet) orelse
 					 (Domain =:= inet6) ->
-		     [{{udp, Opt}, Supported} || {Opt, Supported} <-
-					socket:supports(options, udp)];
+		     [{{udp, Opt}, Supported} ||
+			 {Opt, Supported} <-
+			     socket:supports(options, udp),
+			 ?ESOCK_KEEP_UNSUPPORTED_OPT(Supported)];
 		 #{domain   := Domain,
 		   type     := seqpacket,
 		   protocol := sctp} when (Domain =:= inet) orelse
 					  (Domain =:= inet6) ->
-		     [{{sctp, Opt}, Supported} || {Opt, Supported} <-
-					 socket:supports(options, sctp)];
+		     [{{sctp, Opt}, Supported} ||
+			 {Opt, Supported} <-
+			     socket:supports(options, sctp),
+			 ?ESOCK_KEEP_UNSUPPORTED_OPT(Supported)];
 		 _ ->
 		     []
 	     end,
-- 
2.26.2

Places

File 1049-observer-Ifdef-inclusion-of-non-supported-socket-opt.patch of Package erlang (Revision 0c21b05666799b6f7e661ea62fb04f80)

Places