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

fix other benchmarks

Browse Source
This commit is contained in:
ElectroJr
2024-12-23 18:13:49 +13:00
parent 43e6fd57d4
commit ef3d7396d4
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Benchmarks/ComponentQueryBenchmark.cs
View File

@@ -9,13 +9,14 @@ using Content.IntegrationTests.Pair;
using Content.Shared.Clothing.Components; using Content.Shared.Clothing.Components;
using Content.Shared.Doors.Components; using Content.Shared.Doors.Components;
using Content.Shared.Item; using Content.Shared.Item;
using Robust.Server.GameObjects;
using Robust.Shared; using Robust.Shared;
using Robust.Shared.Analyzers; using Robust.Shared.Analyzers;
using Robust.Shared.EntitySerialization;
using Robust.Shared.EntitySerialization.Systems;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Map.Components; using Robust.Shared.Map.Components;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Utility;
namespace Content.Benchmarks; namespace Content.Benchmarks;
@@ -32,7 +33,6 @@ public class ComponentQueryBenchmark
private TestPair _pair = default!; private TestPair _pair = default!;
private IEntityManager _entMan = default!; private IEntityManager _entMan = default!;
private MapId _mapId = new(10);
private EntityQuery<ItemComponent> _itemQuery; private EntityQuery<ItemComponent> _itemQuery;
private EntityQuery<ClothingComponent> _clothingQuery; private EntityQuery<ClothingComponent> _clothingQuery;
private EntityQuery<MapComponent> _mapQuery; private EntityQuery<MapComponent> _mapQuery;
@@ -54,10 +54,10 @@ public class ComponentQueryBenchmark
_pair.Server.ResolveDependency<IRobustRandom>().SetSeed(42); _pair.Server.ResolveDependency<IRobustRandom>().SetSeed(42);
_pair.Server.WaitPost(() => _pair.Server.WaitPost(() =>
{ {
var success = _entMan.System<MapLoaderSystem>().TryLoad(_mapId, Map, out _); var map = new ResPath(Map);
if (!success) var opts = DeserializationOptions.Default with {InitializeMaps = true};
if (!_entMan.System<MapLoaderSystem>().TryLoadMap(map, out _, out _, opts))
throw new Exception("Map load failed"); throw new Exception("Map load failed");
_pair.Server.MapMan.DoMapInitialize(_mapId);
}).GetAwaiter().GetResult(); }).GetAwaiter().GetResult();
_items = new EntityUid[_entMan.Count<ItemComponent>()]; _items = new EntityUid[_entMan.Count<ItemComponent>()];

11
Content.Benchmarks/PvsBenchmark.cs
View File

@@ -7,13 +7,15 @@ using Content.IntegrationTests;
using Content.IntegrationTests.Pair; using Content.IntegrationTests.Pair;
using Content.Server.Mind; using Content.Server.Mind;
using Content.Server.Warps; using Content.Server.Warps;
using Robust.Server.GameObjects;
using Robust.Shared; using Robust.Shared;
using Robust.Shared.Analyzers; using Robust.Shared.Analyzers;
using Robust.Shared.EntitySerialization;
using Robust.Shared.EntitySerialization.Systems;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Utility;
namespace Content.Benchmarks; namespace Content.Benchmarks;
@@ -34,7 +36,6 @@ public class PvsBenchmark
private TestPair _pair = default!; private TestPair _pair = default!;
private IEntityManager _entMan = default!; private IEntityManager _entMan = default!;
private MapId _mapId = new(10);
private ICommonSession[] _players = default!; private ICommonSession[] _players = default!;
private EntityCoordinates[] _spawns = default!; private EntityCoordinates[] _spawns = default!;
public int _cycleOffset = 0; public int _cycleOffset = 0;
@@ -65,10 +66,10 @@ public class PvsBenchmark
_pair.Server.ResolveDependency<IRobustRandom>().SetSeed(42); _pair.Server.ResolveDependency<IRobustRandom>().SetSeed(42);
await _pair.Server.WaitPost(() => await _pair.Server.WaitPost(() =>
{ {
var success = _entMan.System<MapLoaderSystem>().TryLoad(_mapId, Map, out _); var path = new ResPath(Map);
if (!success) var opts = DeserializationOptions.Default with {InitializeMaps = true};
if (!_entMan.System<MapLoaderSystem>().TryLoadMap(path, out _, out _, opts))
throw new Exception("Map load failed"); throw new Exception("Map load failed");
_pair.Server.MapMan.DoMapInitialize(_mapId);
}); });
// Get list of ghost warp positions // Get list of ghost warp positions