mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 13:33:02 +01:00
Code Issues Releases Wiki Activity

Refactor file indexing, this now properly uses all CPU power

Browse Source
This commit is contained in:
ζeh Matt
2024-07-31 23:57:14 +03:00
parent da6fb7872a
commit 3e9a7bda83
2 changed files with 13 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/openrct2/core/FileIndex.hpp
View File

@@ -166,30 +166,6 @@ private:
return ScanResult(stats, std::move(files));
}
void BuildRange(
int32_t language, const ScanResult& scanResult, size_t rangeStart, size_t rangeEnd, std::vector<TItem>& items,
std::atomic<size_t>& processed, std::mutex& printLock) const
{
items.reserve(rangeEnd - rangeStart);
for (size_t i = rangeStart; i < rangeEnd; i++)
{
const auto& filePath = scanResult.Files.at(i);
if (_log_levels[EnumValue(DiagnosticLevel::Verbose)])
{
std::lock_guard<std::mutex> lock(printLock);
LOG_VERBOSE("FileIndex:Indexing '%s'", filePath.c_str());
}
if (auto item = Create(language, filePath); item.has_value())
{
items.push_back(std::move(item.value()));
}
++processed;
}
}
std::vector<TItem> Build(int32_t language, const ScanResult& scanResult) const
{
std::vector<TItem> allItems;
@@ -201,43 +177,27 @@ private:
if (totalCount > 0)
{
JobPool jobPool;
std::mutex printLock; // For verbose prints.
std::list<std::vector<TItem>> containers;
size_t stepSize = 100; // Handpicked, seems to work well with 4/8 cores.
std::mutex mtx;
std::atomic<size_t> processed{ 0 };
auto reportProgress = [&]() {
const size_t completed = processed;
OpenRCT2::Console::WriteFormat(
"File %5zu of %zu, done %3d%%\r", completed, totalCount, completed * 100 / totalCount);
OpenRCT2::GetContext()->SetProgress(static_cast<uint32_t>(completed), static_cast<uint32_t>(totalCount));
};
for (size_t rangeStart = 0; rangeStart < totalCount; rangeStart += stepSize)
for (size_t i = 0; i < totalCount; i++)
{
if (rangeStart + stepSize > totalCount)
{
stepSize = totalCount - rangeStart;
}
jobPool.AddTask([&, index = i]() {
const auto& filePath = scanResult.Files.at(index);
auto& items = containers.emplace_back();
if (auto item = Create(language, filePath); item.has_value())
{
std::lock_guard lock(mtx);
allItems.push_back(std::move(item.value()));
}
jobPool.AddTask([&, rangeStart, stepSize]() {
BuildRange(language, scanResult, rangeStart, rangeStart + stepSize, items, processed, printLock);
processed++;
});
reportProgress();
}
jobPool.Join(reportProgress);
for (const auto& itr : containers)
{
allItems.insert(allItems.end(), itr.begin(), itr.end());
}
jobPool.Join([&]() {
OpenRCT2::GetContext()->SetProgress(static_cast<uint32_t>(processed.load()), static_cast<uint32_t>(totalCount));
});
}
WriteIndexFile(language, scanResult.Stats, allItems);

2
src/openrct2/scenes/preloader/PreloaderScene.cpp
View File

@@ -15,8 +15,6 @@
#include "../../GameState.h"
#include "../../OpenRCT2.h"
#include "../../audio/audio.h"
#include "../../drawing/IDrawingContext.h"
#include "../../drawing/IDrawingEngine.h"
#include "../../interface/Viewport.h"
#include "../../interface/Window.h"
#include "../../localisation/LocalisationService.h"