Initial work to port EventPipe library to NativeAOT

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets

@@ -42,13 +42,17 @@ The .NET Foundation licenses this file to you under the MIT license.
 
  <IlcRPath Condition="'$(IlcRPath)' == '' and '$(TargetOS)' != 'osx'">$ORIGIN</IlcRPath>
  <IlcRPath Condition="'$(IlcRPath)' == '' and '$(TargetOS)' == 'osx'">@executable_path</IlcRPath>
+
+ <EventPipeName>libeventpipe-disabled</EventPipeName>
+ <EventPipeName Condition="'$(EnableNativeEventPipe)' == 'true'">libeventpipe-enabled</EventPipeName>
  </PropertyGroup>
 
  <ItemGroup>
  <NativeLibrary Condition="'$(IlcMultiModule)' == 'true'" Include="$(SharedLibrary)" />
  <NativeLibrary Condition="'$(NativeLib)' == ''" Include="$(IlcSdkPath)libbootstrapper.a" />
  <NativeLibrary Condition="'$(NativeLib)' != ''" Include="$(IlcSdkPath)libbootstrapperdll.a" />
  <NativeLibrary Include="$(IlcSdkPath)$(FullRuntimeName).a" />
+ <NativeLibrary Include="$(IlcSdkPath)$(EventPipeName)$(LibFileExt)" />
  <NativeLibrary Condition="'$(LinkStandardCPlusPlusLibrary)' != 'true' and '$(StaticICULinking)' != 'true'" Include="$(IlcSdkPath)libstdc++compat.a" />
  </ItemGroup>
 

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets

@@ -25,6 +25,8 @@ The .NET Foundation licenses this file to you under the MIT license.
  <EntryPointSymbol Condition="'$(EntryPointSymbol)' == ''">wmainCRTStartup</EntryPointSymbol>
  <LinkerSubsystem Condition="'$(OutputType)' == 'WinExe' and '$(LinkerSubsystem)' == ''">WINDOWS</LinkerSubsystem>
  <LinkerSubsystem Condition="'$(OutputType)' == 'Exe' and '$(LinkerSubsystem)' == ''">CONSOLE</LinkerSubsystem>
+ <EventPipeName>eventpipe-disabled</EventPipeName>
+ <EventPipeName Condition="'$(EnableNativeEventPipe)' == 'true'">eventpipe-enabled</EventPipeName>
  </PropertyGroup>
 
  <!-- Ensure that runtime-specific paths have already been set -->
@@ -33,6 +35,7 @@ The .NET Foundation licenses this file to you under the MIT license.
  <ItemGroup>
  <NativeLibrary Include="$(IlcSdkPath)$(BootstrapperName)$(LibrarySuffix)" />
  <NativeLibrary Include="$(IlcSdkPath)$(FullRuntimeName)$(LibrarySuffix)" />
+ <NativeLibrary Include="$(IlcSdkPath)$(EventPipeName)$(LibFileExt)" />
  <NativeLibrary Condition="'$(IlcMultiModule)' == 'true'" Include="$(SharedLibrary)" />
  </ItemGroup>
 

src/coreclr/nativeaot/Directory.Build.props

@@ -66,6 +66,14 @@
  <PropertyGroup>
  <DefineConstants Condition="'$(FeatureObjCMarshal)' == 'true'">FEATURE_OBJCMARSHAL;$(DefineConstants)</DefineConstants>
  </PropertyGroup>
+ <PropertyGroup>
+ <FeaturePerfTracing>false</FeaturePerfTracing>
+ <FeaturePerfTracing Condition="'$(TargetsWindows)' == 'true'">true</FeaturePerfTracing>
+ </PropertyGroup>
+ <PropertyGroup>
+ <DefineConstants Condition="'$(FeaturePerfTracing)' == 'true'">FEATURE_PERFTRACING;$(DefineConstants)</DefineConstants>
+ </PropertyGroup>
+
 
  <!-- Platform specific properties -->
  <PropertyGroup Condition="'$(Platform)' == 'x64'">

src/coreclr/nativeaot/Runtime/CMakeLists.txt

