Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-11-03 02:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ugc): cars and rockets are made before models

Browse Source 
The game client asks for a car's or rocket's icon as soon as it is
built, so their jobs now go to the front of the UGC server's queue, and a
few are picked up on every poll even while the queue is full of player
models (newest builds first, as before).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-27 20:22:54 -05:00
parent cfc8d33190
commit 70b9635930
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dUgcServer/UgcProcessor.cpp
View File

@@ -300,11 +300,16 @@ void UgcProcessor::Poll() {
if (m_Paused) return; if (m_Paused) return;
// Enough to keep every worker busy until the next poll // Enough to keep every worker busy until the next poll
const size_t wanted = std::max<size_t>(m_Threads.size() * 2, m_Config.pollBatch); const size_t wanted = std::max<size_t>(m_Threads.size() * 2, m_Config.pollBatch);
if (queued + active >= wanted) return; // Cars and rockets come first: the game client asks for their icons as soon as they're built. So a few are polled
const auto limit = static_cast<uint32_t>(wanted - queued - active + m_InFlight.size()); // even when the queue is full of models, and they go to the front of the queue.
const bool full = queued + active >= wanted;
const auto limit = full ? 0u : static_cast<uint32_t>(wanted - queued - active + m_InFlight.size());
const auto buildLimit = std::max<uint32_t>(limit, static_cast<uint32_t>(m_Threads.size() + m_InFlight.size()));
std::vector<Job> jobs; std::vector<Job> jobs;
for (auto& model : Database::Get()->GetUgcModelsToProcess(limit)) { std::vector<IUgc::PendingModel> models;
if (limit > 0) models = Database::Get()->GetUgcModelsToProcess(limit);
for (auto& model : models) {
if (m_InFlight.contains({ Kind::MODEL, model.id })) continue; if (m_InFlight.contains({ Kind::MODEL, model.id })) continue;
Job job{ Kind::MODEL, model.id, model.attempts, UgcJobs::LxfmlFromBlob(model.lxfml) }; Job job{ Kind::MODEL, model.id, model.attempts, UgcJobs::LxfmlFromBlob(model.lxfml) };
if (job.blob.empty()) job.blob = std::move(model.lxfml); // the worker reports it can't be read if (job.blob.empty()) job.blob = std::move(model.lxfml); // the worker reports it can't be read
@@ -314,7 +319,7 @@ void UgcProcessor::Poll() {
jobs.push_back(std::move(job)); jobs.push_back(std::move(job));
} }
// Cars and rockets: one icon per combination of modules, shared by every build of it // Cars and rockets: one icon per combination of modules, shared by every build of it
for (auto& build : Database::Get()->GetModularBuildsToProcess(limit)) { for (auto& build : Database::Get()->GetModularBuildsToProcess(buildLimit)) {
if (m_InFlight.contains({ Kind::MODULAR, build.id })) continue; if (m_InFlight.contains({ Kind::MODULAR, build.id })) continue;
const auto key = UgcModularKey::Normalize(build.modules); const auto key = UgcModularKey::Normalize(build.modules);
if (key.empty()) { if (key.empty()) {
@@ -354,7 +359,8 @@ void UgcProcessor::Poll() {
std::lock_guard lock(m_Mutex); std::lock_guard lock(m_Mutex);
for (auto& job : jobs) { for (auto& job : jobs) {
if (job.kind == Kind::MODEL) m_InFlight.insert({ job.kind, job.id }); if (job.kind == Kind::MODEL) m_InFlight.insert({ job.kind, job.id });
m_Jobs.push_back(std::move(job)); if (job.kind == Kind::MODULAR) m_Jobs.push_front(std::move(job));
else m_Jobs.push_back(std::move(job));
} }
} }
m_Wake.notify_all(); m_Wake.notify_all();