Fixes to "BAR105 reduce QTPFS memory usage" (#1935)

Second attempt. First attempt was accepted, but we since found a bug. The bug has been fixed and now this change is put forward for remerging. Fixes #1934
beyond-all-reason · Feb 8, 2025 · 953b5d1 · 953b5d1
1 parent 5ae24c0
commit 953b5d1
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/rts/Sim/Path/QTPFS/PathThreads.h b/rts/Sim/Path/QTPFS/PathThreads.h
@@ -159,7 +159,6 @@ namespace QTPFS {
     struct UpdateThreadData {
         std::vector<std::uint8_t> maxBlockBits;
         std::vector<INode*> relinkNodeGrid;
-        SRectangle areaUpdated;
         SRectangle areaRelinkedInner;
         SRectangle areaRelinked;
         SRectangle areaMaxBlockBits;
@@ -171,7 +170,6 @@ namespace QTPFS {
             moveDef = &md;
             auto mapRect = MapToRectangle();
 
-            areaUpdated = area;
             areaRelinkedInner = SRectangle  ( topNode.xmin()
                                             , topNode.zmin()
                                             , topNode.xmax()
@@ -180,10 +178,10 @@ namespace QTPFS {
                                         , topNode.zmin() - 1
                                         , topNode.xmax() + 1
                                         , topNode.zmax() + 1);
-            areaMaxBlockBits = SRectangle   ( area.x1 - md.xsizeh
-                                            , area.z1 - md.zsizeh
-                                            , area.x2 + md.xsizeh
-                                            , area.z2 + md.zsizeh);
+            areaMaxBlockBits = SRectangle   ( topNode.xmin() - md.xsizeh
+                                            , topNode.zmin() - md.zsizeh
+                                            , topNode.xmax() + md.xsizeh
+                                            , topNode.zmax() + md.zsizeh);
             areaRelinked.ClampIn(mapRect);
             areaMaxBlockBits.ClampIn(mapRect);
 
@@ -212,10 +210,9 @@ namespace QTPFS {
         }
 
         void Reset() {
-            areaUpdated = SRectangle(0, 0, 0, 0);
-            areaRelinked = areaUpdated;
-            areaMaxBlockBits = areaUpdated;
-            areaRelinkedInner = areaUpdated;
+            areaRelinked = SRectangle(0, 0, 0, 0);
+            areaMaxBlockBits = areaRelinked;
+            areaRelinkedInner = areaRelinked;
             relinkNodeGrid.resize(0);
             relinkNodeGrid.shrink_to_fit();
             maxBlockBits.resize(0);