Skip to content

Commit

Permalink
Use the new lock type in TimerQueue (#103104)
Browse files Browse the repository at this point in the history
Co-authored-by: Eduardo Manuel Velarde Polar <evelardepola@microsoft.com>
Co-authored-by: Koundinya Veluri <kouvel@users.noreply.github.com>
  • Loading branch information
3 people committed Jul 3, 2024
1 parent 898ffc5 commit 7875486
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions src/libraries/System.Private.CoreLib/src/System/Threading/Timer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ private bool EnsureTimerFiresBy(uint requestedDuration)
// need to look at the long list because the current time will be <= _currentAbsoluteThreshold.
private const int ShortTimersThresholdMilliseconds = 333;

// Lock shared by the TimerQueue and associated TimerQueueTimer instances
internal Lock SharedLock { get; } = new Lock();

// Fire any timers that have expired, and update the native timer to schedule the rest of them.
// We're in a thread pool work item here, and if there are multiple timers to be fired, we want
// to queue all but the first one. The first may can then be invoked synchronously or queued,
Expand All @@ -181,7 +184,7 @@ private void FireNextTimers()
// are queued to the ThreadPool.
TimerQueueTimer? timerToFireOnThisThread = null;

lock (this)
lock (SharedLock)
{
// Since we got here, that means our previous timer has fired.
_isTimerScheduled = false;
Expand Down Expand Up @@ -540,7 +543,7 @@ internal bool Change(uint dueTime, uint period)
{
bool success;

lock (_associatedTimerQueue)
lock (_associatedTimerQueue.SharedLock)
{
if (_canceled)
{
Expand All @@ -567,7 +570,7 @@ internal bool Change(uint dueTime, uint period)

public void Dispose()
{
lock (_associatedTimerQueue)
lock (_associatedTimerQueue.SharedLock)
{
if (!_canceled)
{
Expand All @@ -584,7 +587,7 @@ public bool Dispose(WaitHandle toSignal)
bool success;
bool shouldSignal = false;

lock (_associatedTimerQueue)
lock (_associatedTimerQueue.SharedLock)
{
if (_canceled)
{
Expand All @@ -608,7 +611,7 @@ public bool Dispose(WaitHandle toSignal)

public ValueTask DisposeAsync()
{
lock (_associatedTimerQueue)
lock (_associatedTimerQueue.SharedLock)
{
object? notifyWhenNoCallbacksRunning = _notifyWhenNoCallbacksRunning;

Expand Down Expand Up @@ -668,9 +671,9 @@ public ValueTask DisposeAsync()

internal void Fire(bool isThreadPool = false)
{
bool canceled = false;
bool canceled;

lock (_associatedTimerQueue)
lock (_associatedTimerQueue.SharedLock)
{
canceled = _canceled;
if (!canceled)
Expand All @@ -683,7 +686,7 @@ internal void Fire(bool isThreadPool = false)
CallCallback(isThreadPool);

bool shouldSignal;
lock (_associatedTimerQueue)
lock (_associatedTimerQueue.SharedLock)
{
_callbacksRunning--;
shouldSignal = _canceled && _callbacksRunning == 0 && _notifyWhenNoCallbacksRunning != null;
Expand Down Expand Up @@ -943,7 +946,7 @@ public static long ActiveCount
long count = 0;
foreach (TimerQueue queue in TimerQueue.Instances)
{
lock (queue)
lock (queue.SharedLock)
{
count += queue.ActiveCount;
}
Expand Down

0 comments on commit 7875486

Please sign in to comment.