Add support to disable default diagnostic server listener. (#52184)

Author: lateralusX

src/mono/mono.proj

@@ -413,7 +413,7 @@
 
     <ItemGroup Condition="'$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsAndroid)' == 'true'">
       <_MonoCMakeArgs Include="-DFEATURE_PERFTRACING_PAL_TCP=1"/>
-      <_MonoCMakeArgs Include="-DFEATURE_PERFTRACING_DISABLE_LISTEN_PORTS=1"/>
+      <_MonoCMakeArgs Include="-DFEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT=1"/>
       <_MonoCMakeArgs Include="-DDISABLE_LINK_STATIC_COMPONENTS=1" />
     </ItemGroup>
 

src/mono/mono/eventpipe/CMakeLists.txt

@@ -5,11 +5,15 @@ if(ENABLE_PERFTRACING)
     endif (FEATURE_PERFTRACING_PAL_TCP)
 
     if (FEATURE_PERFTRACING_DISABLE_LISTEN_PORTS)
-        add_definitions(-DENABLE_PERFTRACING_DISABLE_LISTEN_PORTS)
+        add_definitions(-DDISABLE_PERFTRACING_LISTEN_PORTS)
     endif (FEATURE_PERFTRACING_DISABLE_LISTEN_PORTS)
 
+    if (FEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT)
+        add_definitions(-DDISABLE_PERFTRACING_DEFAULT_LISTEN_PORT)
+    endif (FEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT)
+
     if (FEATURE_PERFTRACING_DISABLE_CONNECT_PORTS)
-        add_definitions(-DENABLE_PERFTRACING_DISABLE_CONNECT_PORTS)
+        add_definitions(-DDISABLE_PERFTRACING_CONNECT_PORTS)
     endif (FEATURE_PERFTRACING_DISABLE_CONNECT_PORTS)
 
     include (${SHARED_EVENTPIPE_SOURCE_PATH}CMakeLists.txt)

src/native/eventpipe/ds-ipc.c

@@ -165,17 +165,12 @@ ipc_stream_factory_build_and_add_port (
 	bool result = false;
 	DiagnosticsIpc *ipc = NULL;
 
-#ifndef DS_IPC_DISABLE_LISTEN_PORTS
+#ifndef DS_IPC_DISABLE_DEFAULT_LISTEN_PORT
 	if (!default_port && builder->type == DS_PORT_TYPE_LISTEN) {
 		// Ignore listen type (see conversation in https://github.com/dotnet/runtime/pull/40499 for details)
 		DS_LOG_INFO_0 ("ipc_stream_factory_build_and_add_port - Ignoring LISTEN port configuration");
 		return true;
 	}
-#else
-	if (default_port && builder->type == DS_PORT_TYPE_LISTEN) {
-		DS_LOG_DEBUG_0 ("ipc_stream_factory_build_and_add_port - Ignoring default LISTEN port");
-		return true;
-	}
 #endif
 
 	if (builder->type == DS_PORT_TYPE_LISTEN) {
@@ -324,6 +319,7 @@ ds_ipc_stream_factory_configure (ds_ipc_error_callback_func callback)
 		ep_rt_utf8_string_free (ports);
 	}
 
+#ifndef DS_IPC_DISABLE_DEFAULT_LISTEN_PORT
 	// create the default listen port
 	uint32_t port_suspend = ds_rt_config_value_get_default_port_suspend ();
 
@@ -339,6 +335,9 @@ ds_ipc_stream_factory_configure (ds_ipc_error_callback_func callback)
 	} else {
 		result &= false;
 	}
+#else
+	DS_LOG_DEBUG_0 ("ds_ipc_stream_factory_configure - Ignoring default LISTEN port");
+#endif
 
 	return result;
 }

src/native/eventpipe/ds-rt-config.h

@@ -21,12 +21,17 @@
 #endif
 #endif
 
-#ifdef ENABLE_PERFTRACING_DISABLE_CONNECT_PORTS
+#ifdef DISABLE_PERFTRACING_CONNECT_PORTS
 #define DS_IPC_DISABLE_CONNECT_PORTS
 #endif
 
-#ifdef ENABLE_PERFTRACING_DISABLE_LISTEN_PORTS
+#ifdef DISABLE_PERFTRACING_LISTEN_PORTS
 #define DS_IPC_DISABLE_LISTEN_PORTS
+#define DS_IPC_DISABLE_DEFAULT_LISTEN_PORT
+#endif
+
+#ifdef DISABLE_PERFTRACING_DEFAULT_LISTEN_PORT
+#define DS_IPC_DISABLE_DEFAULT_LISTEN_PORT
 #endif
 
 #endif /* __DIAGNOSTICS_RT_CONFIG_H__ */