Flow EventSources to EventPipe on Windows #18217
Conversation
|
@dotnet-bot test OSX10.12 x64 Checked Innerloop Build and Test |
| #endif // FEATURE_MANAGED_ETW | ||
|
|
||
| if (m_Dispatchers != null && m_eventData[eventId].EnabledForAnyListener) | ||
| if (m_Dispatchers != null && m_eventData[eventId].EnabledForAnyListener) |
There was a problem hiding this comment.
nit, this indentation is off (tabs vs spaces?)
| if (m_provider != null) | ||
| m_eventData[eventId].EnabledForETW = value; | ||
| if (m_etwProvider != null) | ||
| m_eventData[eventId].EnabledForBlobSerializedListeners = value; |
There was a problem hiding this comment.
I don't see where we set EnabledForBlobSerializedListeners to true for the EventPipe case.
There was a problem hiding this comment.
Per our offline conversation, I have fixed this by having a boolean for each source (EventPipe and ETW) so that disabling one does not disable the other.
There was a problem hiding this comment.
I've also added a test to cover this case.
| { | ||
| ThrowEventSourceException(eventName); | ||
| } | ||
| else |
There was a problem hiding this comment.
nit: could be just else if (not an extra if nested inside else block)
|
Thanks @adamsitnik and @vancem for the reviews. Note, I have also validated EventSource tests in CoreFX are passing with these changes. |
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
Signed-off-by: dotnet-bot-corefx-mirror <dotnet-bot@microsoft.com>
Fixes #15494.
Modifies EventSource to be able to concurrently write to both ETW and EventPipe. This is done by creating two EventProvider objects - one for ETW and the other for EventPipe and using them both when writing events.
NOTE: The change to EventSourceTrace.cs is just to put the EventSource in a using block so that we test disposal of the EventSource. The diff on GitHub shows much more of a change than was actually made due to whitespace differences.