EveryUpdate

Cysharp · Dec 14, 2023 · a76fbe9 · a76fbe9
1 parent 8a6ccf0
commit a76fbe9
Show file tree

Hide file tree

Showing 10 changed files with 175 additions and 94 deletions.
diff --git a/src/R3/Factories/EveryUpdate.cs b/src/R3/Factories/EveryUpdate.cs
@@ -0,0 +1,88 @@
+namespace R3;
+
+public static partial class Event
+{
+    public static Event<Unit> EveryUpdate()
+    {
+        return new EveryUpdate(EventSystem.DefaultFrameProvider, CancellationToken.None, cancelImmediately: false);
+    }
+
+    public static Event<Unit> EveryUpdate(CancellationToken cancellationToken)
+    {
+        return new EveryUpdate(EventSystem.DefaultFrameProvider, cancellationToken, cancelImmediately: false);
+    }
+
+    public static Event<Unit> EveryUpdate(FrameProvider frameProvider)
+    {
+        return new EveryUpdate(frameProvider, CancellationToken.None, cancelImmediately: false);
+    }
+
+    public static Event<Unit> EveryUpdate(FrameProvider frameProvider, CancellationToken cancellationToken)
+    {
+        return new EveryUpdate(frameProvider, cancellationToken, cancelImmediately: false);
+    }
+
+    public static Event<Unit> EveryUpdate(FrameProvider frameProvider, CancellationToken cancellationToken, bool cancelImmediately)
+    {
+        return new EveryUpdate(frameProvider, cancellationToken, cancelImmediately: cancelImmediately);
+    }
+}
+
+
+internal sealed class EveryUpdate(FrameProvider frameProvider, CancellationToken cancellationToken, bool cancelImmediately) : Event<Unit>
+{
+    protected override IDisposable SubscribeCore(Subscriber<Unit> subscriber)
+    {
+        var runner = new EveryUpdateRunnerWorkItem(subscriber, cancellationToken, cancelImmediately);
+        frameProvider.Register(runner);
+        return runner;
+    }
+
+    class EveryUpdateRunnerWorkItem : IFrameRunnerWorkItem, IDisposable
+    {
+        Subscriber<Unit> subscriber;
+        CancellationToken cancellationToken;
+        CancellationTokenRegistration cancellationTokenRegistration;
+        bool isDisposed;
+
+        public EveryUpdateRunnerWorkItem(Subscriber<Unit> subscriber, CancellationToken cancellationToken, bool cancelImmediately)
+        {
+            this.subscriber = subscriber;
+            this.cancellationToken = cancellationToken;
+
+            if (cancelImmediately && cancellationToken.CanBeCanceled)
+            {
+                cancellationTokenRegistration = cancellationToken.UnsafeRegister(static state =>
+                {
+                    var s = (EveryUpdateRunnerWorkItem)state!;
+                    s.subscriber.OnCompleted();
+                    s.Dispose();
+                }, this);
+            }
+        }
+
+        public bool MoveNext(long frameCount)
+        {
+            if (isDisposed)
+            {
+                return false;
+            }
+
+            if (cancellationToken.IsCancellationRequested)
+            {
+                subscriber.OnCompleted();
+                Dispose();
+                return false;
+            }
+
+            subscriber.OnNext(default);
+            return true;
+        }
+
+        public void Dispose()
+        {
+            isDisposed = true;
+            cancellationTokenRegistration.Dispose();
+        }
+    }
+}
diff --git a/src/R3/Factories/_EventFactory.cs b/src/R3/Factories/_EventFactory.cs
@@ -28,89 +28,5 @@ public static partial class Event
     // AsNeverComplete
 
     // TODO: use SystemDefault
