@@ -2683,29 +2683,39 @@ extern "C"
2683
2683
ClrFlsThreadTypeSwitch etwRundownThreadHolder (ThreadType_ETWRundownThread);
2684
2684
PMCGEN_TRACE_CONTEXT context = (PMCGEN_TRACE_CONTEXT)CallbackContext;
2685
2685
2686
- BOOLEAN bIsPublicTraceHandle = (context-> RegistrationHandle ==Microsoft_Windows_DotNETRuntimeHandle );
2686
+ BOOLEAN bIsPublicTraceHandle = (context == MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context. EtwProvider );
2687
2687
2688
- BOOLEAN bIsPrivateTraceHandle = (context-> RegistrationHandle ==Microsoft_Windows_DotNETRuntimePrivateHandle );
2688
+ BOOLEAN bIsPrivateTraceHandle = (context == MICROSOFT_WINDOWS_DOTNETRUNTIME_PRIVATE_PROVIDER_DOTNET_Context. EtwProvider );
2689
2689
2690
- BOOLEAN bIsRundownTraceHandle = (context->RegistrationHandle ==Microsoft_Windows_DotNETRuntimeRundownHandle);
2690
+ BOOLEAN bIsRundownTraceHandle = (context == MICROSOFT_WINDOWS_DOTNETRUNTIME_RUNDOWN_PROVIDER_DOTNET_Context.EtwProvider );
2691
+
2692
+ BOOLEAN bIsStressTraceHandle = (context == MICROSOFT_WINDOWS_DOTNETRUNTIME_STRESS_PROVIDER_DOTNET_Context.EtwProvider );
2691
2693
2692
2694
// EventPipeEtwCallback contains some GC eventing functionality shared between EventPipe and ETW.
2693
2695
// Eventually, we'll want to merge these two codepaths whenever we can.
2694
2696
CallbackProviderIndex providerIndex = DotNETRuntime;
2695
2697
DOTNET_TRACE_CONTEXT providerContext = MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context;
2696
- if (context->RegistrationHandle == Microsoft_Windows_DotNETRuntimeHandle) {
2698
+ if (bIsPublicTraceHandle)
2699
+ {
2697
2700
providerIndex = DotNETRuntime;
2698
2701
providerContext = MICROSOFT_WINDOWS_DOTNETRUNTIME_PROVIDER_DOTNET_Context;
2699
- } else if (context->RegistrationHandle == Microsoft_Windows_DotNETRuntimeRundownHandle) {
2702
+ }
2703
+ else if (bIsRundownTraceHandle)
2704
+ {
2700
2705
providerIndex = DotNETRuntimeRundown;
2701
2706
providerContext = MICROSOFT_WINDOWS_DOTNETRUNTIME_RUNDOWN_PROVIDER_DOTNET_Context;
2702
- } else if (context->RegistrationHandle == Microsoft_Windows_DotNETRuntimeStressHandle) {
2707
+ }
2708
+ else if (bIsStressTraceHandle)
2709
+ {
2703
2710
providerIndex = DotNETRuntimeStress;
2704
2711
providerContext = MICROSOFT_WINDOWS_DOTNETRUNTIME_STRESS_PROVIDER_DOTNET_Context;
2705
- } else if (context->RegistrationHandle == Microsoft_Windows_DotNETRuntimePrivateHandle) {
2712
+ }
2713
+ else if (bIsPrivateTraceHandle)
2714
+ {
2706
2715
providerIndex = DotNETRuntimePrivate;
2707
2716
providerContext = MICROSOFT_WINDOWS_DOTNETRUNTIME_PRIVATE_PROVIDER_DOTNET_Context;
2708
- } else {
2717
+ }
2718
+ else {
2709
2719
assert (!" unknown registration handle" );
2710
2720
return ;
2711
2721
}
0 commit comments