Skip to content

Fix DebounceFrame and ThrottleLastFrame behavior on re-entry #318

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix DebounceFrame and ThrottleLastFrame behavior on re-entry #318

Show file tree
Hide file tree
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: 8 additions & 7 deletions src/R3/Operators/DebounceFrame.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sealed class _DebounceFrame : Observer<T>, IFrameRunnerWorkItem
readonly object gate = new object();
readonly FrameProvider frameProvider;
T? latestValue;
bool hasvalue;
bool hasValue;
int currentFrame;
bool isRunning;

Expand All @@ -44,7 +44,7 @@ protected override void OnNextCore(T value)
lock (gate)
{
latestValue = value;
hasvalue = true;
hasValue = true;
currentFrame = 0;

if (!isRunning)
Expand All @@ -64,10 +64,10 @@ protected override void OnCompletedCore(Result result)
{
lock (gate)
{
if (hasvalue)
if (hasValue)
{
observer.OnNext(latestValue!);
hasvalue = false;
hasValue = false;
latestValue = default;
}
}
Expand All @@ -80,15 +80,16 @@ bool IFrameRunnerWorkItem.MoveNext(long _)

lock (gate)
{
if (hasvalue)
if (hasValue)
{
if (++currentFrame == frameCount)
{
observer.OnNext(latestValue!);
hasvalue = false;
var value = latestValue!;
hasValue = false;
latestValue = default;
currentFrame = 0;
isRunning = false;
observer.OnNext(value);
return false;
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/R3/Operators/ThrottleLastFrame.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,10 @@ bool IFrameRunnerWorkItem.MoveNext(long _)
{
if (++currentFrame == frameCount)
{
observer.OnNext(lastValue!);
var value = lastValue!;
lastValue = default;
running = false;
observer.OnNext(value);
return false;
}
}
Expand Down
40 changes: 40 additions & 0 deletions tests/R3.Tests/OperatorTests/DebounceThrottleFirstThrottleLastTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,4 +445,44 @@ public void DebounceSelector()

list.AssertIsCompleted();
}


// + Publish from OnNext
[Fact]
public void DebounceFrameReentry()
{
var frameProvider = new FakeFrameProvider();

var publisher = new Subject<int>();
var list = publisher.DebounceFrame(3, frameProvider).Do(_ => publisher.OnNext(2)).ToLiveList();

publisher.OnNext(1);
list.AssertEqual([]);

frameProvider.Advance(3);

list.AssertEqual([1]);

frameProvider.Advance(3);
list.AssertEqual([1, 2]);
}

[Fact]
public void ThrottleLastFrameReentry()
{
var frameProvider = new FakeFrameProvider();

var publisher = new Subject<int>();
var list = publisher.ThrottleLastFrame(3, frameProvider).Do(_ => publisher.OnNext(2)).ToLiveList();

publisher.OnNext(1);
list.AssertEqual([]);

frameProvider.Advance(3);

list.AssertEqual([1]);

frameProvider.Advance(3);
list.AssertEqual([1, 2]);
}
}