Skip to content

Push duplicated code in Delay into a base class. #663

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
Jun 27, 2018
Merged

Push duplicated code in Delay into a base class. #663

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
459b512
Push duplicated code in Delay into a base class.
danielcweber Jun 26, 2018
7f3882b
Merge branch 'master' into AvoidDuplicatedCodeInDelay
danielcweber Jun 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
51 changes: 17 additions & 34 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/Delay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,37 @@ public Base(IObservable<TSource> source, IScheduler scheduler)

internal abstract class _ : IdentitySink<TSource>
{
public _(IObserver<TSource> observer)
protected IStopwatch _watch;
protected IScheduler _scheduler;

public _(TParent parent, IObserver<TSource> observer)
: base(observer)
{
_scheduler = parent._scheduler;
}

public void Run(TParent parent)
{
_watch = _scheduler.StartStopwatch();

RunCore(parent);

base.Run(parent._source);
}

public abstract void Run(TParent parent);
protected abstract void RunCore(TParent parent);
}

internal abstract class S : _
{
protected readonly object _gate = new object();
protected IDisposable _cancelable;

protected readonly IScheduler _scheduler;

public S(TParent parent, IObserver<TSource> observer)
: base(observer)
: base(parent, observer)
{
_scheduler = parent._scheduler;
}

protected IStopwatch _watch;
protected TimeSpan _delay;
protected bool _ready;
protected bool _active;
Expand All @@ -58,15 +67,6 @@ public S(TParent parent, IObserver<TSource> observer)
private bool _hasFailed;
private Exception _exception;

public override void Run(TParent parent)
{
_watch = _scheduler.StartStopwatch();

RunCore(parent);

base.Run(parent._source);
}

protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
Expand All @@ -77,8 +77,6 @@ protected override void Dispose(bool disposing)
}
}

protected abstract void RunCore(TParent parent);

public override void OnNext(TSource value)
{
var shouldRun = false;
Expand Down Expand Up @@ -257,15 +255,11 @@ protected abstract class L : _
protected IDisposable _cancelable;
private readonly SemaphoreSlim _evt = new SemaphoreSlim(0);

private readonly IScheduler _scheduler;

public L(TParent parent, IObserver<TSource> observer)
: base(observer)
: base(parent, observer)
{
_scheduler = parent._scheduler;
}

protected IStopwatch _watch;
protected TimeSpan _delay;
protected Queue<System.Reactive.TimeInterval<TSource>> _queue = new Queue<System.Reactive.TimeInterval<TSource>>();

Expand All @@ -275,15 +269,6 @@ public L(TParent parent, IObserver<TSource> observer)
private bool _hasFailed;
private Exception _exception;

public override void Run(TParent parent)
{
_watch = _scheduler.StartStopwatch();

RunCore(parent);

base.Run(parent._source);
}

protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
Expand All @@ -294,8 +279,6 @@ protected override void Dispose(bool disposing)
}
}

protected abstract void RunCore(TParent parent);

protected void ScheduleDrain()
{
_stop = new CancellationTokenSource();
Expand Down