Skip to content

Fix missing GC events on non-Windows for nativeaot #88282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elinor-fung merged 6 commits into from
Jul 10, 2023
Merged

Fix missing GC events on non-Windows for nativeaot #88282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef10958
Pull in eventtrace.cpp and add macro for RUNTIME_PROVIDER_CATEGORY_EN…
elinor-fung Jun 13, 2023
30d13f0
Split eventtrace into separate files and remove ETW::TypeSystemLog
elinor-fung Jul 1, 2023
764ccab
Split eventtrace in coreclr to match
elinor-fung Jul 2, 2023
64d96e6
Remove RhpEtwExceptionThrown
elinor-fung Jul 6, 2023
0700edc
Keep bulktype only checking for ETW, since it only fires ETW currently
elinor-fung Jul 6, 2023
f7d127b
Rename header
elinor-fung Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/coreclr/nativeaot/Runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ if (WIN32)
windows/PalRedhawkCommon.cpp
windows/PalRedhawkMinWin.cpp
${GC_DIR}/windows/gcenv.windows.cpp
eventtrace.cpp
rheventtrace.cpp
)

list(APPEND FULL_RUNTIME_SOURCES windows/CoffNativeCodeManager.cpp)
Expand Down Expand Up @@ -222,6 +220,18 @@ 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)
Expand Down
5 changes: 5 additions & 0 deletions src/coreclr/nativeaot/Runtime/eventpipe/disableddotnetruntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,3 +632,8 @@ ULONG EventPipeWriteEventGCFitBucketInfo(
{
return 0;
}

bool DotNETRuntimeProvider_IsEnabled(unsigned char level, unsigned long long keyword)
{
return false;
}
15 changes: 15 additions & 0 deletions src/coreclr/nativeaot/Runtime/eventpipe/dotnetruntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3147,3 +3147,18 @@ void InitDotNETRuntime(void)
EventPipeEventGCLOHCompact = EventPipeAdapter::AddEvent(EventPipeProviderDotNETRuntime,208,1,0,EP_EVENT_LEVEL_INFORMATIONAL,true);
EventPipeEventGCFitBucketInfo = EventPipeAdapter::AddEvent(EventPipeProviderDotNETRuntime,209,1,0,EP_EVENT_LEVEL_VERBOSE,true);
}

bool DotNETRuntimeProvider_IsEnabled(unsigned char level, unsigned long long keyword)
{
if (!EventPipeAdapter::Enabled())
return false;

EVENTPIPE_TRACE_CONTEXT& context = MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context.EventPipeProvider;
if (!context.IsEnabled)
return false;

if (level > context.Level)
return false;

return (keyword == (ULONGLONG)0) || (keyword & context.EnabledKeywordsBitmask) != 0;
}
Loading