modtainers
/
Svelto.ECS
mirror of https://github.com/sebas77/Svelto.ECS
Watch 4
Star 0
Fork 0
Code Issues 0 Releases 49 Wiki Activity
Browse Source

remove the obsolete profiler, better to use the unity profiler for ECS 

much more profiler info when the ENABLE_PLATFORM_PROFILER is on
tags/2.7
sebas77 5 years ago
parent
07a6d108d6
commit
77ea2bb08f
12 changed files with 150 additions and 138 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +31
    -15
      Svelto.ECS/DataStructures/TypeSafeDictionary.cs
  2. +0
    -5
      Svelto.ECS/EnginesRoot.DoubleBufferedEntityViews.cs
  3. +0
    -20
      Svelto.ECS/EnginesRoot.Engines.cs
  4. +80
    -66
      Svelto.ECS/EnginesRoot.Entities.cs
  5. +1
    -5
      Svelto.ECS/EnginesRoot.GenericEntityFactory.cs
  6. +1
    -5
      Svelto.ECS/EnginesRoot.GenericEntityFunctions.cs
  7. +8
    -9
      Svelto.ECS/EnginesRoot.Submission.cs
  8. +17
    -8
      Svelto.ECS/IEngine.cs
  9. +4
    -3
      Svelto.ECS/MultiEntitiesEngine.cs
  10. +2
    -0
      Svelto.ECS/MultiEntityViewsEngine.cs
  11. +3
    -1
      Svelto.ECS/SingleEntityEngine.cs
  12. +3
    -1
      Svelto.ECS/SingleEntityViewEngine.cs

+ 31
- 15
Svelto.ECS/DataStructures/TypeSafeDictionary.cs View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using Svelto.Common;
using Svelto.DataStructures;
using Svelto.DataStructures.Experimental;

@@ -10,14 +11,15 @@ namespace Svelto.ECS.Internal
ITypeSafeDictionary Create();
void RemoveEntitiesFromEngines(Dictionary<Type, FasterList<IHandleEntityViewEngineAbstracted>>
entityViewEnginesDB);
entityViewEnginesDB, PlatformProfiler profiler);

void MoveEntityFromDictionaryAndEngines(EGID fromEntityGid, EGID toEntityID, ITypeSafeDictionary toGroup,
Dictionary<Type, FasterList<IHandleEntityViewEngineAbstracted>>
entityViewEnginesDB);
entityViewEnginesDB, PlatformProfiler profiler);
void FillWithIndexedEntities(ITypeSafeDictionary entities);
void AddEntitiesToEngines(Dictionary<Type, FasterList<IHandleEntityViewEngineAbstracted>> entityViewEnginesDB);
void AddEntitiesToEngines(Dictionary<Type, FasterList<IHandleEntityViewEngineAbstracted>> entityViewEnginesDB,
PlatformProfiler profiler);
void AddCapacity(int size);
@@ -58,7 +60,8 @@ namespace Svelto.ECS.Internal
}

public void AddEntitiesToEngines(
Dictionary<Type, FasterList<IHandleEntityViewEngineAbstracted>> entityViewEnginesDB)
Dictionary<Type, FasterList<IHandleEntityViewEngineAbstracted>> entityViewEnginesDB,
PlatformProfiler profiler)
{
int count;
TValue[] values = GetValuesArray(out count);
@@ -67,7 +70,7 @@ namespace Svelto.ECS.Internal
{
TValue entity = values[i];

AddEntityViewToEngines(entityViewEnginesDB, ref entity);
AddEntityViewToEngines(entityViewEnginesDB, ref entity, profiler);
}
}

@@ -82,7 +85,8 @@ namespace Svelto.ECS.Internal
}

