Make firing of ETW events in nativeaot opt-in via the enabled/disable…

…d lib (#88800)
dotnet · Jul 14, 2023 · 4a45bd8 · 4a45bd8
1 parent df00775
commit 4a45bd8
Show file tree

Hide file tree

Showing 21 changed files with 2,820 additions and 1,598 deletions.
diff --git a/src/coreclr/nativeaot/Runtime/CMakeLists.txt b/src/coreclr/nativeaot/Runtime/CMakeLists.txt
@@ -23,7 +23,6 @@ set(COMMON_RUNTIME_SOURCES
     TypeManager.cpp
     ObjectLayout.cpp
     portable.cpp
-    profheapwalkhelper.cpp
     RestrictedCallouts.cpp
     RhConfig.cpp
     RuntimeInstance.cpp
@@ -220,18 +219,6 @@ endif()
 
 if(FEATURE_EVENT_TRACE)
   add_definitions(-DFEATURE_EVENT_TRACE)
-  list(APPEND COMMON_RUNTIME_SOURCES
-    eventtrace.cpp
-  )
-  # These are carry-overs from .NET Native and only included on Windows currently
-  #   bulktype : directly emits via ETW with EventWrite
-  #   gcheap : GCHeapDump, GCHeapSurvivalAndMovement - not prioritizing for nativeaot yet
-  if (WIN32)
-    list(APPEND COMMON_RUNTIME_SOURCES
-      eventtrace_bulktype.cpp
-      eventtrace_gcheap.cpp
-    )
-  endif()
 endif()
 
 add_definitions(-DFEATURE_BASICFREEZE)
@@ -252,6 +239,7 @@ add_definitions(-D_LIB)
 # add_definitions(-DSTRESS_HEAP)
 
 if(WIN32)
+  set(FEATURE_ETW 1)
   add_definitions(-DFEATURE_ETW)
   add_definitions(-DFEATURE_SUSPEND_REDIRECTION)
   add_definitions(-DFEATURE_SPECIAL_USER_MODE_APC)

diff --git a/src/coreclr/nativeaot/Runtime/DisabledEventPipeInterface.cpp b/src/coreclr/nativeaot/Runtime/DisabledEventPipeInterface.cpp
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 void EventPipeAdapter_Initialize() {}
-bool EventPipeAdapter_Enabled() { return false; }
 
 bool DiagnosticServerAdapter_Initialize() { return false; }
 void DiagnosticServerAdapter_PauseForDiagnosticsMonitor() {}

diff --git a/src/coreclr/nativeaot/Runtime/EnabledEventPipeInterface.cpp b/src/coreclr/nativeaot/Runtime/EnabledEventPipeInterface.cpp
@@ -11,7 +11,6 @@
 #include "SpinLock.h"
 
 void EventPipeAdapter_Initialize() { EventPipeAdapter::Initialize(); }
-bool EventPipeAdapter_Enabled() { return EventPipeAdapter::Enabled(); }
 
 bool DiagnosticServerAdapter_Initialize() { return DiagnosticServerAdapter::Initialize(); }
 void DiagnosticServerAdapter_PauseForDiagnosticsMonitor() { DiagnosticServerAdapter::PauseForDiagnosticsMonitor();}

diff --git a/src/coreclr/nativeaot/Runtime/EtwEvents.h b/src/coreclr/nativeaot/Runtime/EtwEvents.h
diff --git a/src/coreclr/nativeaot/Runtime/EventPipeInterface.h b/src/coreclr/nativeaot/Runtime/EventPipeInterface.h
@@ -6,7 +6,6 @@
 
 // Initialize EventPipe
 void EventPipeAdapter_Initialize();
-bool EventPipeAdapter_Enabled();
 
 // Initialize DS
 bool DiagnosticServerAdapter_Initialize();
@@ -18,4 +17,5 @@ void EventPipeAdapter_FinishInitialize();
 void EventPipeAdapter_Shutdown();
 bool DiagnosticServerAdapter_Shutdown();
 
+void EventTracing_Initialize();
 #endif //EVENTPIPE_INTERFACE_H
diff --git a/src/coreclr/nativeaot/Runtime/PalRedhawk.h b/src/coreclr/nativeaot/Runtime/PalRedhawk.h
@@ -17,6 +17,8 @@
 
 #include <sal.h>
 #include <stdarg.h>
+#include "CommonTypes.h"
+#include "CommonMacros.h"
 #include "gcenv.structs.h" // CRITICAL_SECTION
 #include "IntrinsicConstants.h"
 #include "PalRedhawkCommon.h"
@@ -91,13 +93,6 @@ typedef union _LARGE_INTEGER {
     int64_t QuadPart;
 } LARGE_INTEGER, *PLARGE_INTEGER;
 
-typedef struct _GUID {
-    uint32_t Data1;
-    uint16_t Data2;
-    uint16_t Data3;
-    uint8_t Data4[8];
-} GUID;
-
 #define DECLARE_HANDLE(_name) typedef HANDLE _name
 
 struct FILETIME