Merge remote-tracking branch 'upstream/master' into 2023-11-19-pools

MSBuild/Robust.Engine.Version.props

@@ -1,4 +1,4 @@
 <Project>
     <!-- This file automatically reset by Tools/version.py -->
-    <PropertyGroup><Version>180.0.0</Version></PropertyGroup>
+    <PropertyGroup><Version>180.1.0</Version></PropertyGroup>
 </Project>

RELEASE-NOTES.md

@@ -54,6 +54,20 @@ END TEMPLATE-->
 *None yet*
 
 
+## 180.1.0
+
+### New features
+
+* Add the map name to lsmap.
+* Add net.pool_size to CVars to control the message data pool size in Lidgren and to also toggle pooling.
+
+### Bugfixes
+
+* Fix physics contraints causing enormous heap allocations.
+* Fix potential error when writing a runtime log.
+* Fix shape lookups for non-hard fixtures in EntityLookupSystem from 180.0.0
+
+
 ## 180.0.0
 
 ### Breaking changes

Robust.Server/BaseServer.cs

@@ -660,10 +660,14 @@ public void Cleanup()
             {
                 // Write down exception log
                 var logPath = _config.GetCVar(CVars.LogPath);
-                var relPath = PathHelpers.ExecutableRelativeFile(logPath);
-                Directory.CreateDirectory(relPath);
-                var pathToWrite = Path.Combine(relPath,
+                if (!Path.IsPathRooted(logPath))
+                {
+                    logPath = PathHelpers.ExecutableRelativeFile(logPath);
+                }
+
+                var pathToWrite = Path.Combine(logPath,
                     "Runtime-" + DateTime.Now.ToString("yyyy-MM-dd-THH-mm-ss") + ".txt");
+                Directory.CreateDirectory(logPath);
                 File.WriteAllText(pathToWrite, _runtimeLog.Display(), EncodingHelpers.UTF8);
             }
 

Robust.Shared/CVars.cs

@@ -53,6 +53,16 @@ protected CVars()
         public static readonly CVarDef<int> NetReceiveBufferSize =
             CVarDef.Create("net.receivebuffersize", 131071, CVar.ARCHIVE);
 
+        /// <summary>
+        /// Size of the pool for Lidgren's array buffers to send messages.
+        /// Set to 0 to disable pooling; max is 8192.
+        /// </summary>
+        /// <remarks>
+        /// Higher just means more potentially wasted space and slower pool retrieval.
+        /// </remarks>
+        public static readonly CVarDef<int> NetPoolSize =
+            CVarDef.Create("net.pool_size", 512, CVar.CLIENT | CVar.SERVER);
+
         /// <summary>
         /// Maximum UDP payload size to send.
         /// </summary>

Robust.Shared/Console/Commands/MapCommands.cs

@@ -131,6 +131,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
 
 internal sealed class ListMapsCommand : LocalizedCommands
 {
+    [Dependency] private readonly IEntityManager _entManager = default!;
     [Dependency] private readonly IMapManager _map = default!;
 
     public override string Command => "lsmap";
@@ -144,10 +145,13 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
 
         foreach (var mapId in _map.GetAllMapIds().OrderBy(id => id.Value))
         {
-            msg.AppendFormat("{0}: init: {1}, paused: {2}, ent: {3}, grids: {4}\n",
-                mapId, _map.IsMapInitialized(mapId),
+            var mapUid = _map.GetMapEntityId(mapId);
+
+            msg.AppendFormat("{0}: {1}, init: {2}, paused: {3}, nent: {4}, grids: {5}\n",
+                mapId, _entManager.GetComponent<MetaDataComponent>(mapUid).EntityName,
+                _map.IsMapInitialized(mapId),
                 _map.IsMapPaused(mapId),
-                _map.GetMapEntityId(mapId),
+                _entManager.GetNetEntity(_map.GetMapEntityId(mapId)),
                 string.Join(",", _map.GetAllGrids(mapId).Select(grid => grid.Owner)));
         }
 

Robust.Shared/GameObjects/Systems/EntityLookupSystem.ComponentQueries.cs

@@ -154,34 +154,35 @@ private void AddEntitiesIntersecting<T>(
                 if (!state.Query.TryGetComponent(value, out var comp))
                     return true;
 
-                if (!state.FixturesQuery.TryGetComponent(value, out var fixtures))
-                {
-                    var position = state.TransformSystem.GetWorldPosition(value);
-                    if (state.Fixtures.TestPoint(state.Shape, state.Transform, position))
-                        goto found;
-
-                    return true;
-                }
-
                 var intersectingTransform = state.Physics.GetPhysicsTransform(value);
-                foreach (var fixture in fixtures.Fixtures.Values)
-                {
-                    if (!state.Sensors && !fixture.Hard)
-                        continue;
 
-                    for (var i = 0; i < fixture.Shape.ChildCount; i++)
+                if (state.FixturesQuery.TryGetComponent(value, out var fixtures))
+                {
+                    bool anyFixture = false;
+                    foreach (var fixture in fixtures.Fixtures.Values)
                     {
-                        if (state.Manifolds.TestOverlap(state.Shape, 0, fixture.Shape, i, state.Transform, intersectingTransform))
+                        if (!state.Sensors && !fixture.Hard)
+                            continue;
+
+                        anyFixture = true;
+                        for (var i = 0; i < fixture.Shape.ChildCount; i++)
                         {
-                            goto found;
+                            if (state.Manifolds.TestOverlap(state.Shape, 0, fixture.Shape, i, state.Transform,
+                                    intersectingTransform))
+                            {
+                                state.Intersecting.Add((value, comp));
+                                return true;
+                            }
                         }
                     }
+
+                    if (anyFixture)
+                        return true;
                 }
 
-                return true;
+                if (state.Fixtures.TestPoint(state.Shape, state.Transform, intersectingTransform.Position))
+                    state.Intersecting.Add((value, comp));
 
-                found:
-                state.Intersecting.Add((value, comp));
                 return true;
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
         }
@@ -194,34 +195,35 @@ private void AddEntitiesIntersecting<T>(
                 if (!state.Query.TryGetComponent(value, out var comp))
                     return true;
 
-                if (!state.FixturesQuery.TryGetComponent(value, out var fixtures))
-                {
-                    var position = state.TransformSystem.GetWorldPosition(value);
-                    if (state.Fixtures.TestPoint(state.Shape, state.Transform, position))
-                        goto found;
-
-                    return true;
-                }
-
                 var intersectingTransform = state.Physics.GetPhysicsTransform(value);
-                foreach (var fixture in fixtures.Fixtures.Values)
-                {
-                    if (!state.Sensors && !fixture.Hard)
-                        continue;
 
-                    for (var i = 0; i < fixture.Shape.ChildCount; i++)
+                if (state.FixturesQuery.TryGetComponent(value, out var fixtures))
+                {
+                    bool anyFixture = false;
+                    foreach (var fixture in fixtures.Fixtures.Values)
                     {
-                        if (!state.Manifolds.TestOverlap(state.Shape, 0, fixture.Shape, i, state.Transform, intersectingTransform))
+                        if (!state.Sensors && !fixture.Hard)
+                            continue;
+
+                        anyFixture = true;
+                        for (var i = 0; i < fixture.Shape.ChildCount; i++)
                         {
-                            goto found;
+                            if (state.Manifolds.TestOverlap(state.Shape, 0, fixture.Shape, i, state.Transform,
+                                    intersectingTransform))
+                            {
+                                state.Intersecting.Add((value, comp));
+                                return true;
+                            }
                         }
                     }
+
+                    if (anyFixture)
+                        return true;
                 }
 
-                return true;
+                if (state.Fixtures.TestPoint(state.Shape, state.Transform, intersectingTransform.Position))
+                    state.Intersecting.Add((value, comp));
 
-                found:
-                state.Intersecting.Add((value, comp));
                 return true;
             }, localAABB, (flags & LookupFlags.Approximate) != 0x0);
         }
@@ -554,10 +556,10 @@ public void GetEntitiesIntersecting(Type type, MapId mapId, IPhysShape shape, Ha
             foreach (var (uid, comp) in EntityManager.GetAllComponents(type, true))
             {
                 var xform = _xformQuery.GetComponent(uid);
-                var xFormPosition = _transform.GetWorldPosition(xform);
+                var (pos, rot) = _transform.GetWorldPositionRotation(xform);
 
                 if (xform.MapID != mapId ||
-                    !worldAABB.Contains(xFormPosition) ||
+                    !worldAABB.Contains(pos) ||
                     ((flags & LookupFlags.Contained) == 0x0 &&
                      _container.IsEntityOrParentInContainer(uid, _metaQuery.GetComponent(uid), xform)))
                 {
@@ -566,14 +568,15 @@ public void GetEntitiesIntersecting(Type type, MapId mapId, IPhysShape shape, Ha
 
                 if (_fixturesQuery.TryGetComponent(uid, out var fixtures))
                 {
-                    var xFormRotation = _transform.GetWorldRotation(xform, _xformQuery);
-                    var transform = new Transform(xFormPosition, xFormRotation);
+                    var transform = new Transform(pos, rot);
 
+                    bool anyFixture = false;
                     foreach (var fixture in fixtures.Fixtures.Values)
                     {
                         if (!sensors && !fixture.Hard)
                             continue;
 
+                        anyFixture = true;
                         for (var i = 0; i < fixture.Shape.ChildCount; i++)
                         {
                             if (_manifoldManager.TestOverlap(shape, 0, fixture.Shape, i, shapeTransform, transform))
@@ -583,16 +586,14 @@ public void GetEntitiesIntersecting(Type type, MapId mapId, IPhysShape shape, Ha
                         }
                     }
 
-                    continue;
-                }
-                else
-                {
-                    if (!_fixtures.TestPoint(shape, shapeTransform, xFormPosition))
+                    if (anyFixture)
                         continue;
                 }
 
-                found:
+                if (!_fixtures.TestPoint(shape, shapeTransform, pos))
+                    continue;
 
+                found:
                 intersecting.Add((uid, comp));
             }
         }
@@ -630,24 +631,21 @@ public void GetEntitiesIntersecting<T>(MapId mapId, IPhysShape shape, HashSet<En
 
             while (query.MoveNext(out var uid, out var comp, out var xform))
             {
-                var xFormPosition = _transform.GetWorldPosition(xform);
+                var (pos, rot) = _transform.GetWorldPositionRotation(xform);
 
-                if (xform.MapID != mapId ||
-                    !worldAABB.Contains(xFormPosition))
-                {
+                if (xform.MapID != mapId || !worldAABB.Contains(pos))
                     continue;
-                }
 
                 if (_fixturesQuery.TryGetComponent(uid, out var fixtures))
                 {
-                    var xFormRotation = _transform.GetWorldRotation(xform, _xformQuery);
-                    var transform = new Transform(xFormPosition, xFormRotation);
-
+                    var transform = new Transform(pos, rot);
+                    bool anyFixture = false;
                     foreach (var fixture in fixtures.Fixtures.Values)
                     {
                         if (!sensors && !fixture.Hard)
                             continue;
 
+                        anyFixture = true;
                         for (var i = 0; i < fixture.Shape.ChildCount; i++)
                         {
                             if (_manifoldManager.TestOverlap(shape, 0, fixture.Shape, i, shapeTransform, transform))
@@ -657,14 +655,13 @@ public void GetEntitiesIntersecting<T>(MapId mapId, IPhysShape shape, HashSet<En
                         }
                     }
 
-                    continue;
-                }
-                else
-                {
-                    if (!_fixtures.TestPoint(shape, shapeTransform, xFormPosition))
+                    if (anyFixture)
                         continue;
                 }
 
+                if (!_fixtures.TestPoint(shape, shapeTransform, pos))
+                    continue;
+
                 found:
                 entities.Add((uid, comp));
             }

Robust.Shared/Network/NetManager.cs

@@ -576,6 +576,17 @@ private NetPeerConfiguration _getBaseNetPeerConfig()
             // ping the client once per second.
             netConfig.PingInterval = 1f;
 
+            var poolSize = _config.GetCVar(CVars.NetPoolSize);
+
+            if (poolSize <= 0)
+            {
+                netConfig.UseMessageRecycling = false;
+            }
+            else
+            {
+                netConfig.RecycledCacheMaxCount = Math.Min(poolSize, 8192);
+            }
+
             netConfig.SendBufferSize = _config.GetCVar(CVars.NetSendBufferSize);
             netConfig.ReceiveBufferSize = _config.GetCVar(CVars.NetReceiveBufferSize);
             netConfig.MaximumHandshakeAttempts = 5;

Robust.Shared/Physics/Dynamics/Contacts/ContactPositionConstraint.cs

@@ -21,7 +21,6 @@
 */
 
 using System.Numerics;
-using Robust.Shared.Maths;
 using Robust.Shared.Physics.Collision;
 
 namespace Robust.Shared.Physics.Dynamics.Contacts

Robust.Shared/Physics/Dynamics/Contacts/ContactVelocityConstraint.cs

@@ -21,7 +21,6 @@
 */
 
 using System.Numerics;
-using Robust.Shared.Maths;
 
 namespace Robust.Shared.Physics.Dynamics.Contacts
 {

Robust.Shared/Physics/Systems/SharedPhysicsSystem.Solver.cs

@@ -67,12 +67,8 @@ private void ResetSolver(
             velocityConstraint.TangentSpeed = contact.TangentSpeed;
             velocityConstraint.IndexA = bodyA.IslandIndex[island.Index];
             velocityConstraint.IndexB = bodyB.IslandIndex[island.Index];
-            velocityConstraint.Points = new VelocityConstraintPoint[2];
-
-            for (var j = 0; j < 2; j++)
-            {
-                velocityConstraint.Points[j] = new VelocityConstraintPoint();
-            }
+            Array.Resize(ref velocityConstraint.Points, 2);
+            // Don't need to reset point data as it all gets set below.
 
             var (invMassA, invMassB) = GetInvMass(bodyA, bodyB);
 
@@ -91,7 +87,7 @@ private void ResetSolver(
             (positionConstraint.InvMassA, positionConstraint.InvMassB) = (invMassA, invMassB);
             positionConstraint.LocalCenterA = bodyA.LocalCenter;
             positionConstraint.LocalCenterB = bodyB.LocalCenter;
-            positionConstraint.LocalPoints = new Vector2[2];
+            Array.Resize(ref positionConstraint.LocalPoints, 2);
 
             positionConstraint.InvIA = bodyA.InvI;
             positionConstraint.InvIB = bodyB.InvI;