void AddEntityViewToEngines(Dictionary<Type, FasterList<IHandleEntityViewEngineAbstracted>> entityViewEnginesDB,
ref TValue entity)
ref TValue entity,
PlatformProfiler profiler)
{
FasterList<IHandleEntityViewEngineAbstracted> entityViewsEngines;
//get all the engines linked to TValue
@@ -91,7 +95,10 @@ namespace Svelto.ECS.Internal
{
try
{
(entityViewsEngines[i] as IHandleEntityStructEngine<TValue>).AddInternal(ref entity);
using (profiler.Sample((entityViewsEngines[i] as EngineInfo).name))
{
(entityViewsEngines[i] as IHandleEntityStructEngine<TValue>).AddInternal(ref entity);
}
}
catch (Exception e)
{
@@ -103,14 +110,14 @@ namespace Svelto.ECS.Internal

public void MoveEntityFromDictionaryAndEngines(EGID fromEntityGid, EGID toEntityID, ITypeSafeDictionary toGroup,
Dictionary<Type, FasterList<IHandleEntityViewEngineAbstracted>>
entityViewEnginesDB)
entityViewEnginesDB, PlatformProfiler profiler)
{
int count;
var fasterValuesBuffer = GetValuesArray(out count);
var valueIndex = GetValueIndex(fromEntityGid.entityID);
if (entityViewEnginesDB != null)
RemoveEntityViewFromEngines(entityViewEnginesDB, ref fasterValuesBuffer[valueIndex]);
RemoveEntityViewFromEngines(entityViewEnginesDB, ref fasterValuesBuffer[valueIndex], profiler);

if (toGroup != null)
{
@@ -120,21 +127,25 @@ namespace Svelto.ECS.Internal
if (entityViewEnginesDB != null)
AddEntityViewToEngines(entityViewEnginesDB, ref toGroupCasted.GetValuesArray(out count)
[toGroupCasted.GetValueIndex(toEntityID.entityID)]);
[toGroupCasted.GetValueIndex(toEntityID.entityID)], profiler);
}

Remove(fromEntityGid.entityID);
}

static void RemoveEntityViewFromEngines
(Dictionary<Type, FasterList<IHandleEntityViewEngineAbstracted>> entityViewEnginesDB, ref TValue entity)
(Dictionary<Type, FasterList<IHandleEntityViewEngineAbstracted>> entityViewEnginesDB, ref TValue entity,
PlatformProfiler profiler)
{
FasterList<IHandleEntityViewEngineAbstracted> entityViewsEngines;
if (entityViewEnginesDB.TryGetValue(_type, out entityViewsEngines))
for (int i = 0; i < entityViewsEngines.Count; i++)
try
{
(entityViewsEngines[i] as IHandleEntityStructEngine<TValue>).RemoveInternal(ref entity);
using (profiler.Sample((entityViewsEngines[i] as EngineInfo).name, _typeName))
{
(entityViewsEngines[i] as IHandleEntityStructEngine<TValue>).RemoveInternal(ref entity);
}
}
catch (Exception e)
{
@@ -143,13 +154,13 @@ namespace Svelto.ECS.Internal
}
}
public void RemoveEntitiesFromEngines(Dictionary<Type, FasterList<IHandleEntityViewEngineAbstracted>> entityViewEnginesDB)
public void RemoveEntitiesFromEngines(Dictionary<Type, FasterList<IHandleEntityViewEngineAbstracted>> entityViewEnginesDB, PlatformProfiler profiler)
{
int count;
TValue[] values = GetValuesArray(out count);

for (int i = 0; i < count; i++)
RemoveEntityViewFromEngines(entityViewEnginesDB, ref values[i]);
RemoveEntityViewFromEngines(entityViewEnginesDB, ref values[i], profiler);
}
public ITypeSafeDictionary Create()
@@ -198,5 +209,10 @@ namespace Svelto.ECS.Internal
}
static readonly Type _type = typeof(TValue);
static readonly string _typeName
#if ENABLE_PLATFORM_PROFILER
= _type.Name
#endif
;
}
}

+ 0
- 5
Svelto.ECS/EnginesRoot.DoubleBufferedEntityViews.cs View File

@@ -1,13 +1,8 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Svelto.DataStructures.Experimental;
using Svelto.ECS.Internal;

#if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
using Svelto.ECS.Profiler;
#endif

