From d35893d926c74893d7c85d1b87b24ffa55744649 Mon Sep 17 00:00:00 2001 From: fireice-uk Date: Thu, 9 Nov 2017 22:43:08 +0000 Subject: Multi-pool final version (#90) * Multi-pool first draft * Fix wspace from new IDE * Better TLS error message * Fix TLS bug * Don't put dev pool on stats + pool change-back * bug fixes * Error message work * fix win build * add per-pool nicehash setting * Fix bugs * rm debug msg * Multipool guided setup * Support TLS and Nicehash in config * prelim jconf changes * final multipool changes * increase default retry_time to 30, fix mac erro * rm debug dev pool settings * Fix another source of connect runaway --- xmrstak/backend/cpu/jconf.hpp | 3 --- xmrstak/backend/globalStates.hpp | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'xmrstak/backend') diff --git a/xmrstak/backend/cpu/jconf.hpp b/xmrstak/backend/cpu/jconf.hpp index 3c7da49..f843ed4 100644 --- a/xmrstak/backend/cpu/jconf.hpp +++ b/xmrstak/backend/cpu/jconf.hpp @@ -31,9 +31,6 @@ public: bool GetThreadConfig(size_t id, thd_cfg &cfg); bool NeedsAutoconf(); - - - private: jconf(); static jconf* oInst; diff --git a/xmrstak/backend/globalStates.hpp b/xmrstak/backend/globalStates.hpp index 1c28d5c..9fdda2a 100644 --- a/xmrstak/backend/globalStates.hpp +++ b/xmrstak/backend/globalStates.hpp @@ -6,6 +6,7 @@ #include +constexpr static size_t invalid_pool_id = (-1); namespace xmrstak { @@ -15,7 +16,7 @@ struct pool_data uint32_t iSavedNonce; size_t pool_id; - pool_data() : iSavedNonce(0), pool_id(0) + pool_data() : iSavedNonce(0), pool_id(invalid_pool_id) { } }; @@ -46,7 +47,7 @@ struct globalStates std::atomic iConsumeCnt; std::atomic iGlobalNonce; uint64_t iThreadCount; - size_t pool_id; + size_t pool_id = invalid_pool_id; private: globalStates() : iThreadCount(0) -- cgit v1.1