From: John Salem <josalem@microsoft.com>
Date: Thu, 22 Aug 2019 23:46:24 +0000 (-0700)
Subject: Move TypeSystemLog::OnKeywordsChanged from EtwCallback to EtwCallbackCommon to enable... 
X-Git-Tag: submit/tizen/20210909.063632~11030^2~749
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abd06715688d71fc9f67f150bb2dd2367fed503c;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Move TypeSystemLog::OnKeywordsChanged from EtwCallback to EtwCallbackCommon to enable this same behavior in ETW and EventPipe.   This unblocks parity for GCHeapDumps between ETW and EventPipe (dotnet/coreclr#26270)



Commit migrated from https://github.com/dotnet/coreclr/commit/16e83a73cb2df7e2434a7332f7608fc39286ac72
---

diff --git a/src/coreclr/src/vm/eventtrace.cpp b/src/coreclr/src/vm/eventtrace.cpp
index 85aa7c4da89..0c288c93dfc 100644
--- a/src/coreclr/src/vm/eventtrace.cpp
+++ b/src/coreclr/src/vm/eventtrace.cpp
@@ -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.
@@ -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,