Skip to content
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

Alternative fix of #60182 #60298

Merged
merged 3 commits into from
Nov 15, 2021
Merged

Alternative fix of #60182 #60298

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0aa4c6f
Suspend exception when trying to change the timer
sakno Oct 12, 2021
90d4c8c
Replace try-catch with no-throw version of Change method
sakno Oct 12, 2021
fc646f6
Sync with upstream
sakno Nov 8, 2021
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
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/Threading/CancellationTokenSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ public bool TryReset()
// If we successfully reset it and it never fired, then we can be sure it won't trigger cancellation.
bool reset =
_timer is not TimerQueueTimer timer ||
(timer.Change(Timeout.UnsignedInfinite, Timeout.UnsignedInfinite) && !timer._everQueued);
(timer.Change(Timeout.UnsignedInfinite, Timeout.UnsignedInfinite, throwIfDisposed: false) && !timer._everQueued);

if (reset)
{
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/Threading/Timer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,14 +515,14 @@ internal string DisplayString
}
}

internal bool Change(uint dueTime, uint period)
internal bool Change(uint dueTime, uint period, bool throwIfDisposed = true)
stephentoub marked this conversation as resolved.
Show resolved Hide resolved
{
bool success;

lock (_associatedTimerQueue)
{
if (_canceled)
throw new ObjectDisposedException(null, SR.ObjectDisposed_Generic);
return throwIfDisposed ? throw new ObjectDisposedException(null, SR.ObjectDisposed_Generic) : false;

_period = period;

Expand Down