Skip to content

An allocation in BasicProducer.SubscribeRaw can be saved in most cases. #602

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 3 commits into from
Jun 19, 2018
Merged

An allocation in BasicProducer.SubscribeRaw can be saved in most cases. #602

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48818b1
An allocation in BasicProducer.SubscribeRaw can be saved in most cases.
danielcweber Jun 15, 2018
0a964a5
Bugfix: Assign the safeObserver's resource in any path.
danielcweber Jun 18, 2018
ba0127d
Merge branch 'master' into SaveAllocationInBasicProducer
danielcweber Jun 19, 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
20 changes: 12 additions & 8 deletions Rx.NET/Source/src/System.Reactive/Internal/Producer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,31 +38,35 @@ public IDisposable Subscribe(IObserver<TSource> observer)

public IDisposable SubscribeRaw(IObserver<TSource> observer, bool enableSafeguard)
{
var subscription = new SingleAssignmentDisposable();
IDisposable run;
ISafeObserver<TSource> safeObserver = null;

//
// See AutoDetachObserver.cs for more information on the safeguarding requirement and
// its implementation aspects.
//
if (enableSafeguard)
{
var safeObserver = SafeObserver<TSource>.Wrap(observer);
safeObserver.SetResource(subscription);
observer = safeObserver;
observer = safeObserver = SafeObserver<TSource>.Wrap(observer);
}

if (CurrentThreadScheduler.IsScheduleRequired)
{
var runAssignable = new SingleAssignmentDisposable();

CurrentThreadScheduler.Instance.ScheduleAction(
(@this: this, subscription, observer),
tuple => tuple.subscription.Disposable = [email protected](tuple.observer));
(@this: this, runAssignable, observer),
tuple => tuple.runAssignable.Disposable = [email protected](tuple.observer));

run = runAssignable;
}
else
{
subscription.Disposable = Run(observer);
run = Run(observer);
}

return subscription;
safeObserver?.SetResource(run);
return run;
}

/// <summary>
Expand Down