evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganize root load order

Browse Source 
Turns out increasing the root load thread count is detrimental. The databases are always stepping on eachother's toes
This commit is contained in:
Kae 2023-07-01 04:09:11 +10:00
parent 1a861fb045
commit a8196dfd64
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
source/game/StarRoot.cpp
View File

@ -57,7 +57,7 @@ namespace Star {
namespace { namespace {
unsigned const RootMaintenanceSleep = 5000; unsigned const RootMaintenanceSleep = 5000;
unsigned const RootLoadThreads = 8; unsigned const RootLoadThreads = 4;
} }
atomic<Root*> Root::s_singleton; atomic<Root*> Root::s_singleton;
@ -292,48 +292,53 @@ void Root::fullyLoad() {
auto workerPool = WorkerPool("Root::fullyLoad", RootLoadThreads); auto workerPool = WorkerPool("Root::fullyLoad", RootLoadThreads);
List<WorkerPoolHandle> loaders; List<WorkerPoolHandle> loaders;
loaders.reserve(40);
loaders.append(workerPool.addWork(swallow(bind(&Root::assets, this)))); loaders.append(workerPool.addWork(swallow(bind(&Root::assets, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::configuration, this)))); loaders.append(workerPool.addWork(swallow(bind(&Root::configuration, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::nameGenerator, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::objectDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::plantDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::projectileDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::monsterDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::npcDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::stagehandDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::vehicleDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::playerFactory, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::entityFactory, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::itemDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::materialDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::terrainDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::biomeDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::liquidsDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::statusEffectDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::damageDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::particleDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::effectSourceDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::functionDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::treasureDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::dungeonDefinitions, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::tilesetDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::statisticsDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::emoteProcessor, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::speciesDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::imageMetadataDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::versioningDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::questTemplateDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::aiDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::techDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::codexDatabase, this)))); loaders.append(workerPool.addWork(swallow(bind(&Root::codexDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::behaviorDatabase, this)))); loaders.append(workerPool.addWork(swallow(bind(&Root::behaviorDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::techDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::aiDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::questTemplateDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::emoteProcessor, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::terrainDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::particleDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::versioningDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::functionDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::imageMetadataDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::tenantDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::nameGenerator, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::danceDatabase, this)))); loaders.append(workerPool.addWork(swallow(bind(&Root::danceDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::spawnTypeDatabase, this)))); loaders.append(workerPool.addWork(swallow(bind(&Root::spawnTypeDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::radioMessageDatabase, this)))); loaders.append(workerPool.addWork(swallow(bind(&Root::radioMessageDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::collectionDatabase, this)))); loaders.append(workerPool.addWork(swallow(bind(&Root::collectionDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::statisticsDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::speciesDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::projectileDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::stagehandDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::damageDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::effectSourceDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::statusEffectDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::treasureDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::materialDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::objectDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::npcDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::plantDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::itemDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::monsterDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::vehicleDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::playerFactory, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::entityFactory, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::biomeDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::liquidsDatabase, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::dungeonDefinitions, this))));
loaders.append(workerPool.addWork(swallow(bind(&Root::tilesetDatabase, this))));
auto startSeconds = Time::monotonicTime();
for (auto& loader : loaders) for (auto& loader : loaders)
loader.finish(); loader.finish();
Logger::info("Root: Loaded everything in {} seconds", Time::monotonicTime() - startSeconds);
{ {
MutexLocker locker(m_assetsMutex); MutexLocker locker(m_assetsMutex);