From 6b14cdac139ca8c985ae25b6c91d769e06cdc97f Mon Sep 17 00:00:00 2001
From: sebas77 <ssense@tiscali.it>
Date: Mon, 25 Dec 2017 00:22:04 +0000
Subject: [PATCH] Fix some bugs with the EntityProfiler and remove redundant
 code.

---
 ECS/EnginesRootEngines.cs      |  9 +--------
 ECS/EnginesRootEntities.cs     | 14 +-------------
 ECS/EnginesRootSubmission.cs   |  2 +-
 ECS/Profiler/EngineProfiler.cs |  7 +++----
 4 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/ECS/EnginesRootEngines.cs b/ECS/EnginesRootEngines.cs
index fb47ffe..a74e26c 100644
--- a/ECS/EnginesRootEngines.cs
+++ b/ECS/EnginesRootEngines.cs
@@ -56,9 +56,6 @@ namespace Svelto.ECS
             _implementedInterfaceTypes = new Dictionary<Type, Type[]>();
 #endif
 #if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
-            _addEntityViewToEngine = AddEntityViewToEngine;
-            _removeEntityViewFromEngine = RemoveEntityViewFromEngine;
-
             UnityEngine.GameObject debugEngineObject = new UnityEngine.GameObject("Engine Debugger");
             debugEngineObject.gameObject.AddComponent<EngineProfilerBehaviour>();
 #endif
@@ -206,11 +203,7 @@ namespace Svelto.ECS
 
         readonly Dictionary<Type, Type[]>  _implementedInterfaceTypes;
 #endif    
- 
-#if ENGINE_PROFILER_ENABLED && UNITY_EDITOR       
-        static Action<IHandleEntityViewEngine, IEntityView> _addEntityViewToEngine;
-        static Action<IHandleEntityViewEngine, IEntityView> _removeEntityViewFromEngine;
-#endif
+
         readonly EngineEntityViewDB _engineEntityViewDB;
 
         class DoubleBufferedEntityViews<T> where T : class, IDictionary, new()
diff --git a/ECS/EnginesRootEntities.cs b/ECS/EnginesRootEntities.cs
index 7d258ab..923c2bb 100644
--- a/ECS/EnginesRootEntities.cs
+++ b/ECS/EnginesRootEntities.cs
@@ -222,7 +222,7 @@ namespace Svelto.ECS
                 for (int j = 0; j < count; j++)
                 {
 #if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
-                    EngineProfiler.MonitorRemoveDuration(_removeEntityViewFromEngine, fastList[j], entityView);
+                    EngineProfiler.MonitorRemoveDuration(fastList[j], entityView);
 #else
                     fastList[j].Remove(entityView);
 #endif
@@ -230,18 +230,6 @@ namespace Svelto.ECS
             }
         }
 
-#if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
-        static void AddEntityViewToEngine(IHandleEntityViewEngine engine, IEntityView entityView)
-        {
-            engine.Add(entityView);
-        }
-
-        static void RemoveEntityViewFromEngine(IHandleEntityViewEngine engine, IEntityView entityView)
-        {
-            engine.Remove(entityView);
-        }
-#endif
-
         class GenericEntityFactory : IEntityFactory
         {
             DataStructures.WeakReference<EnginesRoot> _weakEngine;
diff --git a/ECS/EnginesRootSubmission.cs b/ECS/EnginesRootSubmission.cs
index c0c7641..b51f3f2 100644
--- a/ECS/EnginesRootSubmission.cs
+++ b/ECS/EnginesRootSubmission.cs
@@ -148,7 +148,7 @@ namespace Svelto.ECS
                     for (int j = 0; j < count; j++)
                     {
 #if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
-                        EngineProfiler.MonitorAddDuration(_addEntityViewToEngine, fastList[j], entityView);
+                        EngineProfiler.MonitorAddDuration(fastList[j], entityView);
 #else
                         fastList[j].Add(entityView);
 #endif
diff --git a/ECS/Profiler/EngineProfiler.cs b/ECS/Profiler/EngineProfiler.cs
index 5f0765d..3e10786 100644
--- a/ECS/Profiler/EngineProfiler.cs
+++ b/ECS/Profiler/EngineProfiler.cs
@@ -12,26 +12,25 @@ namespace Svelto.ECS.Profiler
     {
         static readonly Stopwatch _stopwatch = new Stopwatch();
 
-        public static void MonitorAddDuration(Action<IHandleEntityViewEngine, IEntityView> addingFunc, IHandleEntityViewEngine engine, IEntityView entityView)
+        public static void MonitorAddDuration(IHandleEntityViewEngine engine, IEntityView entityView)
         {
             EngineInfo info;
             if (engineInfos.TryGetValue(engine.GetType(), out info))
             {
                 _stopwatch.Start();
-                addingFunc(engine, entityView);
+                engine.Add(entityView);
                 _stopwatch.Reset();
 
                 info.AddAddDuration(_stopwatch.Elapsed.TotalMilliseconds);
             }
         }
 
-        public static void MonitorRemoveDuration(Action<IHandleEntityViewEngine, IEntityView> removeFunc, IHandleEntityViewEngine engine, IEntityView entityView)
+        public static void MonitorRemoveDuration(IHandleEntityViewEngine engine, IEntityView entityView)
         {
             EngineInfo info;
             if (engineInfos.TryGetValue(engine.GetType(), out info))
             {
                 _stopwatch.Start();
-                removeFunc(engine, entityView);
                 engine.Remove(entityView);
                 _stopwatch.Reset();