-
-    public static Event<Unit> EveryUpdate()
-    {
-        return new EveryUpdate(EventSystem.DefaultFrameProvider, CancellationToken.None, cancelImmediately: false);
-    }
-
-    public static Event<Unit> EveryUpdate(CancellationToken cancellationToken)
-    {
-        return new EveryUpdate(EventSystem.DefaultFrameProvider, cancellationToken, cancelImmediately: false);
-    }
-
-    public static Event<Unit> EveryUpdate(FrameProvider frameProvider)
-    {
-        return new EveryUpdate(frameProvider, CancellationToken.None, cancelImmediately: false);
-    }
-
-    public static Event<Unit> EveryUpdate(FrameProvider frameProvider, CancellationToken cancellationToken)
-    {
-        return new EveryUpdate(frameProvider, cancellationToken, cancelImmediately: false);
-    }
-
-    public static Event<Unit> EveryUpdate(FrameProvider frameProvider, CancellationToken cancellationToken, bool cancelImmediately)
-    {
-        return new EveryUpdate(frameProvider, cancellationToken, cancelImmediately: cancelImmediately);
-    }
-}
-
-
-
-internal sealed class EveryUpdate(FrameProvider frameProvider, CancellationToken cancellationToken, bool cancelImmediately) : Event<Unit>
-{
-    protected override IDisposable SubscribeCore(Subscriber<Unit> subscriber)
-    {
-        var runner = new EveryUpdateRunnerWorkItem(subscriber, cancellationToken, cancelImmediately);
-        frameProvider.Register(runner);
-        return runner;
-    }
-
-    class EveryUpdateRunnerWorkItem : IFrameRunnerWorkItem, IDisposable
-    {
-        Subscriber<Unit> subscriber;
-        CancellationToken cancellationToken;
-        CancellationTokenRegistration cancellationTokenRegistration;
-        bool isDisposed;
-
-        public EveryUpdateRunnerWorkItem(Subscriber<Unit> subscriber, CancellationToken cancellationToken, bool cancelImmediately)
-        {
-            this.subscriber = subscriber;
-            this.cancellationToken = cancellationToken;
-
-            if (cancelImmediately && cancellationToken.CanBeCanceled)
-            {
-                cancellationTokenRegistration = cancellationToken.UnsafeRegister(static state =>
-                {
-                    var s = (EveryUpdateRunnerWorkItem)state!;
-                    s.subscriber.OnCompleted();
-                    s.Dispose();
-                }, this);
-            }
-        }
-
-        public bool MoveNext(long frameCount)
-        {
-            if (isDisposed)
-            {
-                return false;
-            }
-
-            if (cancellationToken.IsCancellationRequested)
-            {
-                subscriber.OnCompleted();
-                Dispose();
-                return false;
-            }
-
-            subscriber.OnNext(default);
-            return true;
-        }
-
-        public void Dispose()
-        {
-            isDisposed = true;
-            cancellationTokenRegistration.Dispose();
-        }
-    }
+
 }
