games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +02:00
Code Issues Releases Activity

Thread pool kinda works.

Browse Source
This commit is contained in:
Tomasz Zieliński
2023-05-07 07:48:12 +02:00
parent 3d25c2c6dc
commit a58094aefe
6 changed files with 287 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
lib/rmg/CMapGenerator.cpp
View File

@ -309,7 +309,7 @@ void CMapGenerator::fillZones()
}
//TODO: multiply by the number of modificators
Load::Progress::setupStepsTill(numZones, 240);
std::vector<std::shared_ptr<Zone>> treasureZones;
ThreadPool pool;
@ -318,17 +318,38 @@ void CMapGenerator::fillZones()
//At most one Modificator can run for every zone
pool.init(std::min<int>(std::thread::hardware_concurrency(), numZones));
while (hasJobs())
TModificators allJobs;
for (auto & it : map->getZones())
{
auto job = getNextJob();
if (job)
allJobs.splice(allJobs.end(), it.second->getModificators());
}
Load::Progress::setupStepsTill(allJobs.size(), 240);
while (!allJobs.empty())
{
for (auto it = allJobs.begin(); it != allJobs.end();)
{
futures.push_back(pool.async([this, job]() -> void
{
job.value()();
Progress::Progress::step(); //Update progress bar
}
));
if ((*it)->isFinished())
{
it = allJobs.erase(it);
Progress::Progress::step();
}
else if ((*it)->isReady())
{
auto jobCopy = *it;
futures.emplace_back(pool.async([this, jobCopy]() -> void
{
jobCopy->run();
Progress::Progress::step(); //Update progress bar
}
));
it = allJobs.erase(it);
}
else
{
++it;
}
}
}
@ -441,28 +462,4 @@ Zone * CMapGenerator::getZoneWater() const
return nullptr;
}
bool CMapGenerator::hasJobs()
{
for (auto zone : map->getZones())
{
if (zone.second->hasJobs())
{
return true;
}
}
return false;
}
TRMGJob CMapGenerator::getNextJob()
{
for (auto zone : map->getZones())
{
if (zone.second->hasJobs())
{
return zone.second->getNextJob();
}
}
return TRMGJob();
}
VCMI_LIB_NAMESPACE_END