Delete unused System.Runtime.Versioning.CompatibilitySwitch (#99270)

huoyaoyuan · jkotas · web-flow · commit ba13ef001d1f · 2024-03-08T00:25:59.000-08:00
* Use QCALL

* Remove usage of Lazy

* Apply suggestions from code review

---------

Co-authored-by: Jan Kotas &lt;jkotas@microsoft.com&gt;
diff --git a/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <EnableDefaultItems>false</EnableDefaultItems>
@@ -225,7 +225,6 @@
     <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\NativeLibrary.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Runtime\Intrinsics\X86\X86Base.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Runtime\Loader\AssemblyLoadContext.CoreCLR.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Runtime\Versioning\CompatibilitySwitch.cs" />
     <Compile Include="$(BclSourcesRoot)\System\RuntimeArgumentHandle.cs" />
     <Compile Include="$(BclSourcesRoot)\System\RuntimeHandles.cs" />
     <Compile Include="$(BclSourcesRoot)\System\RuntimeType.ActivatorCache.cs" />
diff --git a/src/coreclr/System.Private.CoreLib/src/System/Runtime/Versioning/CompatibilitySwitch.cs b/src/coreclr/System.Private.CoreLib/src/System/Runtime/Versioning/CompatibilitySwitch.cs
diff --git a/src/coreclr/vm/CMakeLists.txt b/src/coreclr/vm/CMakeLists.txt
@@ -300,7 +300,6 @@ set(VM_SOURCES_WKS
     comdependenthandle.cpp
     comdynamic.cpp
     commodule.cpp
-    compatibilityswitch.cpp
     comsynchronizable.cpp
     comthreadpool.cpp
     comutilnative.cpp
@@ -402,7 +401,6 @@ set(VM_HEADERS_WKS
     comdependenthandle.h
     comdynamic.h
     commodule.h
-    compatibilityswitch.h
     comsynchronizable.h
     comthreadpool.h
     comutilnative.h
diff --git a/src/coreclr/vm/compatibilityswitch.cpp b/src/coreclr/vm/compatibilityswitch.cpp
diff --git a/src/coreclr/vm/compatibilityswitch.h b/src/coreclr/vm/compatibilityswitch.h
diff --git a/src/coreclr/vm/corelib.cpp b/src/coreclr/vm/corelib.cpp
@@ -29,7 +29,6 @@
 #include "floatdouble.h"
 #include "floatsingle.h"
 #include "comdatetime.h"
-#include "compatibilityswitch.h"
 #include "debugdebugger.h"
 #include "assemblynative.hpp"
 #include "comthreadpool.h"
diff --git a/src/coreclr/vm/ecalllist.h b/src/coreclr/vm/ecalllist.h
@@ -251,10 +251,6 @@ FCFuncStart(gCOMCustomAttributeFuncs)
     FCFuncElement("_GetPropertyOrFieldData",  COMCustomAttribute::GetPropertyOrFieldData)
 FCFuncEnd()
 
-FCFuncStart(gCompatibilitySwitchFuncs)
-    FCFuncElement("GetValueInternal", CompatibilitySwitch::GetValue)
-FCFuncEnd()
-
 FCFuncStart(gRuntimeAssemblyFuncs)
     FCFuncElement("FCallIsDynamic", AssemblyNative::IsDynamic)
     FCFuncElement("GetManifestModule", AssemblyHandle::GetManifestModule)
@@ -565,7 +561,6 @@ FCClassElement("AssemblyLoadContext", "System.Runtime.Loader", gAssemblyLoadCont
 FCClassElement("Buffer", "System", gBufferFuncs)
 FCClassElement("CastHelpers", "System.Runtime.CompilerServices", gCastHelpers)
 FCClassElement("ComAwareWeakReference", "System", gComAwareWeakReferenceFuncs)
-FCClassElement("CompatibilitySwitch", "System.Runtime.Versioning", gCompatibilitySwitchFuncs)
 FCClassElement("CustomAttribute", "System.Reflection", gCOMCustomAttributeFuncs)
 FCClassElement("Debugger", "System.Diagnostics", gDiagnosticsDebugger)
 FCClassElement("Delegate", "System", gDelegateFuncs)
diff --git a/src/coreclr/vm/nativeeventsource.cpp b/src/coreclr/vm/nativeeventsource.cpp
@@ -34,6 +34,22 @@ extern "C" BOOL QCALLTYPE IsEventSourceLoggingEnabled()
     return retVal;
 }
 
+extern "C" LPWSTR QCALLTYPE EventSource_GetClrConfig(LPCWSTR configName)
+{
+    QCALL_CONTRACT;
+
+    LPWSTR ret = NULL;
+
+    BEGIN_QCALL;
+    CLRConfig::ConfigStringInfo info;
+    info.name = configName;
+    info.options = CLRConfig::LookupOptions::Default;
+    ret = CLRConfig::GetConfigValue(info);
+    END_QCALL;
+
+    return ret;
+}
+
 #endif //defined(FEATURE_EVENTSOURCE_XPLAT)
 
 #ifdef FEATURE_PERFTRACING
diff --git a/src/coreclr/vm/nativeeventsource.h b/src/coreclr/vm/nativeeventsource.h
@@ -14,9 +14,12 @@
 
 #include "qcall.h"
 
-#if defined(FEATURE_PERFTRACING)
+#if defined(FEATURE_EVENTSOURCE_XPLAT)
 extern "C" void QCALLTYPE LogEventSource(_In_z_ int eventID, _In_z_ LPCWSTR eventName, _In_z_ LPCWSTR eventSourceName, _In_z_ LPCWSTR payload);
 extern "C" BOOL QCALLTYPE IsEventSourceLoggingEnabled();
+extern "C" LPWSTR QCALLTYPE EventSource_GetClrConfig(LPCWSTR configName);
+#endif //defined(FEATURE_EVENTSOURCE_XPLAT)
+#if defined(FEATURE_PERFTRACING)
 extern "C" void QCALLTYPE LogThreadPoolWorkerThreadStart(_In_z_ uint activeWorkerThreadCount, _In_z_ uint retiredWorkerThreadCount, _In_z_ short clrInstanceID);
 extern "C" void QCALLTYPE LogThreadPoolWorkerThreadStop(_In_z_ uint activeWorkerThreadCount, _In_z_ uint retiredWorkerThreadCount, _In_z_ short clrInstanceID);
 extern "C" void QCALLTYPE LogThreadPoolWorkerThreadWait(_In_z_ uint activeWorkerThreadCount, _In_z_ uint retiredWorkerThreadCount, _In_z_ short clrInstanceID);
diff --git a/src/coreclr/vm/qcallentrypoints.cpp b/src/coreclr/vm/qcallentrypoints.cpp
@@ -24,7 +24,6 @@
 #include "floatdouble.h"
 #include "floatsingle.h"
 #include "comdatetime.h"
-#include "compatibilityswitch.h"
 #include "debugdebugger.h"
 #include "assemblynative.hpp"
 #include "comthreadpool.h"
@@ -352,6 +351,7 @@ static const Entry s_QCall[] =
 #if defined(FEATURE_EVENTSOURCE_XPLAT)
     DllImportEntry(IsEventSourceLoggingEnabled)
     DllImportEntry(LogEventSource)
+    DllImportEntry(EventSource_GetClrConfig)
 #endif
 #if defined(FEATURE_PERFTRACING)
     DllImportEntry(LogThreadPoolWorkerThreadStart)
diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/XplatEventLogger.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/TraceLogging/XplatEventLogger.cs
@@ -1,13 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
 using System.Text;
 
 #if FEATURE_EVENTSOURCE_XPLAT
@@ -18,8 +15,13 @@ internal sealed partial class XplatEventLogger : EventListener
     {
         public XplatEventLogger() { }
 
-        private static readonly Lazy<string?> eventSourceNameFilter = new Lazy<string?>(() => CompatibilitySwitch.GetValueInternal("EventSourceFilter"));
-        private static readonly Lazy<string?> eventSourceEventFilter = new Lazy<string?>(() => CompatibilitySwitch.GetValueInternal("EventNameFilter"));
+        private static readonly string s_eventSourceNameFilter = GetClrConfig("EventSourceFilter");
+        private static readonly string s_eventSourceEventFilter = GetClrConfig("EventNameFilter");
+
+        private static unsafe string GetClrConfig(string configName) => new string(EventSource_GetClrConfig(configName));
+
+        [LibraryImport(RuntimeHelpers.QCall, StringMarshalling = StringMarshalling.Utf16)]
+        private static unsafe partial char* EventSource_GetClrConfig(string configName);
 
         private static bool initializedPersistentListener;
 
@@ -153,9 +155,7 @@ private static void AppendByteArrayAsHexString(ref ValueStringBuilder builder, b
 
         protected internal override void OnEventSourceCreated(EventSource eventSource)
         {
-
-            string? eventSourceFilter = eventSourceNameFilter.Value;
-            if (string.IsNullOrEmpty(eventSourceFilter) || (eventSource.Name.Contains(eventSourceFilter, StringComparison.OrdinalIgnoreCase)))
+            if (string.IsNullOrEmpty(s_eventSourceNameFilter) || (eventSource.Name.Contains(s_eventSourceNameFilter, StringComparison.OrdinalIgnoreCase)))
             {
                 EnableEvents(eventSource, EventLevel.LogAlways, EventKeywords.All, null);
             }
@@ -173,8 +173,7 @@ protected internal override void OnEventWritten(EventWrittenEventArgs eventData)
                 return;
             }
 
-            string? eventFilter = eventSourceEventFilter.Value;
-            if (string.IsNullOrEmpty(eventFilter) || (eventData.EventName!.Contains(eventFilter, StringComparison.OrdinalIgnoreCase)))
+            if (string.IsNullOrEmpty(s_eventSourceEventFilter) || (eventData.EventName!.Contains(s_eventSourceEventFilter, StringComparison.OrdinalIgnoreCase)))
             {
                 LogOnEventWritten(eventData);
             }
