Skip to content

Avoid allocation of a SingleAssignmentDisposable in LocalScheduler.WorkItem. #797

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
merged 2 commits into from
Jul 30, 2018
Merged

Avoid allocation of a SingleAssignmentDisposable in LocalScheduler.WorkItem. #797

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53fb7a6
Avoid allocation of a SingleAssignmentDisposable in LocalScheduler.Wo…
danielcweber Jul 21, 2018
e729ab1
Merge branch 'master' into AvoidSingleAssignmentDisposableInWorkItem
Jul 27, 2018
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
9 changes: 4 additions & 5 deletions Rx.NET/Source/src/System.Reactive/Concurrency/LocalScheduler.TimerQueue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,15 +422,14 @@ private abstract class WorkItem : IComparable<WorkItem>, IDisposable
public readonly LocalScheduler Scheduler;
public readonly DateTimeOffset DueTime;

private readonly SingleAssignmentDisposable _disposable;
private IDisposable _disposable;
private int _hasRun;

protected WorkItem(LocalScheduler scheduler, DateTimeOffset dueTime)
{
Scheduler = scheduler;
DueTime = dueTime;

_disposable = new SingleAssignmentDisposable();
_hasRun = 0;
}

Expand All @@ -446,9 +445,9 @@ public void Invoke(IScheduler scheduler)
{
try
{
if (!_disposable.IsDisposed)
if (!Disposable.GetIsDisposed(ref _disposable))
{
_disposable.Disposable = InvokeCore(scheduler);
Disposable.SetSingle(ref _disposable, InvokeCore(scheduler));
}
}
finally
Expand All @@ -462,7 +461,7 @@ public void Invoke(IScheduler scheduler)

public int CompareTo(WorkItem/*!*/ other) => Comparer<DateTimeOffset>.Default.Compare(DueTime, other.DueTime);

public void Dispose() => _disposable.Dispose();
public void Dispose() => Disposable.TryDispose(ref _disposable);
}

/// <summary>
Expand Down