UPM package version 1.5.6

sebas77 · Feb 22, 2020 · 685d320 · 685d320
1 parent 0a181dd
commit 685d320
Show file tree

Hide file tree

Showing 103 changed files with 508 additions and 362 deletions.
diff --git a/BreakIt.cs.meta b/BreakIt.cs.meta
diff --git a/Collections.meta b/Collections.meta
diff --git a/Collections/ParallelTaskCollection.cs.meta b/Collections/ParallelTaskCollection.cs.meta
diff --git a/Collections/SerialTaskCollection.cs.meta b/Collections/SerialTaskCollection.cs.meta
diff --git a/Collections/TaskCollection.StructFriendlyStack.cs.meta b/Collections/TaskCollection.StructFriendlyStack.cs.meta
diff --git a/Collections/TaskCollection.cs b/Collections/TaskCollection.cs
@@ -216,7 +216,6 @@ public override string ToString()
         CollectionTask                           _currentTask;
         int                                      _currentStackIndex;
         readonly FasterList<StructFriendlyStack> _listOfStacks;
-        T                                        _current;
         string                                   _name;
 
         const int _INITIAL_STACK_SIZE = 1;

diff --git a/Collections/TaskCollection.cs.meta b/Collections/TaskCollection.cs.meta
diff --git a/ContinuationWrapperPool.cs.meta b/ContinuationWrapperPool.cs.meta
diff --git a/DBC.cs.meta b/DBC.cs.meta
diff --git a/Enumerators.meta b/Enumerators.meta
diff --git a/Enumerators/ActionEnumerators.meta b/Enumerators/ActionEnumerators.meta
diff --git a/Enumerators/ActionEnumerators/InterleavedLoopActionEnumerator.cs.meta b/Enumerators/ActionEnumerators/InterleavedLoopActionEnumerator.cs.meta
diff --git a/Enumerators/ActionEnumerators/SmartFunctionEnumerator.cs b/Enumerators/ActionEnumerators/SmartFunctionEnumerator.cs
@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Collections.Generic;
 using Svelto.Utilities;
 
@@ -10,7 +9,7 @@ namespace Svelto.Tasks.Enumerators
     /// <typeparam name="T">
     /// facilitate the use of counters that can be passed by reference to the callback function
     /// </typeparam>
-    public class SmartFunctionEnumerator<T>:IEnumerator, IEnumerator<T>
+    public class SmartFunctionEnumerator<T>: IEnumerator<T>
     {
         public SmartFunctionEnumerator(FuncRef<T, bool> func)
         {
@@ -60,6 +59,5 @@ public void Dispose()
         T                _value;
 
         string _name;
-        T _current;
     }
 }
diff --git a/Enumerators/ActionEnumerators/SmartFunctionEnumerator.cs.meta b/Enumerators/ActionEnumerators/SmartFunctionEnumerator.cs.meta
diff --git a/Enumerators/ActionEnumerators/TimedLoopFunctionEnumerator.cs.meta b/Enumerators/ActionEnumerators/TimedLoopFunctionEnumerator.cs.meta
diff --git a/Enumerators/EnumeratorWithProgress.cs.meta b/Enumerators/EnumeratorWithProgress.cs.meta
diff --git a/Enumerators/ExceptionHandlingEnumerator.cs.meta b/Enumerators/ExceptionHandlingEnumerator.cs.meta
diff --git a/Enumerators/ReusableWaitForSecondsEnumerator.cs.meta b/Enumerators/ReusableWaitForSecondsEnumerator.cs.meta
diff --git a/Enumerators/TaskServiceEnumerator.cs.meta b/Enumerators/TaskServiceEnumerator.cs.meta
diff --git a/Enumerators/Unity.meta b/Enumerators/Unity.meta
diff --git a/Enumerators/Unity/AsyncOperationEnumerator.cs.meta b/Enumerators/Unity/AsyncOperationEnumerator.cs.meta
diff --git a/Enumerators/Unity/UnityWebRequestEnumerator.cs.meta b/Enumerators/Unity/UnityWebRequestEnumerator.cs.meta
diff --git a/Enumerators/Unity/WWWEnumerator.cs.meta b/Enumerators/Unity/WWWEnumerator.cs.meta
diff --git a/Enumerators/Unity/YieldInstructionEnumerator.cs.meta b/Enumerators/Unity/YieldInstructionEnumerator.cs.meta
diff --git a/Enumerators/WaitForSecondsEnumerator.cs.meta b/Enumerators/WaitForSecondsEnumerator.cs.meta
diff --git a/Enumerators/WaitForSignalEnumerator.cs.meta b/Enumerators/WaitForSignalEnumerator.cs.meta
diff --git a/ITaskRoutine.cs.meta b/ITaskRoutine.cs.meta
diff --git a/LICENSE.meta b/LICENSE.meta
diff --git a/Parallelism.meta b/Parallelism.meta
diff --git a/Parallelism/ISveltoJob.cs.meta b/Parallelism/ISveltoJob.cs.meta
diff --git a/Parallelism/MultiThreadedParallelTaskCollection.cs.meta b/Parallelism/MultiThreadedParallelTaskCollection.cs.meta
diff --git a/Parallelism/ParallelRunEnumerator.cs.meta b/Parallelism/ParallelRunEnumerator.cs.meta
diff --git a/Profiler.meta b/Profiler.meta
diff --git a/Profiler/Pix.meta b/Profiler/Pix.meta
diff --git a/Profiler/Pix/PIXWrapper.cs.meta b/Profiler/Pix/PIXWrapper.cs.meta
diff --git a/Profiler/TaskInfo.cs b/Profiler/TaskInfo.cs
@@ -1,6 +1,5 @@
 #if TASKS_PROFILER_ENABLED
 using System;
