Added mod rule pfForceUpdateSingleThreaded to force pathing vertex up…

…dates to be handled single threaded during a match.
beyond-all-reason · Nov 30, 2022 · 65a8413 · 65a8413
1 parent 64b24c6
commit 65a8413
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 15 deletions.
diff --git a/rts/Sim/Misc/ModInfo.cpp b/rts/Sim/Misc/ModInfo.cpp
@@ -106,6 +106,7 @@ void CModInfo::ResetState()
 		pfRawDistMult    = 1.25f;
 		pfUpdateRate     = 0.007f;
 		pfForceSingleThreaded = false;
+		pfForceUpdateSingleThreaded = false;
 
 		enableSmoothMesh = true;
 		quadFieldQuadSizeInElmos = 128;
@@ -149,6 +150,7 @@ void CModInfo::Init(const std::string& modFileName)
 		pfRawDistMult = system.GetFloat("pathFinderRawDistMult", pfRawDistMult);
 		pfUpdateRate = system.GetFloat("pathFinderUpdateRate", pfUpdateRate);
 		pfForceSingleThreaded = system.GetBool("pfForceSingleThreaded", pfForceSingleThreaded);
+		pfForceUpdateSingleThreaded = system.GetBool("pfForceUpdateSingleThreaded", pfForceUpdateSingleThreaded);
 
 		enableSmoothMesh = system.GetBool("enableSmoothMesh", enableSmoothMesh);
 

diff --git a/rts/Sim/Misc/ModInfo.h b/rts/Sim/Misc/ModInfo.h
@@ -186,6 +186,7 @@ class CModInfo
 	/// which pathfinder system (NOP, DEFAULT/legacy, or QT) the mod will use
 	int pathFinderSystem;
 	bool pfForceSingleThreaded;
+	bool pfForceUpdateSingleThreaded;
 
 	float pfRawDistMult;
 	float pfUpdateRate;

diff --git a/rts/Sim/Path/TKPFS/PathManager.cpp b/rts/Sim/Path/TKPFS/PathManager.cpp
@@ -83,7 +83,7 @@ void CPathManager::InitStatic()
 
 	pathFinderGroups = ThreadPool::GetNumThreads();
 
-	LOG("TK CPathManager::InitStatic: %d threads available (MT permitted %d)", pathFinderGroups, SupportsMultiThreadedRequests());
+	LOG("TK CPathManager::InitStatic: %d threads available (MT requests=%d, MT updates=%d)", pathFinderGroups, SupportsMultiThreadedRequests(), !modInfo.pfForceUpdateSingleThreaded);
 
 	// pathFinders[i] = pfMemPool.alloc<CPathFinder>(true);
 

diff --git a/rts/Sim/Path/TKPFS/PathingState.cpp b/rts/Sim/Path/TKPFS/PathingState.cpp
@@ -718,13 +718,20 @@ void PathingState::UpdateVertexPathCosts(int blocksToUpdate)
 	// FindOffset (threadsafe)
 	{
 		SCOPED_TIMER("Sim::Path::Estimator::FindOffset");
-		for_mt(0, consumedBlocks.size(), [&](const int n) {
-			// copy the next block in line
-			const SingleBlock sb = consumedBlocks[n];
-			const int blockN = BlockPosToIdx(sb.blockPos);
-			const MoveDef* currBlockMD = sb.moveDef;
-			blockStates.peNodeOffsets[currBlockMD->pathType][blockN] = FindBlockPosOffset(*currBlockMD, sb.blockPos.x, sb.blockPos.y);
-		});
+
+		auto updateOffset = [&](const int n) {
+				// copy the next block in line
+				const SingleBlock sb = consumedBlocks[n];
+				const int blockN = BlockPosToIdx(sb.blockPos);
+				const MoveDef* currBlockMD = sb.moveDef;
+				blockStates.peNodeOffsets[currBlockMD->pathType][blockN] = FindBlockPosOffset(*currBlockMD, sb.blockPos.x, sb.blockPos.y);
+			};
+
+		if (modInfo.pfForceUpdateSingleThreaded) {
+			for(int i = 0; i < consumedBlocks.size(); ++i) { updateOffset(i); };
+		} else {
+			for_mt(0, consumedBlocks.size(), updateOffset);
+		}
 
 		// for (int n=0; n<consumedBlocks.size(); n++){
 		// 	const SingleBlock sb = consumedBlocks[n];
@@ -743,13 +750,19 @@ void PathingState::UpdateVertexPathCosts(int blocksToUpdate)
 		std::atomic<std::int64_t> updateCostBlockNum = consumedBlocks.size();
 		const size_t threadsUsed = std::min(consumedBlocks.size(), (size_t)ThreadPool::GetNumThreads());
 
-		for_mt(0, threadsUsed, [this, &updateCostBlockNum](int threadNum){
-			std::int64_t n;
-			while ((n = --updateCostBlockNum) >= 0){
-				//LOG("TK PathingState::Update: PROC moveDef = %d %p (%p)", n, &consumedBlocks[n], consumedBlocks[n].moveDef);
-				CalcVertexPathCosts(*consumedBlocks[n].moveDef, consumedBlocks[n].blockPos, threadNum);
-			}
-		});
+		auto updateVertexPathCosts = [this, &updateCostBlockNum](int threadNum){
+				std::int64_t n;
+				while ((n = --updateCostBlockNum) >= 0){
+					//LOG("TK PathingState::Update: PROC moveDef = %d %p (%p)", n, &consumedBlocks[n], consumedBlocks[n].moveDef);
+					CalcVertexPathCosts(*consumedBlocks[n].moveDef, consumedBlocks[n].blockPos, threadNum);
+				}
+			};
+
+		if (modInfo.pfForceUpdateSingleThreaded) {
+			updateVertexPathCosts(0);
+		} else {
+			for_mt(0, threadsUsed, updateVertexPathCosts);
+		}
 	}
 }