Change fix for Apply in SwitchC.

SodiumFRP · Feb 2, 2018 · 523c276 · 523c276
1 parent c1b2aa0
commit 523c276
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/c#/src/Sodium/Sodium/Behavior.cs b/c#/src/Sodium/Sodium/Behavior.cs
@@ -172,7 +172,7 @@ public T Sample() => Transaction.Apply(
  internal Lazy<T> SampleLazy(Transaction trans)
  {
  LazySample s = new LazySample(this);
- trans.Last(
+ trans.Sample(
  () =>
  {
  s.Value = this.valueUpdate.Match(v => v, this.SampleNoTransaction);

diff --git a/c#/src/Sodium/Sodium/Transaction.cs b/c#/src/Sodium/Sodium/Transaction.cs
@@ -24,7 +24,7 @@ public sealed class Transaction
  private static bool runningOnStartHooks;
  private readonly HashSet<Entry> entries = new HashSet<Entry>();
  private readonly List<Action<Transaction>> sendQueue = new List<Action<Transaction>>();
- private bool finishedPriorityQueue;
+ private List<Action> sampleQueue = new List<Action>();
  private readonly List<Action> lastQueue = new List<Action>();
  private readonly Dictionary<int, Action<Transaction>> postQueue = new Dictionary<int, Action<Transaction>>();
  internal readonly List<Node.Target> TargetsToActivate;
@@ -343,19 +343,17 @@ internal void Send(Action<Transaction> action)
 
  internal void Prioritized(Node node, Action<Transaction> action)
  {
- if (this.finishedPriorityQueue)
+ Entry e = new Entry(node, action);
+ lock (Node.NodeRanksLock)
  {
- this.lastQueue.Add(() => action(this));
- }
- else
- {
- Entry e = new Entry(node, action);
- lock (Node.NodeRanksLock)
- {
- this.prioritizedQueue.Enqueue(e, node.Rank);
- }
- this.entries.Add(e);
+ this.prioritizedQueue.Enqueue(e, node.Rank);
  }
+ this.entries.Add(e);
+ }
+
+ internal void Sample(Action action)
+ {
+ this.sampleQueue.Add(action);
  }
 
  /// <summary>
@@ -439,23 +437,25 @@ internal void Close(bool usingLocal)
 
  this.ReachedClose = true;
 
- this.CheckRegen();
-
- while (true)
+ do
  {
- if (this.prioritizedQueue.Count < 1)
+ while (this.prioritizedQueue.Count > 0)
  {
- break;
- }
+ this.CheckRegen();
 
- Entry e = this.prioritizedQueue.Dequeue();
- this.entries.Remove(e);
- e.Action(this);
+ Entry e = this.prioritizedQueue.Dequeue();
+ this.entries.Remove(e);
+ e.Action(this);
+ }
 
- this.CheckRegen();
+ List<Action> sq = this.sampleQueue;
+ this.sampleQueue = new List<Action>();
+ foreach (Action s in sq)
+ {
+ s();
+ }
  }
-
- this.finishedPriorityQueue = true;
+ while (this.prioritizedQueue.Count > 0);
 
  // ReSharper disable once ForCanBeConvertedToForeach
  for (int i = 0; i < this.lastQueue.Count; i++)