games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Protect every access to zone tiles with a mutex

Browse Source
This commit is contained in:
Tomasz Zieliński
2024-03-27 06:16:48 +01:00
parent cfc4a26f55
commit d8c93cb222
20 changed files with 385 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
lib/rmg/Zone.cpp
View File

@@ -75,25 +75,44 @@ void Zone::setPos(const int3 &Pos)
pos = Pos;
}
const rmg::Area & Zone::getArea() const
ThreadSafeProxy<rmg::Area> Zone::area()
{
return dArea;
return ThreadSafeProxy<rmg::Area>(dArea, areaMutex);
}
rmg::Area & Zone::area()
ThreadSafeProxy<const rmg::Area> Zone::area() const
{
return dArea;
return ThreadSafeProxy<const rmg::Area>(dArea, areaMutex);
}
rmg::Area & Zone::areaPossible()
ThreadSafeProxy<rmg::Area> Zone::areaPossible()
{
//FIXME: make const, only modify via mutex-protected interface
return dAreaPossible;
return ThreadSafeProxy<rmg::Area>(dAreaPossible, areaMutex);
}
rmg::Area & Zone::areaUsed()
ThreadSafeProxy<const rmg::Area> Zone::areaPossible() const
{
return dAreaUsed;
return ThreadSafeProxy<const rmg::Area>(dAreaPossible, areaMutex);
}
ThreadSafeProxy<rmg::Area> Zone::freePaths()
{
return ThreadSafeProxy<rmg::Area>(dAreaFree, areaMutex);
}
ThreadSafeProxy<const rmg::Area> Zone::freePaths() const
{
return ThreadSafeProxy<const rmg::Area>(dAreaFree, areaMutex);
}
ThreadSafeProxy<rmg::Area> Zone::areaUsed()
{
return ThreadSafeProxy<rmg::Area>(dAreaUsed, areaMutex);
}
ThreadSafeProxy<const rmg::Area> Zone::areaUsed() const
{
return ThreadSafeProxy<const rmg::Area>(dAreaUsed, areaMutex);
}
void Zone::clearTiles()
@@ -122,11 +141,6 @@ void Zone::initFreeTiles()
}
}
rmg::Area & Zone::freePaths()
{
return dAreaFree;
}
FactionID Zone::getTownType() const
{
return townType;
@@ -225,18 +239,16 @@ TModificators Zone::getModificators()
void Zone::connectPath(const rmg::Path & path)
///connect current tile to any other free tile within zone
{
dAreaPossible.subtract(path.getPathArea());
dAreaFree.unite(path.getPathArea());
//Lock lock(areaMutex);
areaPossible()->subtract(path.getPathArea());
freePaths()->unite(path.getPathArea());
for(const auto & t : path.getPathArea().getTilesVector())
map.setOccupied(t, ETileType::FREE);
}
void Zone::fractalize()
{
rmg::Area clearedTiles(dAreaFree);
rmg::Area possibleTiles(dAreaPossible);
rmg::Area tilesToIgnore; //will be erased in this iteration
//Squared
float minDistance = 9 * 9;
float freeDistance = pos.z ? (10 * 10) : (9 * 9);
@@ -282,6 +294,13 @@ void Zone::fractalize()
freeDistance = freeDistance * marginFactor;
vstd::amax(freeDistance, 4 * 4);
logGlobal->trace("Zone %d: treasureValue %d blockDistance: %2.f, freeDistance: %2.f", getId(), treasureValue, blockDistance, freeDistance);
Lock lock(areaMutex);
// FIXME: Do not access Area directly
rmg::Area clearedTiles(dAreaFree);
rmg::Area possibleTiles(dAreaPossible);
rmg::Area tilesToIgnore; //will be erased in this iteration
if(type != ETemplateZoneType::JUNCTION)
{
@@ -336,7 +355,7 @@ void Zone::fractalize()
}
}
Lock lock(areaMutex);
//Lock lock(areaMutex);
//Connect with free areas
auto areas = connectedAreas(clearedTiles, true);
for(auto & area : areas)