Simplify lazy children retrieval

References #21
Lawo · Apr 28, 2016 · c0a0a4c · c0a0a4c
1 parent b5c670e
commit c0a0a4c
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 47 deletions.
diff --git a/Lawo.EmberPlusSharp/Glow/GlowLogInterpreter.cs b/Lawo.EmberPlusSharp/Glow/GlowLogInterpreter.cs
@@ -71,10 +71,7 @@ public void ApplyPayload()
                 using (var dummyWriter = new EmberWriter(Stream.Null))
                 {
                     this.root.Read(emberReader, this.pendingInvocations, this.streamedParameters);
-                    dummyWriter.WriteStartApplicationDefinedType(
-                        GlowGlobal.Root.OuterId, GlowRootElementCollection.InnerNumber);
                     this.root.WriteRequest(dummyWriter, this.streamedParameters);
-                    dummyWriter.WriteEndContainer();
                     this.root.SetComplete();
                     this.root.UpdateRetrievalState(true);
                 }

diff --git a/Lawo.EmberPlusSharp/Model/Consumer.cs b/Lawo.EmberPlusSharp/Model/Consumer.cs
@@ -17,7 +17,6 @@ namespace Lawo.EmberPlusSharp.Model
     using System.Threading.Tasks;
 
     using Ember;
-    using Glow;
     using IO;
     using S101;
 
@@ -41,6 +40,7 @@ public sealed class Consumer<TRoot> : IMonitoredConnection
         private int autoSendInterval = 100;
         private CancellationTokenSource autoSendDelayCancellationSource;
         private TaskCompletionSource<bool> hasChangesSetSource;
+        private TaskCompletionSource<bool> isVerifiedSource;
         private bool disposed;
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -109,7 +109,11 @@ public async Task SendAsync()
                 }
 
                 await this.client.SendMessageAsync(this.emberDataMessage, stream.ToArray());
-                await this.RetrieveChildrenAsync();
+            }
+
+            if (await this.SendRequestAsync())
+            {
+                await this.isVerifiedSource.Task;
             }
         }
 
@@ -290,6 +294,7 @@ private async void SendReceiveLoop()
             Exception exception = null;
             this.autoSendDelayCancellationSource = new CancellationTokenSource();
             this.hasChangesSetSource = new TaskCompletionSource<bool>();
+            this.isVerifiedSource = new TaskCompletionSource<bool>();
             this.root.HasChangesSet += this.OnHasChangesSet;
 
             try
@@ -310,6 +315,8 @@ private async void SendReceiveLoop()
                         await providerTask;
                         this.ApplyProviderChanges();
                         await this.RetrieveChildrenAsync();
+                        this.isVerifiedSource.SetResult(false);
+                        this.isVerifiedSource = new TaskCompletionSource<bool>();
                         providerTask = this.WaitForProviderChangesAsync();
                     }
                 }
@@ -467,10 +474,7 @@ private bool WriteRequest(out MemoryStream stream)
             using (stream = new MemoryStream())
             using (var writer = new EmberWriter(stream))
             {
-                writer.WriteStartApplicationDefinedType(GlowGlobal.Root.OuterId, GlowRootElementCollection.InnerNumber);
-                var result = this.root.WriteRequest(writer, this.streamedParameters);
-                writer.WriteEndContainer();
-                return result;
+                return this.root.WriteRequest(writer, this.streamedParameters);
             }
         }
 

diff --git a/Lawo.EmberPlusSharp/Model/Element.cs b/Lawo.EmberPlusSharp/Model/Element.cs
@@ -154,6 +154,16 @@ internal virtual RetrievalState RetrievalState
             set { } // Intentionally empty
         }
 
+        internal void ResetRetrievalState()
+        {
+            this.RetrievalState = RetrievalState.None;
+
+            if (this.parent != null)
+            {
+                this.parent.ResetRetrievalState();
+            }
+        }
+
         internal virtual void SetContext(Context context)
         {
             this.parent = context.Parent;
@@ -265,7 +275,7 @@ internal virtual bool WriteRequest(EmberWriter writer, IStreamedParameterCollect
             return false;
         }
 
-        internal abstract RetrievalState WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations);
+        internal abstract void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations);
 
         internal virtual void SetComplete()
         {

diff --git a/Lawo.EmberPlusSharp/Model/FunctionBase.cs b/Lawo.EmberPlusSharp/Model/FunctionBase.cs
@@ -105,8 +105,7 @@ internal override RetrievalState ReadContents(EmberReader reader, ElementType ac
             return RetrievalState.Complete;
         }
 
-        internal sealed override RetrievalState WriteChanges(
-            EmberWriter writer, IInvocationCollection pendingInvocations)
+        internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations)
         {
             if (this.HasChanges)
             {
@@ -121,8 +120,6 @@ internal sealed override RetrievalState WriteChanges(
                 writer.WriteEndContainer();
                 this.HasChanges = false;
             }
-
-            return RetrievalState.Complete;
         }
 
         internal abstract KeyValuePair<string, ParameterType>[] ReadTupleDescription(

diff --git a/Lawo.EmberPlusSharp/Model/IParent.cs b/Lawo.EmberPlusSharp/Model/IParent.cs
@@ -15,6 +15,8 @@ internal interface IParent
 
         void SetHasChanges();
 
+        void ResetRetrievalState();
+
         string GetPath();
 
         void AppendPath(StringBuilder builder);

diff --git a/Lawo.EmberPlusSharp/Model/Matrix.cs b/Lawo.EmberPlusSharp/Model/Matrix.cs
@@ -188,8 +188,7 @@ internal override RetrievalState ReadContents(EmberReader reader, ElementType ac
             return this.RetrievalState;
         }
 
-        internal sealed override RetrievalState WriteChanges(
-            EmberWriter writer, IInvocationCollection pendingInvocations)
+        internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations)
         {
             ////if (this.HasChanges)
             ////{
@@ -213,8 +212,6 @@ internal sealed override RetrievalState WriteChanges(
             ////    writer.WriteEndContainer();
             ////    this.HasChanges = false;
             ////}
-
-            return this.RetrievalState;
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/Lawo.EmberPlusSharp/Model/Node.cs b/Lawo.EmberPlusSharp/Model/Node.cs
@@ -115,16 +115,13 @@ internal sealed override RetrievalState ReadContents(EmberReader reader, Element
             return this.RetrievalState;
         }
 
-        internal override RetrievalState WriteChanges(
-            EmberWriter writer, IInvocationCollection pendingInvocations)
+        internal override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations)
         {
             if (this.HasChanges)
             {
                 this.WriteChangesCollection(writer, pendingInvocations);
                 this.HasChanges = false;
             }
-
-            return this.RetrievalState;
         }
 
         internal sealed override IElement GetElement(string[] pathElements, int index)

diff --git a/Lawo.EmberPlusSharp/Model/NodeBase.cs b/Lawo.EmberPlusSharp/Model/NodeBase.cs
@@ -57,7 +57,7 @@ public ChildrenRetrievalPolicy ChildrenRetrievalPolicy
 
                     if (this.RetrieveDetailsChangeStatus != RetrieveDetailsChangeStatus.Unchanged)
                     {
-                        this.HasChanges = true;
+                        this.ResetRetrievalState();
                     }
                 }
             }