diff --git a/src/R3/FrameProvider.cs b/src/R3/FrameProvider.cs
@@ -15,7 +15,13 @@ public interface IFrameRunnerWorkItem
 public sealed class ManualFrameProvider : FrameProvider
 {
     long frameCount;
-    FreeListCore<IFrameRunnerWorkItem> list = new FreeListCore<IFrameRunnerWorkItem>();
+    readonly object gate = new object();
+    FreeListCore<IFrameRunnerWorkItem> list;
+
+    public ManualFrameProvider()
+    {
+        list = new FreeListCore<IFrameRunnerWorkItem>(gate);
+    }
 
     public override long GetFrameCount()
     {

diff --git a/tests/R3.Tests/FactoryTests/EmptyTest.cs b/tests/R3.Tests/FactoryTests/EmptyTest.cs
@@ -18,7 +18,7 @@ public void EmptyWithTime()
         using var list = Event.Empty<int>(TimeSpan.FromSeconds(5), fakeTime).ToLiveList();
 
         fakeTime.Advance(TimeSpan.FromSeconds(4));
-        list.AssertIsNoResulted();
+        list.AssertIsNotCompleted();
 
         fakeTime.Advance(TimeSpan.FromSeconds(1));
         list.AssertIsCompleted();

diff --git a/tests/R3.Tests/FactoryTests/EveryUpdateTest.cs b/tests/R3.Tests/FactoryTests/EveryUpdateTest.cs
@@ -0,0 +1,71 @@
+namespace R3.Tests.FactoryTests;
+
+public class EveryUpdateTest
+{
+    [Fact]
+    public void EveryUpdate()
+    {
+        var cts = new CancellationTokenSource();
+        var frameProvider = new ManualFrameProvider();
+
+        var list = Event.EveryUpdate(frameProvider, cts.Token).Select(_ => frameProvider.GetFrameCount()).ToLiveList();
+
+        list.AssertEqual([]);
+
+        frameProvider.Advance();
+        list.AssertEqual([0]);
+
+        frameProvider.Advance(3);
+        list.AssertEqual([0, 1, 2, 3]);
+
+        cts.Cancel();
+        list.AssertIsNotCompleted();
+
+        frameProvider.Advance();
+        list.AssertIsCompleted();
+    }
+
+    [Fact]
+    public void EveryUpdateCancelImmediate()
+    {
+        var cts = new CancellationTokenSource();
+        var frameProvider = new ManualFrameProvider();
+
+        var list = Event.EveryUpdate(frameProvider, cts.Token, cancelImmediately: true).Select(_ => frameProvider.GetFrameCount()).ToLiveList();
+
+        list.AssertEqual([]);
+
+        frameProvider.Advance();
+        list.AssertEqual([0]);
+
+        frameProvider.Advance(3);
+        list.AssertEqual([0, 1, 2, 3]);
+
+        cts.Cancel();
+        list.AssertIsCompleted();
+
+        frameProvider.Advance();
+        list.AssertEqual([0, 1, 2, 3]);
+        list.AssertIsCompleted();
+    }
+
+    [Fact]
+    public void EveryUpdateDispose()
+    {
+        var frameProvider = new ManualFrameProvider();
+
+        var list = Event.EveryUpdate(frameProvider).Select(_ => frameProvider.GetFrameCount()).ToLiveList();
+
+        list.AssertEqual([]);
+
+        frameProvider.Advance();
+        list.AssertEqual([0]);
+
+        frameProvider.Advance(3);
+        list.AssertEqual([0, 1, 2, 3]);
+
+        list.Dispose();
+        frameProvider.Advance();
+        list.AssertEqual([0, 1, 2, 3]);
+    }
+}
diff --git a/tests/R3.Tests/FactoryTests/ReturnOnCompletedTest.cs b/tests/R3.Tests/FactoryTests/ReturnOnCompletedTest.cs
@@ -19,7 +19,7 @@ public void ReturnOnCompleted()
 
             fakeTime.Advance(TimeSpan.FromSeconds(4));
             list.AssertEqual([]);
-            list.AssertIsNoResulted();
+            list.AssertIsNotCompleted();
 
             fakeTime.Advance(TimeSpan.FromSeconds(1));
             list.AssertEqual([]);

diff --git a/tests/R3.Tests/FactoryTests/ReturnTest.cs b/tests/R3.Tests/FactoryTests/ReturnTest.cs
@@ -27,7 +27,7 @@ public void Return()
 
             fakeTime.Advance(TimeSpan.FromSeconds(4));
             list.AssertEqual([]);
-            list.AssertIsNoResulted();
+            list.AssertIsNotCompleted();
 
             fakeTime.Advance(TimeSpan.FromSeconds(1));
             list.AssertEqual([10]);
@@ -63,7 +63,7 @@ public void ReturnOnCompleted()
 
             fakeTime.Advance(TimeSpan.FromSeconds(4));
             list.AssertEqual([]);
-            list.AssertIsNoResulted();
+            list.AssertIsNotCompleted();
 
             fakeTime.Advance(TimeSpan.FromSeconds(1));
             list.AssertEqual([10]);

diff --git a/tests/R3.Tests/FactoryTests/ThrowTest.cs b/tests/R3.Tests/FactoryTests/ThrowTest.cs
@@ -21,7 +21,7 @@ public void Throw()
 
             fakeTime.Advance(TimeSpan.FromSeconds(4));
             list.AssertEqual([]);
-            list.AssertIsNoResulted();
+            list.AssertIsNotCompleted();
 
             fakeTime.Advance(TimeSpan.FromSeconds(1));
             list.AssertEqual([]);

diff --git a/tests/R3.Tests/OperatorTests/WhereTest.cs b/tests/R3.Tests/OperatorTests/WhereTest.cs
@@ -50,7 +50,7 @@ public void WhereCompletable()
         p.PublishOnNext(30);
         list.AssertEqual([1, 3]);
 
-        list.AssertIsNoResulted();
+        list.AssertIsNotCompleted();
 
         p.PublishOnCompleted(default);
 
@@ -84,7 +84,7 @@ public void WhereCompletableIndexed()
         p.PublishOnNext(8);
         list.AssertEqual([1, 5, 8]);
 
-        list.AssertIsNoResulted();
+        list.AssertIsNotCompleted();
 
         p.PublishOnCompleted(default);
 

diff --git a/tests/R3.Tests/_TestHelper.cs b/tests/R3.Tests/_TestHelper.cs
@@ -15,7 +15,7 @@ public static void AssertIsCompleted<T>(this LiveList<T> list)
         list.IsCompleted.Should().BeTrue();
     }
 
-    public static void AssertIsNoResulted<T>(this LiveList<T> list)
+    public static void AssertIsNotCompleted<T>(this LiveList<T> list)
     {
         list.IsCompleted.Should().BeFalse();
     }