tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce ChunkingSystem allocations (#21795)

Browse Source
This commit is contained in:
Leon Friedrich
2023-11-28 20:02:24 -05:00
committed by GitHub
parent 97b22ec996
commit f9e4f5e68f
2 changed files with 84 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
Content.Server/Chunking/ChunkingSystem.cs
View File

@@ -38,7 +38,10 @@ public sealed class ChunkingSystem : EntitySystem
_configurationManager.UnsubValueChanged(CVars.NetMaxUpdateRange, OnPvsRangeChanged);
}
private void OnPvsRangeChanged(float value) => _baseViewBounds = Box2.UnitCentered.Scale(value);
private void OnPvsRangeChanged(float value)
{
_baseViewBounds = Box2.UnitCentered.Scale(value);
}
public Dictionary<NetEntity, HashSet<Vector2i>> GetChunksForSession(
ICommonSession session,
@@ -46,71 +49,85 @@ public sealed class ChunkingSystem : EntitySystem
ObjectPool<HashSet<Vector2i>> indexPool,
ObjectPool<Dictionary<NetEntity, HashSet<Vector2i>>> viewerPool,
float? viewEnlargement = null)
{
var viewers = GetSessionViewers(session);
var chunks = GetChunksForViewers(viewers, chunkSize, indexPool, viewerPool, viewEnlargement ?? chunkSize);
return chunks;
}
private HashSet<EntityUid> GetSessionViewers(ICommonSession session)
{
var viewers = new HashSet<EntityUid>();
if (session.Status != SessionStatus.InGame || session.AttachedEntity is null)
return viewers;
viewers.Add(session.AttachedEntity.Value);
foreach (var uid in session.ViewSubscriptions)
{
viewers.Add(uid);
}
return viewers;
}
private Dictionary<NetEntity, HashSet<Vector2i>> GetChunksForViewers(
HashSet<EntityUid> viewers,
int chunkSize,
ObjectPool<HashSet<Vector2i>> indexPool,
ObjectPool<Dictionary<NetEntity, HashSet<Vector2i>>> viewerPool,
float viewEnlargement)
{
var chunks = viewerPool.Get();
DebugTools.Assert(chunks.Count == 0);
foreach (var viewerUid in viewers)
if (session.Status != SessionStatus.InGame || session.AttachedEntity is not {} player)
return chunks;
var enlargement = viewEnlargement ?? chunkSize;
AddViewerChunks(player, chunks, indexPool, chunkSize, enlargement);
foreach (var uid in session.ViewSubscriptions)
{
if (!_xformQuery.TryGetComponent(viewerUid, out var xform))
{
Log.Error($"Player has deleted viewer entities? Viewers: {string.Join(", ", viewers.Select(ToPrettyString))}");
continue;
AddViewerChunks(uid, chunks, indexPool, chunkSize, enlargement);
}
return chunks;
}
private void AddViewerChunks(EntityUid viewer,
Dictionary<NetEntity, HashSet<Vector2i>> chunks,
ObjectPool<HashSet<Vector2i>> indexPool,
int chunkSize,
float viewEnlargement)
{
if (!_xformQuery.TryGetComponent(viewer, out var xform))
return;
var pos = _transform.GetWorldPosition(xform);
var bounds = _baseViewBounds.Translated(pos).Enlarged(viewEnlargement);
var grids = new List<Entity<MapGridComponent>>();
_mapManager.FindGridsIntersecting(xform.MapID, bounds, ref grids, true);
foreach (var grid in grids)
{
var netGrid = GetNetEntity(grid);
var state = new QueryState(chunks, indexPool, chunkSize, bounds, _transform, EntityManager);
_mapManager.FindGridsIntersecting(xform.MapID, bounds, ref state, AddGridChunks, true);
}
if (!chunks.TryGetValue(netGrid, out var set))
private static bool AddGridChunks(
EntityUid uid,
MapGridComponent grid,
ref QueryState state)
{
chunks[netGrid] = set = indexPool.Get();
var netGrid = state.EntityManager.GetNetEntity(uid);
if (!state.Chunks.TryGetValue(netGrid, out var set))
{
state.Chunks[netGrid] = set = state.Pool.Get();
DebugTools.Assert(set.Count == 0);
}
var enumerator = new ChunkIndicesEnumerator(_transform.GetInvWorldMatrix(grid).TransformBox(bounds), chunkSize);
var aabb = state.Transform.GetInvWorldMatrix(uid).TransformBox(state.Bounds);
var enumerator = new ChunkIndicesEnumerator(aabb, state.ChunkSize);
while (enumerator.MoveNext(out var indices))
{
set.Add(indices.Value);
}
}
}
return chunks;
return true;
}
private readonly struct QueryState
{
public readonly Dictionary<NetEntity, HashSet<Vector2i>> Chunks;
public readonly ObjectPool<HashSet<Vector2i>> Pool;
public readonly int ChunkSize;
public readonly Box2 Bounds;
public readonly SharedTransformSystem Transform;
public readonly EntityManager EntityManager;
public QueryState(
Dictionary<NetEntity, HashSet<Vector2i>> chunks,
ObjectPool<HashSet<Vector2i>> pool,
int chunkSize,
Box2 bounds,
SharedTransformSystem transform,
EntityManager entityManager)
{
Chunks = chunks;
Pool = pool;
ChunkSize = chunkSize;
Bounds = bounds;
Transform = transform;
EntityManager = entityManager;
}
}
}

