From d17d838b711d9aeeb08b59d08b25ca71653e7b2e Mon Sep 17 00:00:00 2001 From: Sung Yoon Whang Date: Sun, 24 May 2020 02:33:12 -0700 Subject: [PATCH] Add comments per code review feedback --- src/coreclr/src/vm/eventpipeprovider.cpp | 5 ++++- src/coreclr/src/vm/eventtrace.cpp | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/coreclr/src/vm/eventpipeprovider.cpp b/src/coreclr/src/vm/eventpipeprovider.cpp index f2d7760..28a9bf6 100644 --- a/src/coreclr/src/vm/eventpipeprovider.cpp +++ b/src/coreclr/src/vm/eventpipeprovider.cpp @@ -255,11 +255,14 @@ void EventPipeProvider::AddEvent(EventPipeEvent &event) isEventFilterDescriptorInitialized = true; } + // NOTE: When we call the callback, we pass in enabled (which is either 1 or 0) as the ControlCode. + // If we want to add new ControlCode, we have to make corresponding change in eventtrace.cpp:EtwCallbackCommon + // to address this. See https://github.com/dotnet/runtime/pull/36733 for more discussions on this. if (pCallbackFunction != NULL && !g_fEEShutDown) { (*pCallbackFunction)( NULL, /* providerId */ - enabled, + enabled, /* ControlCode */ (UCHAR)providerLevel, keywords, 0 /* matchAllKeywords */, diff --git a/src/coreclr/src/vm/eventtrace.cpp b/src/coreclr/src/vm/eventtrace.cpp index 6118a66..ef7f471 100644 --- a/src/coreclr/src/vm/eventtrace.cpp +++ b/src/coreclr/src/vm/eventtrace.cpp @@ -4268,6 +4268,9 @@ VOID EtwCallbackCommon( ctxToUpdate->EventPipeProvider.Level = Level; ctxToUpdate->EventPipeProvider.EnabledKeywordsBitmask = MatchAnyKeyword; ctxToUpdate->EventPipeProvider.IsEnabled = ControlCode; + + // For EventPipe, ControlCode can only be either 0 or 1. + _ASSERTE(ControlCode == 0 || ControlCode == 1); } if ( -- 2.7.4