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

ThreadPool implementation. It runs, but dies from race conditions.

Browse Source
This commit is contained in:
Tomasz Zieliński
2023-05-06 18:54:19 +02:00
parent a952a9e279
commit a8545935c3
9 changed files with 413 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
lib/rmg/CMapGenerator.cpp
View File

@ -23,6 +23,7 @@
#include "Zone.h"
#include "Functions.h"
#include "RmgMap.h"
#include "threadpool/ThreadPool.h"
#include "ObjectManager.h"
#include "TreasurePlacer.h"
#include "RoadPlacer.h"
@ -294,9 +295,12 @@ void CMapGenerator::fillZones()
logGlobal->info("Started filling zones");
size_t numZones = map->getZones().size();
//we need info about all town types to evaluate dwellings and pandoras with creatures properly
//place main town in the middle
Load::Progress::setupStepsTill(map->getZones().size(), 50);
Load::Progress::setupStepsTill(numZones, 50);
for (const auto& it : map->getZones())
{
it.second->initFreeTiles();
@ -304,16 +308,40 @@ void CMapGenerator::fillZones()
Progress::Progress::step();
}
Load::Progress::setupStepsTill(map->getZones().size(), 240);
//TODO: multiply by the number of modificators
Load::Progress::setupStepsTill(numZones, 240);
std::vector<std::shared_ptr<Zone>> treasureZones;
ThreadPool pool;
std::vector<boost::future<void>> futures;
//At most one Modificator can run for every zone
pool.init(std::min<int>(std::thread::hardware_concurrency(), numZones));
while (hasJobs())
{
auto job = getNextJob();
if (job)
{
futures.push_back(pool.async([this, job]() -> void
{
job.value()();
Progress::Progress::step(); //Update progress bar
}
));
}
}
//Wait for all the tasks
for (auto& fut : futures)
{
fut.get();
}
for (const auto& it : map->getZones())
{
it.second->processModificators();
if (it.second->getType() == ETemplateZoneType::TREASURE)
treasureZones.push_back(it.second);
Progress::Progress::step();
}
//find place for Grail
@ -381,7 +409,7 @@ const std::vector<ArtifactID> & CMapGenerator::getAllPossibleQuestArtifacts() co
return questArtifacts;
}
const std::vector<HeroTypeID>& CMapGenerator::getAllPossibleHeroes() const
const std::vector<HeroTypeID> CMapGenerator::getAllPossibleHeroes() const
{
//Skip heroes that were banned, including the ones placed in prisons
std::vector<HeroTypeID> ret;
@ -395,11 +423,13 @@ const std::vector<HeroTypeID>& CMapGenerator::getAllPossibleHeroes() const
void CMapGenerator::banQuestArt(const ArtifactID & id)
{
//TODO: Protect with mutex
map->map().allowedArtifact[id] = false;
}
void CMapGenerator::banHero(const HeroTypeID & id)
{
//TODO: Protect with mutex
map->map().allowedHeroes[id] = false;
}
@ -411,4 +441,28 @@ 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