required changes to NativeAOT to support EP

src/coreclr/nativeaot/Runtime/CommonMacros.h

@@ -62,7 +62,11 @@
 #endif
 #endif
 
-#ifndef __GCENV_BASE_INCLUDED__
+// TODO: gcenv.base.h provides these definitions only if it has been included and windows.h
+// has not been included (even though though windows.h does not define these services); in
+// all other cases the services need to be defined here.
+
+#if !(defined(__GCENV_BASE_INCLUDED__) && !defined(_INC_WINDOWS))
 
 //
 // This macro returns val rounded up as necessary to be a multiple of alignment; alignment must be a power of 2
@@ -75,7 +79,7 @@ inline uintptr_t ALIGN_DOWN(uintptr_t val, uintptr_t alignment);
 template <typename T>
 inline T* ALIGN_DOWN(T* val, uintptr_t alignment);
 
-#endif // !__GCENV_BASE_INCLUDED__
+#endif // !(defined(__GCENV_BASE_INCLUDED__) && !defined(_INC_WINDOWS))
 
 inline bool IS_ALIGNED(uintptr_t val, uintptr_t alignment);
 template <typename T>

src/coreclr/nativeaot/Runtime/CommonMacros.inl

@@ -1,7 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#ifndef __GCENV_BASE_INCLUDED__
+// TODO: gcenv.base.h provides these definitions only if it has been included and windows.h
+// has not been included (even though though windows.h does not define these services); in
+// all other cases the services need to be defined here.
+
+#if !(defined(__GCENV_BASE_INCLUDED__) && !defined(_INC_WINDOWS))
 
 //
 // This macro returns val rounded up as necessary to be a multiple of alignment; alignment must be a power of 2
@@ -36,7 +40,7 @@ inline T* ALIGN_DOWN(T* val, uintptr_t alignment)
  return reinterpret_cast<T*>(ALIGN_DOWN(reinterpret_cast<uintptr_t>(val), alignment));
 }
 