-using System.Collections.Generic;
 
 //This profiler is based on the Entitas Visual Debugging tool 
 //https://github.com/sschmid/Entitas-CSharp
@@ -9,70 +8,68 @@ namespace Svelto.Tasks.Profiler
 {
     public struct TaskInfo
     {
-        const int NUM_FRAMES_TO_AVERAGE = 100;
-
-        public string taskName { get { return _threadInfo.FastConcat(_taskName); } }
-        public double lastUpdateDuration { get { return _lastUpdateDuration; } }
-        public double minUpdateDuration { get { return _minUpdateDuration; } }
-        public double maxUpdateDuration { get { return _maxUpdateDuration; } }
-        public double currentUpdateDuration { get { return _updateFrameTimes.Count == 0 ? 0 : _currentUpdateDuration / _updateFrameTimes.Count; } }
-        public double averageUpdateDuration { get { return _averageUpdateDuration / _totaleFrames; } }
-
-        public TaskInfo(string name) : this()
+        public string taskName => _taskName;
+        public double minUpdateDuration => _minUpdateDuration;
+        public double maxUpdateDuration => _maxUpdateDuration;
+        public float currentUpdateDuration => times[_frame];
+        public float averageUpdateDuration
         {
-            _taskName = " ".FastConcat(name);
-
-            _updateFrameTimes = new Queue<double>();
-
-            _currentUpdateDuration = 0;
-            _averageUpdateDuration = 0;
-            _minUpdateDuration     = 0;
-            _maxUpdateDuration     = 0;
-            _totaleFrames          = 0;
-            _updateFrameTimes.Clear();
+            get
+            {
+                float sum = 0;
+                var length = ITERATIONS >> 2;
+                for (int i = 0; i < length; i++)
+                {
+                    var index = i << 2;
+
+                    sum += times[index];
+                    sum += times[index + 1];
+                    sum += times[index + 2];
+                    sum += times[index + 3];
+                }
+
+                return sum / ITERATIONS;
+            }
         }
-
-        public void AddUpdateDuration(double updateDuration)
+        public uint deltaCalls => _deltaCalls;
+
+        public TaskInfo(string name, string runnerName) : this()
         {
-            AddUpdateDurationForType(updateDuration);
+            _taskName = " ".FastConcat(name, ":", runnerName);
+            times = new float[ITERATIONS];
         }
 
-        public void AddThreadInfo(string threadInfo)
+        public void AddUpdateDuration(float updateDuration)
         {
-            _threadInfo = threadInfo;
+            _currentUpdateDuration += updateDuration;
+
+            _deltaCalls++;
         }
 
-        void AddUpdateDurationForType(double updateDuration)
+        public void MarkNextFrame()
         {
-            if ((updateDuration < _minUpdateDuration) || (Math.Abs(_minUpdateDuration) < double.Epsilon))
-                _minUpdateDuration = updateDuration;
-            if (updateDuration > _maxUpdateDuration)
-                _maxUpdateDuration = updateDuration;
-
-            if (_updateFrameTimes.Count == NUM_FRAMES_TO_AVERAGE)
-                _currentUpdateDuration -= _updateFrameTimes.Dequeue();
-
-            _currentUpdateDuration += updateDuration;
-            _averageUpdateDuration += updateDuration;
-            _updateFrameTimes.Enqueue(updateDuration);
-            _lastUpdateDuration = updateDuration;
-            _totaleFrames++;
+            if (_frame == 0)
+            {
+                _minUpdateDuration = float.MaxValue;
+                _maxUpdateDuration = float.MinValue;
+            }
+
+            if (_currentUpdateDuration < _minUpdateDuration) _minUpdateDuration = _currentUpdateDuration;
+            if (_currentUpdateDuration > _maxUpdateDuration) _maxUpdateDuration = _currentUpdateDuration;
+
+            times[_frame] = _currentUpdateDuration;
+            _frame = (_frame + 1) & (ITERATIONS - 1);
+
+            _deltaCalls = 0;
+            _currentUpdateDuration = 0;
         }
 
-        double _currentUpdateDuration;
-        double _averageUpdateDuration;
-        double _lastUpdateDuration;
-        double _maxUpdateDuration;
-        double _minUpdateDuration;
-
-        double _totaleFrames;
-
+        float _currentUpdateDuration; float _maxUpdateDuration; float _minUpdateDuration;
+        uint _deltaCalls; uint _frame;
         readonly string _taskName;
+        readonly float[] times;
 
-        string _threadInfo;
-
-        //use a queue to averave out the last 30 frames
-        readonly Queue<double> _updateFrameTimes;
+        const int ITERATIONS = 32;
     }
 }
 #endif
diff --git a/Profiler/TaskInfo.cs.meta b/Profiler/TaskInfo.cs.meta