@@ -1,3 +1,88 @@
+set(EP_GENERATED_HEADER_PATH "${GENERATED_INCLUDE_DIR}")
+include (${CLR_SRC_NATIVE_DIR}/eventpipe/configure.cmake)
+include_directories(${EP_GENERATED_HEADER_PATH})
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(AOT_EVENTPIPE_SHIM_DIR "${CMAKE_CURRENT_SOURCE_DIR}/eventpipe")
+
+set (SHARED_EVENTPIPE_SOURCE_DIR "${CLR_SRC_NATIVE_DIR}/eventpipe")
+include_directories(${SHARED_EVENTPIPE_SOURCE_DIR})
+
+set (AOT_EVENTPIPE_SHIM_SOURCES "")
+set (AOT_EVENTPIPE_SHIM_HEADERS "")
+set (AOT_EVENTPIPE_MANAGED_TO_NATIVE_SOURCES "")
+set (SHARED_DIAGNOSTIC_SERVER_SOURCES "")
+set (SHARED_DIAGNOSTIC_SERVER_HEADERS "")
+set (AOT_EVENTPIPE_DISABLED_SOURCES "")
+
+set (SHARED_EVENTPIPE_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/eventpipe")
+include (${SHARED_EVENTPIPE_SOURCE_PATH}/CMakeLists.txt)
+
+list(APPEND SHARED_DIAGNOSTIC_SERVER_SOURCES
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-sources.c
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-dump-protocol.c
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-eventpipe-protocol.c
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-ipc-pal-namedpipe.c
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-ipc.c
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-process-protocol.c
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-profiler-protocol.c
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-protocol.c
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-server.c
+)
+
+list(APPEND SHARED_DIAGNOSTIC_SERVER_HEADERS
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-dump-protocol.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-eventpipe-protocol.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-getter-setter.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-ipc.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-ipc-pal.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-ipc-pal-types.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-ipc-pal-namedpipe.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-process-protocol.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-profiler-protocol.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-protocol.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-rt.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-rt-config.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-rt-types.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-server.h
+ ${SHARED_EVENTPIPE_SOURCE_DIR}/ds-types.h
+)
+
+list(APPEND AOT_EVENTPIPE_SHIM_SOURCES
+ ${AOT_EVENTPIPE_SHIM_DIR}/ep-rt-aot.cpp
+)
+
+list(APPEND AOT_EVENTPIPE_SHIM_HEADERS
+ ${AOT_EVENTPIPE_SHIM_DIR}/ds-rt-aot.h
+ ${AOT_EVENTPIPE_SHIM_DIR}/ds-rt-types-aot.h
+ ${AOT_EVENTPIPE_SHIM_DIR}/ep-rt-aot.h
+ ${AOT_EVENTPIPE_SHIM_DIR}/ep-rt-config-aot.h
+ ${AOT_EVENTPIPE_SHIM_DIR}/ep-rt-types-aot.h
+)
+
+list(APPEND AOT_EVENTPIPE_MANAGED_TO_NATIVE_SOURCES
+ ${CMAKE_CURRENT_SOURCE_DIR}/eventpipeinternal.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/eventpipeadapter.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/diagnosticserveradapter.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/EnabledEventPipeInterface.cpp
+)
+
+list(APPEND EVENTPIPE_SOURCES
+ ${AOT_EVENTPIPE_SHIM_SOURCES}
+ ${AOT_EVENTPIPE_SHIM_HEADERS}
+ ${AOT_EVENTPIPE_MANAGED_TO_NATIVE_SOURCES}
+ ${SHARED_EVENTPIPE_SOURCES}
+ ${SHARED_EVENTPIPE_HEADERS}
+ ${SHARED_DIAGNOSTIC_SERVER_SOURCES}
+ ${SHARED_DIAGNOSTIC_SERVER_HEADERS}
+ ${SHARED_EVENTPIPE_CONFIG_HEADERS}
+)
+
+list(APPEND AOT_EVENTPIPE_DISABLED_SOURCES
+ ${CMAKE_CURRENT_SOURCE_DIR}/DisabledEventPipeInterface.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/disabledeventpipeinternal.cpp
+)
+
 set(GC_DIR ../../gc)
 
 set(COMMON_RUNTIME_SOURCES
@@ -37,6 +122,8 @@ set(COMMON_RUNTIME_SOURCES
  UniversalTransitionHelpers.cpp
  yieldprocessornormalized.cpp
 
+ EventPipeInterface.h
+
  ${GC_DIR}/gceventstatus.cpp
  ${GC_DIR}/gcload.cpp
  ${GC_DIR}/gcconfig.cpp

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/DisabledEventPipeInterface.cpp

@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+void EventPipeAdapter_Initialize() {}
+
+bool DiagnosticServerAdapter_Initialize() { return false; }
+void DiagnosticServerAdapter_PauseForDiagnosticsMonitor() {}
+
+void EventPipeAdapter_FinishInitialize() {}
+
+void EventPipeAdapter_Shutdown() {}
+bool DiagnosticServerAdapter_Shutdown() { return false; }