-#endif // !__GCENV_BASE_INCLUDED__
+#endif // !(defined(__GCENV_BASE_INCLUDED__) && !defined(_INC_WINDOWS))
 
 inline bool IS_ALIGNED(uintptr_t val, uintptr_t alignment)
 {

src/coreclr/nativeaot/Runtime/PalRedhawk.h

@@ -49,6 +49,9 @@
 
 #endif // !_MSC_VER
 
+// defined in gcrhenv.cpp
+bool __SwitchToThread(uint32_t dwSleepMSec, uint32_t dwSwitchCount);
+
 #ifndef _INC_WINDOWS
 //#ifndef DACCESS_COMPILE
 
@@ -101,9 +104,6 @@ typedef struct _GUID {
 
 #define DECLARE_HANDLE(_name) typedef HANDLE _name
 
-// defined in gcrhenv.cpp
-bool __SwitchToThread(uint32_t dwSleepMSec, uint32_t dwSwitchCount);
-
 struct FILETIME
 {
  uint32_t dwLowDateTime;
@@ -602,6 +602,19 @@ extern uint32_t g_RhNumberOfProcessors;
 #endif // !_INC_WINDOWS
 #endif // !DACCESS_COMPILE
 
+// TODO: Duplicate the definition from PalRedhawkFunctions.h to allow the EventPipe code to
+// access PalEventWrite even though the PalRedhawkFunctions.h services are generally not
+// available in NativeAOT runtime contexts where windows.h has been included.
+#ifdef _INC_WINDOWS
+#ifdef BUILDING_SHARED_NATIVEAOT_EVENTPIPE_CODE
+extern "C" uint32_t __stdcall EventWrite(REGHANDLE, const EVENT_DESCRIPTOR *, uint32_t, EVENT_DATA_DESCRIPTOR *);
+inline uint32_t PalEventWrite(REGHANDLE arg1, const EVENT_DESCRIPTOR * arg2, uint32_t arg3, EVENT_DATA_DESCRIPTOR * arg4)
+{
+ return EventWrite(arg1, arg2, arg3, arg4);
+}
+#endif // BUILDING_SHARED_NATIVEAOT_EVENTPIPE_CODE
+#endif // _INC_WINDOWS
+
 // The Redhawk PAL must be initialized before any of its exports can be called. Returns true for a successful
 // initialization and false on failure.
 REDHAWK_PALIMPORT bool REDHAWK_PALAPI PalInit();
@@ -716,6 +729,7 @@ REDHAWK_PALIMPORT void* REDHAWK_PALAPI PalAddVectoredExceptionHandler(uint32_t f
 typedef uint32_t (__stdcall *BackgroundCallback)(_In_opt_ void* pCallbackContext);
 REDHAWK_PALIMPORT bool REDHAWK_PALAPI PalStartBackgroundGCThread(_In_ BackgroundCallback callback, _In_opt_ void* pCallbackContext);
 REDHAWK_PALIMPORT bool REDHAWK_PALAPI PalStartFinalizerThread(_In_ BackgroundCallback callback, _In_opt_ void* pCallbackContext);
+REDHAWK_PALIMPORT bool REDHAWK_PALAPI PalStartEventPipeHelperThread(_In_ BackgroundCallback callback, _In_opt_ void* pCallbackContext);
 
 typedef void (*PalHijackCallback)(_In_ NATIVE_CONTEXT* pThreadContext, _In_opt_ void* pThreadToHijack);
 REDHAWK_PALIMPORT void REDHAWK_PALAPI PalHijack(HANDLE hThread, _In_opt_ void* pThreadToHijack);

src/coreclr/nativeaot/Runtime/loglf.h

@@ -10,8 +10,10 @@ DEFINE_LOG_FACILITY(LF_GCALLOC ,0x00000004)
 DEFINE_LOG_FACILITY(LF_GCROOTS ,0x00000008)
 DEFINE_LOG_FACILITY(LF_STARTUP ,0x00000010) // Log startup and shutdown failures
 DEFINE_LOG_FACILITY(LF_STACKWALK ,0x00000020)
+DEFINE_LOG_FACILITY(LF_DIAGNOSTICS_PORT, 0x00000040)
 // LF_ALWAYS 0x80000000 // make certain you don't try to use this bit for a real facility
 // LF_ALL 0xFFFFFFFF
 //
 #undef DEFINE_LOG_FACILITY
 
+#define INFINITE 0xFFFFFFFF // Infinite timeout

src/coreclr/nativeaot/Runtime/thread.h

@@ -331,10 +331,10 @@ typedef DacScanCallbackData EnumGcRefScanContext;
 typedef void EnumGcRefCallbackFunc(PTR_PTR_Object, EnumGcRefScanContext* callbackData, uint32_t flags);
 
 #else // DACCESS_COMPILE
-#ifndef __GCENV_BASE_INCLUDED__
+#if !(defined(__GCENV_BASE_INCLUDED__) && !defined(FEATURE_PERFTRACING))
 struct ScanContext;
 typedef void promote_func(PTR_PTR_Object, ScanContext*, unsigned);
-#endif // !__GCENV_BASE_INCLUDED__
+#endif // !__GCENV_BASE_INCLUDED__ && FEATURE_PERFTRACING
 typedef promote_func EnumGcRefCallbackFunc;
 typedef ScanContext EnumGcRefScanContext;
 

src/coreclr/nativeaot/Runtime/unix/PalRedhawkUnix.cpp

@@ -632,6 +632,11 @@ REDHAWK_PALEXPORT bool REDHAWK_PALAPI PalStartFinalizerThread(_In_ BackgroundCal
 #endif // HOST_WASM
 }
 
+REDHAWK_PALEXPORT bool REDHAWK_PALAPI PalStartEventPipeHelperThread(_In_ BackgroundCallback callback, _In_opt_ void* pCallbackContext)
+{
+ return PalStartBackgroundWork(callback, pCallbackContext, UInt32_FALSE);
+}
+
 // Returns a 64-bit tick count with a millisecond resolution. It tries its best
 // to return monotonically increasing counts and avoid being affected by changes
 // to the system clock (either due to drift or due to explicit changes to system

src/coreclr/nativeaot/Runtime/windows/PalRedhawkMinWin.cpp

@@ -612,6 +612,11 @@ REDHAWK_PALEXPORT bool REDHAWK_PALAPI PalStartFinalizerThread(_In_ BackgroundCal
  return PalStartBackgroundWork(callback, pCallbackContext, TRUE);
 }
 
+REDHAWK_PALEXPORT bool REDHAWK_PALAPI PalStartEventPipeHelperThread(_In_ BackgroundCallback callback, _In_opt_ void* pCallbackContext)
+{
+ return PalStartBackgroundWork(callback, pCallbackContext, FALSE);
+}
+
 REDHAWK_PALEXPORT bool REDHAWK_PALAPI PalEventEnabled(REGHANDLE regHandle, _In_ const EVENT_DESCRIPTOR* eventDescriptor)
 {
  return !!EventEnabled(regHandle, eventDescriptor);