Skip to content

Fix lazy-initialization of Trace.s_correlationManager to be thread-safe #62640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephentoub merged 1 commit into from
Dec 10, 2021
Merged

Fix lazy-initialization of Trace.s_correlationManager to be thread-safe #62640

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/Trace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#define TRACE
using System;
using System.Collections;
using System.Threading;

namespace System.Diagnostics
{
Expand All @@ -19,18 +20,11 @@ private Trace()
}

private static CorrelationManager? s_correlationManager;
public static CorrelationManager CorrelationManager
{
get
{
if (s_correlationManager == null)
{
s_correlationManager = new CorrelationManager();
}

return s_correlationManager;
}
}
public static CorrelationManager CorrelationManager =>
Volatile.Read(ref s_correlationManager) ??
Interlocked.CompareExchange(ref s_correlationManager, new CorrelationManager(), null) ??
s_correlationManager;

/// <devdoc>
/// <para>Gets the collection of listeners that is monitoring the trace output.</para>
Expand Down