@@ -75,6 +75,11 @@ void IParent.SetHasChanges()
             this.HasChanges = true;
         }
 
+        void IParent.ResetRetrievalState()
+        {
+            this.ResetRetrievalState();
+        }
+
         void IParent.AppendPath(StringBuilder builder)
         {
             this.AppendPath(builder);
@@ -137,19 +142,9 @@ internal bool WriteCommandCollection(EmberWriter writer, IStreamedParameterColle
 
         internal void WriteChangesCollection(EmberWriter writer, IInvocationCollection pendingInvocations)
         {
-            if (this.children.Count == 0)
-            {
-                if (this.RetrieveDetails && (this.RetrieveDetailsChangeStatus != RetrieveDetailsChangeStatus.Unchanged))
-                {
-                    this.WriteRequest(writer, null);
-                }
-            }
-            else
+            foreach (var child in this.children.Values)
             {
-                foreach (var child in this.children.Values)
-                {
-                    this.RetrievalState &= child.WriteChanges(writer, pendingInvocations);
-                }
+                child.WriteChanges(writer, pendingInvocations);
             }
         }
 

diff --git a/Lawo.EmberPlusSharp/Model/ParameterBase.cs b/Lawo.EmberPlusSharp/Model/ParameterBase.cs
@@ -318,8 +318,7 @@ internal override RetrievalState ReadContents(EmberReader reader, ElementType ac
             return this.RetrievalState;
         }
 
-        internal sealed override RetrievalState WriteChanges(
-            EmberWriter writer, IInvocationCollection pendingInvocations)
+        internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations)
         {
             if (this.HasChanges)
             {
@@ -343,8 +342,6 @@ internal sealed override RetrievalState WriteChanges(
                 writer.WriteEndContainer();
                 this.HasChanges = false;
             }
-
-            return this.RetrievalState;
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/Lawo.EmberPlusSharp/Model/Root.cs b/Lawo.EmberPlusSharp/Model/Root.cs
@@ -135,12 +135,14 @@ internal sealed override bool ReadChildrenCore(EmberReader reader)
         [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", Justification = "Method is not public, CA bug?")]
         internal sealed override bool WriteRequest(EmberWriter writer, IStreamedParameterCollection streamedParameters)
         {
-            return this.WriteCommandCollection(writer, streamedParameters);
+            writer.WriteStartApplicationDefinedType(GlowGlobal.Root.OuterId, GlowRootElementCollection.InnerNumber);
+            var result = this.WriteCommandCollection(writer, streamedParameters);
+            writer.WriteEndContainer();
+            return result;
         }
 
         [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", Justification = "Method is not public, CA bug?")]
-        internal sealed override RetrievalState WriteChanges(
-            EmberWriter writer, IInvocationCollection pendingInvocations)
+        internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations)
         {
             if (this.HasChanges)
             {
@@ -149,8 +151,6 @@ internal sealed override RetrievalState WriteChanges(
                 writer.WriteEndContainer();
                 this.HasChanges = false;
             }
-
-            return this.RetrievalState;
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/Lawo.EmberPlusSharp/Model/ShadowNode.cs b/Lawo.EmberPlusSharp/Model/ShadowNode.cs
@@ -25,11 +25,9 @@ internal sealed override RetrievalState ReadContents(EmberReader reader, Element
             throw new ModelException("Unexpected contents for intermediate node in basePath.");
         }
 
-        internal sealed override RetrievalState WriteChanges(
-            EmberWriter writer, IInvocationCollection pendingInvocations)
+        internal sealed override void WriteChanges(EmberWriter writer, IInvocationCollection pendingInvocations)
         {
             this.HasChanges = false;
-            return this.RetrievalState;
         }
     }
 }