AlicizaX/DragonECS
1
0
Fork 0
mirror of https://github.com/DCFApixels/DragonECS.git synced 2025-09-18 01:44:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix debug service

Browse Source
This commit is contained in:
Mikhail 2024-09-12 04:05:15 +08:00
parent 708c137c68
commit 8613dc3321
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/DebugUtils/EcsDebug.cs
View File

@ -12,7 +12,10 @@ namespace DCFApixels.DragonECS
{ {
public readonly int id; public readonly int id;
internal EcsProfilerMarker(int id) { this.id = id; } internal EcsProfilerMarker(int id) { this.id = id; }
public EcsProfilerMarker(string name) { id = DebugService.Instance.RegisterMark(name); } public EcsProfilerMarker(string name)
{
id = DebugService.Instance.RegisterMark(name);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Begin() { DebugService.Instance.ProfilerMarkBegin(id); } public void Begin() { DebugService.Instance.ProfilerMarkBegin(id); }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
@ -169,7 +172,7 @@ namespace DCFApixels.DragonECS
var oldService = _instance; var oldService = _instance;
_instance = service; _instance = service;
if(_instance != null) if(_instance != null)
{ //TODO Так, всеже треды влияют друг на друга, скоерее всего проблема в использовании _nameIdTable { //TODO Так, всеже треды влияют друг на друга, скоерее всего проблема в использовании _nameIdTable/ Так вроде пофиксил, но не понял как конкретно
foreach (var info in oldService.MarkerInfos) foreach (var info in oldService.MarkerInfos)
{ {
service._idDispenser.Use(info.ID); service._idDispenser.Use(info.ID);
@ -187,7 +190,7 @@ namespace DCFApixels.DragonECS
public static Action<DebugService> OnServiceChanged = delegate { }; public static Action<DebugService> OnServiceChanged = delegate { };
private IdDispenser _idDispenser = new IdDispenser(16, 0); private IdDispenser _idDispenser = new IdDispenser(16, 0);
private ConcurrentDictionary<string, int> _nameIdTable = new ConcurrentDictionary<string, int>(); private Dictionary<string, int> _nameIdTable = new Dictionary<string, int>();
public abstract void Print(string tag, object v); public abstract void Print(string tag, object v);
public abstract void Break(); public abstract void Break();
public int RegisterMark(string name) public int RegisterMark(string name)
@ -197,11 +200,14 @@ namespace DCFApixels.DragonECS
{ {
lock (_lock) lock (_lock)
{ {
id = _idDispenser.UseFree(); if (!_nameIdTable.TryGetValue(name, out id))
_nameIdTable.TryAdd(name, id); {
id = _idDispenser.UseFree();
_nameIdTable.Add(name, id);
OnNewProfilerMark(id, name);
}
} }
} }
OnNewProfilerMark(id, name);
return id; return id;
} }
public void DeleteMark(string name) public void DeleteMark(string name)
@ -210,7 +216,7 @@ namespace DCFApixels.DragonECS
{ {
int id = _nameIdTable[name]; int id = _nameIdTable[name];
//TODO проверить TryRemove //TODO проверить TryRemove
_nameIdTable.TryRemove(name, out id); _nameIdTable.Remove(name);
_idDispenser.Release(id); _idDispenser.Release(id);
OnDelProfilerMark(id); OnDelProfilerMark(id);
} }