From 619f7bcf1e6807bba1df5fc6cfda42533a8a0122 Mon Sep 17 00:00:00 2001 From: Andrew Au Date: Mon, 4 Mar 2019 15:39:41 -0800 Subject: [PATCH] Fix issue 23009 Commit migrated from https://github.com/dotnet/coreclr/commit/119cfe86d996aec5f81a2dae491e9c8c7f445bb5 --- src/coreclr/tests/src/tracing/eventlistener/EventListener.cs | 2 +- .../src/System/Diagnostics/Tracing/EventSource.cs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/coreclr/tests/src/tracing/eventlistener/EventListener.cs b/src/coreclr/tests/src/tracing/eventlistener/EventListener.cs index 1483e5ca399..6637e3fdb3e 100644 --- a/src/coreclr/tests/src/tracing/eventlistener/EventListener.cs +++ b/src/coreclr/tests/src/tracing/eventlistener/EventListener.cs @@ -71,7 +71,7 @@ static int Main(string[] args) } Console.WriteLine("\tEnd: Messaging.\n"); - Console.WriteLine($"\tEventListener recieved {listener.EventCount} event(s)\n"); + Console.WriteLine($"\tEventListener received {listener.EventCount} event(s)\n"); pass = listener.EventCount == messageIterations; } diff --git a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs index 8b92e332c54..de94f4f3c71 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource.cs @@ -1363,7 +1363,10 @@ private unsafe void Initialize(Guid eventSourceGuid, string eventSourceName, str #if FEATURE_PERFTRACING // Register the provider with EventPipe var eventPipeProvider = new OverideEventProvider(this, EventProviderType.EventPipe); - eventPipeProvider.Register(this); + lock (EventListener.EventListenersLock) + { + eventPipeProvider.Register(this); + } #endif // Add the eventSource to the global (weak) list. // This also sets m_id, which is the index in the list. -- GitLab