Added mod rules to force collision detection and avoidance to single …

…threading
beyond-all-reason · Nov 30, 2022 · 5fb0c97 · 5fb0c97
1 parent 65a8413
commit 5fb0c97
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 25 deletions.
diff --git a/rts/Sim/Misc/ModInfo.cpp b/rts/Sim/Misc/ModInfo.cpp
@@ -37,6 +37,9 @@ void CModInfo::ResetState()
 		maxCollisionPushMultiplier = std::numeric_limits<float>::infinity();
 		unitQuadPositionUpdateRate = 3;
 		groundUnitCollisionAvoidanceUpdateRate = 3;
+
+		forceCollisionsSingleThreaded = false;
+		forceCollisionAvoidanceSingleThreaded = false;
 	}
 	{
 		constructionDecay      = true;
@@ -176,6 +179,9 @@ void CModInfo::Init(const std::string& modFileName)
 		maxCollisionPushMultiplier = movementTbl.GetFloat("maxCollisionPushMultiplier", maxCollisionPushMultiplier);
 		unitQuadPositionUpdateRate = Clamp(movementTbl.GetInt("unitQuadPositionUpdateRate",  unitQuadPositionUpdateRate), 1, 15);
 		groundUnitCollisionAvoidanceUpdateRate = Clamp(movementTbl.GetInt("groundUnitCollisionAvoidanceUpdateRate",  groundUnitCollisionAvoidanceUpdateRate), 1, 15);
+
+		forceCollisionsSingleThreaded = movementTbl.GetBool("forceCollisionsSingleThreaded", forceCollisionsSingleThreaded);
+		forceCollisionAvoidanceSingleThreaded = movementTbl.GetBool("forceCollisionAvoidanceSingleThreaded", forceCollisionAvoidanceSingleThreaded);
 	}
 
 	{

diff --git a/rts/Sim/Misc/ModInfo.h b/rts/Sim/Misc/ModInfo.h
@@ -55,6 +55,9 @@ class CModInfo
 	// relative to a unit's maxspeed (default: inf)
 	float maxCollisionPushMultiplier;
 
+	bool forceCollisionsSingleThreaded;
+	bool forceCollisionAvoidanceSingleThreaded;
+
 	// rate in sim frames that a unit's position in the quad grid is updated (default: 3)
 	// a lower number will increase CPU load, but increase accuracy of collision detection
 	int unitQuadPositionUpdateRate;

diff --git a/rts/Sim/Units/UnitHandler.cpp b/rts/Sim/Units/UnitHandler.cpp
@@ -12,6 +12,7 @@
 
 #include "CommandAI/BuilderCAI.h"
 #include "Sim/Misc/GlobalSynced.h"
+#include "Sim/Misc/ModInfo.h"
 #include "Sim/Misc/TeamHandler.h"
 #include "Sim/MoveTypes/MoveType.h"
 #include "Sim/Path/IPathManager.h"
@@ -303,39 +304,67 @@ void CUnitHandler::UpdateUnitMoveTypes()
 {
 	SCOPED_TIMER("Sim::Unit::MoveType");
 
+	if (modInfo.forceCollisionAvoidanceSingleThreaded)
 	{
-	SCOPED_TIMER("Sim::Unit::MoveType::1::UpdatePreCollisionsMT");
-	for_mt(0, activeUnits.size(), [this](const int i){
-		CUnit* unit = activeUnits[i];
-		AMoveType* moveType = unit->moveType;
+		SCOPED_TIMER("Sim::Unit::MoveType::1::UpdatePreCollisionsST");
+		std::size_t len = activeUnits.size();
+		for (std::size_t i=0; i<len; ++i) {
+			CUnit* unit = activeUnits[i];
+			AMoveType* moveType = unit->moveType;
 
-		unit->SanityCheck();
-		unit->PreUpdate();
+			unit->SanityCheck();
+			unit->PreUpdate();
 
-		moveType->UpdatePreCollisionsMt();
-	});
-	}
+			moveType->UpdatePreCollisionsMt();
+			moveType->UpdatePreCollisions();
+		}
+	} else {
+		{
+		SCOPED_TIMER("Sim::Unit::MoveType::1::UpdatePreCollisionsMT");
+		for_mt(0, activeUnits.size(), [this](const int i){
+			CUnit* unit = activeUnits[i];
+			AMoveType* moveType = unit->moveType;
+
+			unit->SanityCheck();
+			unit->PreUpdate();
+
+			moveType->UpdatePreCollisionsMt();
+		});
+		}
 
-	{
-	SCOPED_TIMER("Sim::Unit::MoveType::2::UpdatePreCollisionsST");
-	std::size_t len = activeUnits.size();
-	for (std::size_t i=0; i<len; ++i) {
-		CUnit* unit = activeUnits[i];
-		AMoveType* moveType = unit->moveType;
+		{
+		SCOPED_TIMER("Sim::Unit::MoveType::2::UpdatePreCollisionsST");
+		std::size_t len = activeUnits.size();
+		for (std::size_t i=0; i<len; ++i) {
+			CUnit* unit = activeUnits[i];
+			AMoveType* moveType = unit->moveType;
 
-		moveType->UpdatePreCollisions();
-	}
+			moveType->UpdatePreCollisions();
+		}
+		}
 	}
 
-	{
-	SCOPED_TIMER("Sim::Unit::MoveType::3::UpdateMT");
-	for_mt(0, activeUnits.size(), [this](const int i){
-		CUnit* unit = activeUnits[i];
-		AMoveType* moveType = unit->moveType;
+	if (modInfo.forceCollisionsSingleThreaded) {
+		{
+		SCOPED_TIMER("Sim::Unit::MoveType::3::CollisionDetectionST");
+		for (int i = 0; i < activeUnits.size(); ++i) {
+			CUnit* unit = activeUnits[i];
+			AMoveType* moveType = unit->moveType;
 
-		moveType->UpdateCollisionDetections();
-	}
-	);
+			moveType->UpdateCollisionDetections();
+		}
+		}
+	} else {
+		{
+		SCOPED_TIMER("Sim::Unit::MoveType::3::CollisionDetectionMT");
+		for_mt(0, activeUnits.size(), [this](const int i){
+			CUnit* unit = activeUnits[i];
+			AMoveType* moveType = unit->moveType;
+
+			moveType->UpdateCollisionDetections();
+		}
+		);
+		}
 	}
 
 	{