namespace Svelto.ECS
{
public partial class EnginesRoot


+ 0
- 20
Svelto.ECS/EnginesRoot.Engines.cs View File

@@ -6,27 +6,10 @@ using Svelto.ECS.Internal;
using Svelto.ECS.Schedulers;
using Svelto.WeakEvents;

#if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
using Svelto.ECS.Profiler;
#endif

namespace Svelto.ECS
{
public partial class EnginesRoot
{
#if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
static EnginesRoot()
{

/// <summary>
/// I still need to find a good solution for this. Need to move somewhere else
/// </summary>
UnityEngine.GameObject debugEngineObject = new UnityEngine.GameObject("Svelto.ECS.Profiler");
debugEngineObject.gameObject.AddComponent<EngineProfilerBehaviour>();
UnityEngine.GameObject.DontDestroyOnLoad(debugEngineObject);
}
#endif
/// <summary>
/// Engines root contextualize your engines and entities. You don't need to limit yourself to one EngineRoot
/// as multiple engines root could promote separation of scopes. The EntitySubmissionScheduler checks
@@ -58,9 +41,6 @@ namespace Svelto.ECS

public void AddEngine(IEngine engine)
{
#if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
Profiler.EngineProfiler.AddEngine(engine);
#endif
DBC.ECS.Check.Require(_enginesSet.Contains(engine) == false,
"The same engine has been added more than once "
.FastConcat(engine.ToString()));


+ 80
- 66
Svelto.ECS/EnginesRoot.Entities.cs View File

@@ -1,12 +1,9 @@
using System;
using System.Collections.Generic;
using Svelto.DataStructures.Experimental;
using Svelto.Common;
using Svelto.DataStructures.Experimental;
using Svelto.ECS.Internal;

#if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
using Svelto.ECS.Profiler;
#endif

namespace Svelto.ECS
{
public partial class EnginesRoot: IDisposable
@@ -18,28 +15,31 @@ namespace Svelto.ECS
/// </summary>
public void Dispose()
{
foreach (var groups in _groupEntityDB)
foreach (var entityList in groups.Value)
{
using (var profiler = new PlatformProfiler("Final Dispose"))
{
foreach (var groups in _groupEntityDB)
foreach (var entityList in groups.Value)
{
try
{
entityList.Value.RemoveEntitiesFromEngines(_entityEngines, profiler);
}
catch (Exception e)
{
Svelto.Utilities.Console.LogException(e);
}
}

foreach (var engine in _disposableEngines)
try
{
entityList.Value.RemoveEntitiesFromEngines(_entityEngines);
engine.Dispose();
}
catch (Exception e)
{
Svelto.Utilities.Console.LogException(e);
}
}

foreach (var engine in _disposableEngines)
try
{
engine.Dispose();
}
catch (Exception e)
{
Svelto.Utilities.Console.LogException(e);
}
}

GC.SuppressFinalize(this);
}
@@ -123,53 +123,64 @@ namespace Svelto.ECS
void MoveEntity(IEntityBuilder[] entityBuilders, EGID entityGID, Type originalDescriptorType, EGID toEntityGID,
Dictionary<Type, ITypeSafeDictionary> toGroup = null)
{
//for each entity view generated by the entity descriptor
Dictionary<Type, ITypeSafeDictionary> fromGroup;
using (var profiler = new PlatformProfiler("Move Entity"))
{
//for each entity view generated by the entity descriptor
Dictionary<Type, ITypeSafeDictionary> fromGroup;

if (_groupEntityDB.TryGetValue(entityGID.groupID, out fromGroup) == false)
throw new ECSException("from group not found eid: ".FastConcat(entityGID.entityID).FastConcat(" group: ").FastConcat(entityGID.groupID));
if (_groupEntityDB.TryGetValue(entityGID.groupID, out fromGroup) == false)
throw new ECSException("from group not found eid: "
.FastConcat(entityGID.entityID).FastConcat(" group: ")
.FastConcat(entityGID.groupID));

ITypeSafeDictionary entityInfoViewDic;
EntityInfoView entityInfoView = default(EntityInfoView);
//Check if there is an EntityInfoView linked to this entity, if so it's a DynamicEntityDescriptor!
bool correctEntityDescriptorFound = true;
if (fromGroup.TryGetValue(_entityInfoView, out entityInfoViewDic) == true
&& (entityInfoViewDic as TypeSafeDictionary<EntityInfoView>).TryGetValue
(entityGID.entityID, out entityInfoView) == true &&
(correctEntityDescriptorFound = entityInfoView.type == originalDescriptorType) == true)
{
var entitiesToMove = entityInfoView.entitiesToBuild;
for (int i = 0; i < entitiesToMove.Length; i++)
MoveEntityView(entityGID, toEntityGID, toGroup, fromGroup, entitiesToMove[i].GetEntityType());
}
//otherwise it's a normal static entity descriptor
else
{
ITypeSafeDictionary entityInfoViewDic;
EntityInfoView entityInfoView = default(EntityInfoView);
//Check if there is an EntityInfoView linked to this entity, if so it's a DynamicEntityDescriptor!
bool correctEntityDescriptorFound = true;
if (fromGroup.TryGetValue(_entityInfoView, out entityInfoViewDic) == true
&& (entityInfoViewDic as TypeSafeDictionary<EntityInfoView>).TryGetValue
(entityGID.entityID, out entityInfoView) == true &&
(correctEntityDescriptorFound = entityInfoView.type == originalDescriptorType) == true)
{
var entitiesToMove = entityInfoView.entitiesToBuild;
for (int i = 0; i < entitiesToMove.Length; i++)
MoveEntityView(entityGID, toEntityGID, toGroup, fromGroup, entitiesToMove[i].GetEntityType(), profiler);
}
//otherwise it's a normal static entity descriptor
else
{
#if DEBUG && !PROFILER
if (correctEntityDescriptorFound == false)
#if RELAXED_ECS
Utilities.Console.LogError(INVALID_DYNAMIC_DESCRIPTOR_ERROR.FastConcat(" ID ").FastConcat(entityGID.entityID)
.FastConcat(" group ID ").FastConcat(entityGID.groupID).FastConcat(
" descriptor found: ", entityInfoView.type.Name, " descriptor Excepted ",
originalDescriptorType.Name));
if (correctEntityDescriptorFound == false)
#if RELAXED_ECS
Utilities.Console.LogError(INVALID_DYNAMIC_DESCRIPTOR_ERROR
.FastConcat(" ID ").FastConcat(entityGID.entityID)
.FastConcat(" group ID ").FastConcat(entityGID.groupID).FastConcat(
" descriptor found: ",
entityInfoView
.type
.Name,
" descriptor Excepted ",
originalDescriptorType
.Name));
#else
throw new ECSException(INVALID_DYNAMIC_DESCRIPTOR_ERROR.FastConcat(" ID ").FastConcat(entityGID.entityID)
.FastConcat(" group ID ").FastConcat(entityGID.groupID).FastConcat(
" descriptor found: ", entityInfoView.type.Name, " descriptor Excepted ",
originalDescriptorType.Name));
#endif
#endif
for (var i = 0; i < entityBuilders.Length; i++)
MoveEntityView(entityGID, toEntityGID, toGroup, fromGroup, entityBuilders[i].GetEntityType());
#endif

for (var i = 0; i < entityBuilders.Length; i++)
MoveEntityView(entityGID, toEntityGID, toGroup, fromGroup, entityBuilders[i].GetEntityType(), profiler);
}
}
}

void MoveEntityView(EGID entityGID, EGID toEntityGID, Dictionary<Type, ITypeSafeDictionary> toGroup,
Dictionary<Type, ITypeSafeDictionary> fromGroup, Type entityType)
Dictionary<Type, ITypeSafeDictionary> fromGroup, Type entityType, PlatformProfiler profiler)
{
ITypeSafeDictionary fromTypeSafeDictionary;
if (fromGroup.TryGetValue(entityType, out fromTypeSafeDictionary) == false)
@@ -199,31 +210,34 @@ namespace Svelto.ECS
{
throw new EntityNotFoundException(entityGID.entityID, entityGID.groupID, entityType);
}
fromTypeSafeDictionary.MoveEntityFromDictionaryAndEngines(entityGID, toEntityGID, dictionaryOfEntities, _entityEngines);
fromTypeSafeDictionary.MoveEntityFromDictionaryAndEngines(entityGID, toEntityGID, dictionaryOfEntities, _entityEngines, profiler);

if (fromTypeSafeDictionary.Count == 0) //clean up
{
_groupsPerEntity[entityType].Remove(entityGID.groupID);

//I don't remove the group if empty on purpose, in case it needs to be reused
//however I trim it to save memory
//I don't remove the group if empty on purpose, in case it needs to be reused however I trim it to save
//memory
fromTypeSafeDictionary.Trim();
}
}

void RemoveGroupAndEntitiesFromDB(int groupID)
{
var dictionariesOfEntities = _groupEntityDB[groupID];
foreach (var dictionaryOfEntities in dictionariesOfEntities)
using (var profiler = new PlatformProfiler("Remove Group"))
{
dictionaryOfEntities.Value.RemoveEntitiesFromEngines(_entityEngines);
var groupedGroupOfEntities = _groupsPerEntity[dictionaryOfEntities.Key];
groupedGroupOfEntities.Remove(groupID);
}
var dictionariesOfEntities = _groupEntityDB[groupID];
foreach (var dictionaryOfEntities in dictionariesOfEntities)
{
dictionaryOfEntities.Value.RemoveEntitiesFromEngines(_entityEngines, profiler);
var groupedGroupOfEntities = _groupsPerEntity[dictionaryOfEntities.Key];
groupedGroupOfEntities.Remove(groupID);
}

//careful, in this case I assume you really don't want to use this group anymore
//so I remove it from the database
_groupEntityDB.Remove(groupID);
//careful, in this case I assume you really don't want to use this group anymore
//so I remove it from the database
_groupEntityDB.Remove(groupID);
}
}

///--------------------------------------------


+ 1
- 5
Svelto.ECS/EnginesRoot.GenericEntityFactory.cs View File

@@ -1,8 +1,4 @@
#if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
using Svelto.ECS.Profiler;
#endif

namespace Svelto.ECS
namespace Svelto.ECS
{
public partial class EnginesRoot
{


+ 1
- 5
Svelto.ECS/EnginesRoot.GenericEntityFunctions.cs View File

@@ -1,9 +1,5 @@
using System;
using Svelto.ECS.Internal;

#if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
using Svelto.ECS.Profiler;
#endif
using Svelto.ECS.Internal;

namespace Svelto.ECS
{


+ 8
- 9
Svelto.ECS/EnginesRoot.Submission.cs View File

@@ -7,10 +7,6 @@ using Svelto.ECS.Internal;
using Svelto.ECS.Schedulers;
using Console = Svelto.Utilities.Console;

#if ENGINE_PROFILER_ENABLED && UNITY_EDITOR
using Svelto.ECS.Profiler;
#endif

namespace Svelto.ECS
{
public partial class EnginesRoot
@@ -21,7 +17,7 @@ namespace Svelto.ECS
{
if (_entitiesOperations.Count > 0)
{
using (profiler.Sample("Remove and Swap"))
using (profiler.Sample("Remove and Swap operations"))
{
#if DEBUG && !PROFILER
_entitiesOperationsDebug.Clear();
@@ -94,7 +90,7 @@ namespace Svelto.ECS
if (_groupedEntityToAdd.current.Count > 0)
{
using (profiler.Sample("Add"))
using (profiler.Sample("Add operations"))
{
//use other as source from now on current will be use to write new entityViews
_groupedEntityToAdd.Swap();
@@ -105,7 +101,7 @@ namespace Svelto.ECS
//times on the same frame. if the Add callback builds a new entity, that entity will not
//be available in the database until the N callbacks are done solving it could be complicated as
//callback and database update must be interleaved.
AddEntityViewsToTheDBAndSuitableEngines(_groupedEntityToAdd.other);
AddEntityViewsToTheDBAndSuitableEngines(_groupedEntityToAdd.other, profiler);
}
#if !DEBUG
catch (Exception e)
@@ -124,7 +120,7 @@ namespace Svelto.ECS
}
void AddEntityViewsToTheDBAndSuitableEngines(
FasterDictionary<int, Dictionary<Type, ITypeSafeDictionary>> groupsOfEntitiesToSubmit)
FasterDictionary<int, Dictionary<Type, ITypeSafeDictionary>> groupsOfEntitiesToSubmit, PlatformProfiler profiler)
{
//each group is indexed by entity view type. for each type there is a dictionary indexed by entityID
foreach (var groupOfEntitiesToSubmit in groupsOfEntitiesToSubmit)
@@ -160,7 +156,10 @@ namespace Svelto.ECS
{
foreach (var entityViewsPerType in groupToSubmit.Value)
{
entityViewsPerType.Value.AddEntitiesToEngines(_entityEngines);
using (profiler.Sample("Add entities to engines"))
{
entityViewsPerType.Value.AddEntitiesToEngines(_entityEngines, profiler);
}
}
}
}


+ 17
- 8
Svelto.ECS/IEngine.cs View File

@@ -1,19 +1,28 @@
using Svelto.ECS.Internal;

namespace Svelto.ECS.Internal
{
public interface IHandleEntityViewEngineAbstracted : IEngine
{}
public interface IHandleEntityStructEngine<T> : IHandleEntityViewEngineAbstracted
{
void AddInternal(ref T entityView);
void RemoveInternal(ref T entityView);
}
public class EngineInfo
{
#if ENABLE_PLATFORM_PROFILER
public EngineInfo()
{
name = GetType().FullName;
}
#endif
internal string name;
}
}

namespace Svelto.ECS
{
public interface IEngine
{}
public interface IHandleEntityStructEngine<T> : IHandleEntityViewEngineAbstracted
{
void AddInternal(ref T entityView);
void RemoveInternal(ref T entityView);
}
}

+ 4
- 3
Svelto.ECS/MultiEntitiesEngine.cs View File

@@ -1,3 +1,5 @@
using Svelto.ECS.Internal;

namespace Svelto.ECS
{
public abstract class MultiEntitiesEngine<T, U> : SingleEntityEngine<T>, IHandleEntityStructEngine<U>
@@ -25,9 +27,8 @@ namespace Svelto.ECS
}

/// <summary>
/// Please do not add more MultiEntityViewsEngine
/// if you use more than 4 nodes, your engine has
/// already too many responsabilities.
/// Please do not add more MultiEntityViewsEngine if you use more than 4 nodes, your engine has
/// already too many responsibilities.
/// </summary>
public abstract class MultiEntitiesEngine<T, U, V, W> : MultiEntitiesEngine<T, U, V>, IHandleEntityStructEngine<W>
where W : IEntityStruct where V : IEntityStruct where U : IEntityStruct where T : IEntityStruct


+ 2
- 0
Svelto.ECS/MultiEntityViewsEngine.cs View File

@@ -1,3 +1,5 @@
using Svelto.ECS.Internal;

namespace Svelto.ECS
{
public abstract class MultiEntityViewsEngine<T, U> : SingleEntityViewEngine<T>, IHandleEntityStructEngine<U>


+ 3
- 1
Svelto.ECS/SingleEntityEngine.cs View File

@@ -1,6 +1,8 @@
using Svelto.ECS.Internal;

namespace Svelto.ECS
{
public abstract class SingleEntityEngine<T> : IHandleEntityStructEngine<T> where T : IEntityStruct
public abstract class SingleEntityEngine<T> : EngineInfo, IHandleEntityStructEngine<T> where T : IEntityStruct
{
public void AddInternal(ref T entityView)
{ Add(ref entityView); }


+ 3
- 1
Svelto.ECS/SingleEntityViewEngine.cs View File

@@ -1,6 +1,8 @@
using Svelto.ECS.Internal;

namespace Svelto.ECS
{
public abstract class SingleEntityViewEngine<T> : IHandleEntityStructEngine<T> where T : class, IEntityStruct
public abstract class SingleEntityViewEngine<T> : EngineInfo, IHandleEntityStructEngine<T> where T : class, IEntityStruct
{
public void AddInternal(ref T entityView)
{ Add(entityView); }


Write Preview
Loading…
Cancel
Save