17
Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
View File

@@ -273,7 +273,7 @@ public sealed partial class ExplosionSystem
return !tileBlocked;
}
private bool GridQueryCallback(
private static bool GridQueryCallback(
ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, EntityQuery<TransformComponent> XformQuery) state,
in EntityUid uid)
{
@@ -283,7 +283,7 @@ public sealed partial class ExplosionSystem
return true;
}
private bool GridQueryCallback(
private static bool GridQueryCallback(
ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, EntityQuery<TransformComponent> XformQuery) state,
in FixtureProxy proxy)
{
@@ -307,7 +307,7 @@ public sealed partial class ExplosionSystem
var gridBox = Box2.FromDimensions(tile * DefaultTileSize, new Vector2(DefaultTileSize, DefaultTileSize));
var worldBox = spaceMatrix.TransformBox(gridBox);
var list = new List<(EntityUid, TransformComponent)>();
var state = (list, processed, invSpaceMatrix, lookup.Owner, _transformQuery, gridBox);
var state = (list, processed, invSpaceMatrix, lookup.Owner, _transformQuery, gridBox, _transformSystem);
// get entities:
lookup.DynamicTree.QueryAabb(ref state, SpaceQueryCallback, worldBox, true);
@@ -336,8 +336,8 @@ public sealed partial class ExplosionSystem
}
}
private bool SpaceQueryCallback(
ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, Matrix3 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox) state,
private static bool SpaceQueryCallback(
ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, Matrix3 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox, SharedTransformSystem System) state,
in EntityUid uid)
{
if (state.Processed.Contains(uid))
@@ -355,14 +355,15 @@ public sealed partial class ExplosionSystem
}
// finally check if it intersects our tile
if (state.GridBox.Contains(state.InvSpaceMatrix.Transform(_transformSystem.GetWorldPosition(xform, state.XformQuery))))
var wpos = state.System.GetWorldPosition(xform);
if (state.GridBox.Contains(state.InvSpaceMatrix.Transform(wpos)))
state.List.Add((uid, xform));
return true;
}
private bool SpaceQueryCallback(
ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, Matrix3 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox) state,
private static bool SpaceQueryCallback(
ref (List<(EntityUid, TransformComponent)> List, HashSet<EntityUid> Processed, Matrix3 InvSpaceMatrix, EntityUid LookupOwner, EntityQuery<TransformComponent> XformQuery, Box2 GridBox, SharedTransformSystem System) state,
in FixtureProxy proxy)
{
var uid = proxy.Entity;