Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

[master] Move TypeSystemLog::OnKeywordsChanged #26270

Merged
Merged
Changes from all commits
Commits
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
13 changes: 6 additions & 7 deletions src/vm/eventtrace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4269,6 +4269,12 @@ VOID EtwCallbackCommon(
#endif // !defined(FEATURE_PAL)
ETW::GCLog::ForceGC(l64ClientSequenceNumber);
}
// TypeSystemLog needs a notification when certain keywords are modified, so
// give it a hook here.
if (g_fEEStarted && !g_fEEShutDown && bIsPublicTraceHandle)
{
ETW::TypeSystemLog::OnKeywordsChanged();
}
}

// Individual callbacks for each EventPipe provider.
Expand Down Expand Up @@ -4488,13 +4494,6 @@ extern "C"

EtwCallbackCommon(providerIndex, ControlCode, Level, MatchAnyKeyword, FilterData, false);

// TypeSystemLog needs a notification when certain keywords are modified, so
// give it a hook here.
if (g_fEEStarted && !g_fEEShutDown && bIsPublicTraceHandle)
{
ETW::TypeSystemLog::OnKeywordsChanged();
}

// A manifest based provider can be enabled to multiple event tracing sessions
// As long as there is atleast 1 enabled session, IsEnabled will be TRUE
// Since classic providers can be enabled to only a single session,
Expand Down