Fix unique ETW events for GC Type logging, so they are also fired across EventPipe...
authorJohn Salem <josalem@microsoft.com>
Fri, 18 Oct 2019 16:59:26 +0000 (09:59 -0700)
committerGitHub <noreply@github.com>
Fri, 18 Oct 2019 16:59:26 +0000 (09:59 -0700)
Commit migrated from https://github.com/dotnet/coreclr/commit/309d1f46f3ab947725f097b62602726a17219f5e

src/coreclr/src/vm/eventtrace.cpp

index b1f25d15469b8d27ba727422b5ba9f870c16b63a..222596318e9e92ada5b63b6d5ec4b5cb54a1b394 100644 (file)
@@ -1135,6 +1135,7 @@ void BulkComLogger::FlushRcw()
 #else
     ULONG result = FireEtXplatGCBulkRCW(m_currRcw, instance, sizeof(EventRCWEntry) * m_currRcw, m_etwRcwData);
 #endif // !defined(FEATURE_PAL)
+    result |= EventPipeWriteEventGCBulkRCW(m_currRcw, instance, sizeof(EventRCWEntry) * m_currRcw, m_etwRcwData);
 
     _ASSERTE(result == ERROR_SUCCESS);
 
@@ -1224,6 +1225,7 @@ void BulkComLogger::FlushCcw()
 #else
     ULONG result = FireEtXplatGCBulkRootCCW(m_currCcw, instance, sizeof(EventCCWEntry) * m_currCcw, m_etwCcwData);
 #endif //!defined(FEATURE_PAL)
+    result |= EventPipeWriteEventGCBulkRootCCW(m_currCcw, instance, sizeof(EventCCWEntry) * m_currCcw, m_etwCcwData);
 
     _ASSERTE(result == ERROR_SUCCESS);
 
@@ -1428,6 +1430,7 @@ void BulkStaticsLogger::FireBulkStaticsEvent()
 #else
     ULONG result = FireEtXplatGCBulkRootStaticVar(m_count, appDomain, instance, m_used, m_buffer);
 #endif //!defined(FEATURE_PAL)
+    result |= EventPipeWriteEventGCBulkRootStaticVar(m_count, appDomain, instance, m_used, m_buffer);
 
     _ASSERTE(result == ERROR_SUCCESS);