Skip to content

Save the allocation of a SingleAssignmentDisposable in CombineLatest. #777

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 1 commit into from
Jul 6, 2018
Merged

Save the allocation of a SingleAssignmentDisposable in CombineLatest. #777

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
15 changes: 7 additions & 8 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/CombineLatest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,10 @@ public void Run(IEnumerable<IObservable<TSource>> sources)
{
var j = i;

var d = new SingleAssignmentDisposable();
_subscriptions[j] = d;

var o = new SourceObserver(this, j);
d.Disposable = srcs[j].SubscribeSafe(o);
_subscriptions[j] = o;

o.SetResource(srcs[j].SubscribeSafe(o));
}

SetUpstream(StableCompositeDisposable.CreateTrusted(_subscriptions));
Expand Down Expand Up @@ -496,7 +495,7 @@ private void OnCompleted(int index)
}
}

private sealed class SourceObserver : IObserver<TSource>
private sealed class SourceObserver : SafeObserver<TSource>
{
private readonly _ _parent;
private readonly int _index;
Expand All @@ -507,17 +506,17 @@ public SourceObserver(_ parent, int index)
_index = index;
}

public void OnNext(TSource value)
public override void OnNext(TSource value)
{
_parent.OnNext(_index, value);
}

public void OnError(Exception error)
public override void OnError(Exception error)
{
_parent.OnError(error);
}

public void OnCompleted()
public override void OnCompleted()
{
_parent.OnCompleted(_index);
}
Expand Down