diff options
| author | Sung Yoon Whang <suwhang@microsoft.com> | 2019-06-25 02:47:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 02:47:48 -0700 |
| commit | 3eac718c85cde9121fb5f03da58bb949914b51e1 (patch) | |
| tree | ec00f5b4dbbfa1573f18218bbba691a4aaeda0f7 /src/inc | |
| parent | 46b22d8706a17d48de1259b3cd75a55903bd2dfd (diff) | |
| download | coreclr-3eac718c85cde9121fb5f03da58bb949914b51e1.tar.gz coreclr-3eac718c85cde9121fb5f03da58bb949914b51e1.tar.bz2 coreclr-3eac718c85cde9121fb5f03da58bb949914b51e1.zip | |
Fix broken ETW events (#25364)
Diffstat (limited to 'src/inc')
| -rw-r--r-- | src/inc/eventtracebase.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/inc/eventtracebase.h b/src/inc/eventtracebase.h index aad69b9b41..bda2262bc7 100644 --- a/src/inc/eventtracebase.h +++ b/src/inc/eventtracebase.h @@ -79,14 +79,14 @@ enum EtwThreadFlags // if the fields in the event are not cheap to calculate // #define ETW_EVENT_ENABLED(Context, EventDescriptor) \ - ((MCGEN_ENABLE_CHECK(Context.EtwProvider, EventDescriptor)) || EventPipeHelper::IsEnabled(Context, EventDescriptor.Level, EventDescriptor.Keyword)) + ((Context.EtwProvider->IsEnabled && McGenEventXplatEnabled(Context.EtwProvider, &EventDescriptor)) || EventPipeHelper::IsEnabled(Context, EventDescriptor.Level, EventDescriptor.Keyword)) // // Use this macro to check if a category of events is enabled // #define ETW_CATEGORY_ENABLED(Context, Level, Keyword) \ - ((Context.EtwProvider.IsEnabled && McGenEventProviderEnabled(&(Context.EtwProvider), Level, Keyword)) || EventPipeHelper::IsEnabled(Context, Level, Keyword)) + ((Context.EtwProvider->IsEnabled && McGenEventProviderEnabled(Context.EtwProvider, Level, Keyword)) || EventPipeHelper::IsEnabled(Context, Level, Keyword)) // This macro only checks if a provider is enabled @@ -178,7 +178,7 @@ struct ProfilingScanContext; // Use this macro to check if ETW is initialized and the event is enabled // #define ETW_TRACING_ENABLED(Context, EventDescriptor) \ - ((Context.EtwProvider.IsEnabled && ETW_TRACING_INITIALIZED(Context.EtwProvider.RegistrationHandle) && ETW_EVENT_ENABLED(Context, EventDescriptor))|| \ + ((Context.EtwProvider->IsEnabled && ETW_TRACING_INITIALIZED(Context.EtwProvider->RegistrationHandle) && ETW_EVENT_ENABLED(Context, EventDescriptor))|| \ EventPipeHelper::IsEnabled(Context, EventDescriptor.Level, EventDescriptor.Keyword)) // @@ -190,7 +190,7 @@ struct ProfilingScanContext; // Use this macro to check if ETW is initialized and the category is enabled // #define ETW_TRACING_CATEGORY_ENABLED(Context, Level, Keyword) \ - (ETW_TRACING_INITIALIZED(Context.EtwProvider.RegistrationHandle) && ETW_CATEGORY_ENABLED(Context, Level, Keyword)) + (ETW_TRACING_INITIALIZED(Context.EtwProvider->RegistrationHandle) && ETW_CATEGORY_ENABLED(Context, Level, Keyword)) #define ETWOnStartup(StartEventName, EndEventName) \ ETWTraceStartup trace##StartEventName##(Microsoft_Windows_DotNETRuntimePrivateHandle, &StartEventName, &StartupId, &EndEventName, &StartupId); |