DragonX/ObsidianDragon
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

fix(mining): make XmrigManager's thread count atomic

Browse Source 
The requested thread count is written by generateConfig() on the
mining-control thread and read on the UI thread (the thread-grid sync
under idle thread scaling, the pool auto-balance restart) without any
synchronisation. The write also stored the unclamped count first and
clamped it afterwards, so a reader could see more threads than cores.
It is now an atomic, set by one store of the clamped value.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
DanS
2026-10-09 21:09:48 -05:00
co-authored by Claude Opus 5.5
parent 7649b1f8a3
commit c9cb50f4dd
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/xmrig_manager.cpp
+5 -4
View File
@@ -173,9 +173,10 @@ bool XmrigManager::generateConfig(const Config& cfg, const std::string& outPath)
int hw = (int)std::thread::hardware_concurrency(); int hw = (int)std::thread::hardware_concurrency();
if (hw < 1) hw = 1; if (hw < 1) hw = 1;
// Use explicit thread count (not just a hint) // Use explicit thread count (not just a hint). One store: the UI thread reads it (getRequestedThreads).
threads_ = (cfg.threads > 0) ? cfg.threads : std::max(1, hw / 2); int t = (cfg.threads > 0) ? cfg.threads : std::max(1, hw / 2);
if (threads_ > hw) threads_ = hw; if (t > hw) t = hw;
threads_ = t;
json j; json j;
j["autosave"] = false; j["autosave"] = false;
@@ -324,7 +325,7 @@ bool XmrigManager::start(const Config& cfg) {
return false; return false;
} }
DEBUG_LOGF("[INFO] XmrigManager: config written to %s (API port %d, threads %d)\n", DEBUG_LOGF("[INFO] XmrigManager: config written to %s (API port %d, threads %d)\n",
cfgPath.c_str(), api_port_, threads_); cfgPath.c_str(), api_port_, threads_.load());
// Spawn process // Spawn process
if (!startProcess(binary, cfgPath, threads_)) { if (!startProcess(binary, cfgPath, threads_)) {
src/daemon/xmrig_manager.h
+1 -1
View File
@@ -173,7 +173,7 @@ private:
// xmrig HTTP API credentials (random per session) // xmrig HTTP API credentials (random per session)
int api_port_ = 0; int api_port_ = 0;
std::string api_token_; std::string api_token_;
int threads_ = 0; // Thread count for mining std::atomic<int> threads_{0}; // Thread count for mining (written on the mining-control thread, read by the UI)
std::string pool_host_; // Pool hostname for stats API std::string pool_host_; // Pool hostname for stats API
PoolStats stats_; PoolStats stats_;
mutable std::mutex stats_mutex_; mutable std::mutex stats_mutex_;