1
0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-12 16:15:20 +02:00

Restore behavior of emergequeue_limit_total (#15947)

* And make sure `emergequeue_limit_total` is >= max(`emergequeue_limit_diskonly`, `emergequeue_limit_generate`)
This commit is contained in:
lhofhansl
2025-03-27 18:59:38 -07:00
committed by GitHub
parent db15bc6466
commit fbc525d683

View File

@@ -108,7 +108,7 @@ EmergeManager::EmergeManager(Server *server, MetricsBackend *mb)
// don't trust user input for something very important like this // don't trust user input for something very important like this
m_qlimit_diskonly = rangelim(m_qlimit_diskonly, 2, 1000000); m_qlimit_diskonly = rangelim(m_qlimit_diskonly, 2, 1000000);
m_qlimit_generate = rangelim(m_qlimit_generate, 1, 1000000); m_qlimit_generate = rangelim(m_qlimit_generate, 1, 1000000);
m_qlimit_total = std::max(m_qlimit_diskonly, m_qlimit_generate); m_qlimit_total = std::max(m_qlimit_total, std::max(m_qlimit_diskonly, m_qlimit_generate));
for (s16 i = 0; i < nthreads; i++) for (s16 i = 0; i < nthreads; i++)
m_threads.push_back(new EmergeThread(server, i)); m_threads.push_back(new EmergeThread(server, i));