games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

Synchronize ConnectionPlacers

Browse Source
This commit is contained in:
Tomasz Zieliński 2023-05-20 07:06:27 +02:00
parent 72f8facc82
commit 02586214a1
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/rmg/ConnectionsPlacer.cpp
View File

@ -32,29 +32,44 @@ VCMI_LIB_NAMESPACE_BEGIN
void ConnectionsPlacer::process()
{
collectNeighbourZones();
for(auto & c : dConnections)
auto diningPhilosophers = [this](std::function<void(const rmg::ZoneConnection&)> f)
{
if(c.getZoneA() != zone.getId() && c.getZoneB() != zone.getId())
continue;
if(vstd::contains(dCompleted, c))
continue;
selfSideDirectConnection(c);
}
for (auto& c : dConnections)
{
if (c.getZoneA() != zone.getId() && c.getZoneB() != zone.getId())
continue;
auto otherZone = map.getZones().at(c.getZoneB());
auto* cp = otherZone->getModificator<ConnectionsPlacer>();
while (cp)
{
RecursiveLock lock1(externalAccessMutex, boost::try_to_lock_t{});
RecursiveLock lock2(cp->externalAccessMutex, boost::try_to_lock_t{});
if (lock1.owns_lock() && lock2.owns_lock())
{
if (!vstd::contains(dCompleted, c))
{
f(c);
}
break;
}
}
}
};
diningPhilosophers([this](const rmg::ZoneConnection& c)
{
this->selfSideDirectConnection(c);
});
createBorder(map, zone);
for(auto & c : dConnections)
diningPhilosophers([this](const rmg::ZoneConnection& c)
{
if(c.getZoneA() != zone.getId() && c.getZoneB() != zone.getId())
continue;
if(vstd::contains(dCompleted, c))
continue;
selfSideIndirectConnection(c);
}
this->selfSideIndirectConnection(c);
});
}
void ConnectionsPlacer::init()