1
0
mirror of https://github.com/xmrig/xmrig.git synced 2026-01-31 09:22:59 -05:00

Compare commits

...

4 Commits

Author SHA1 Message Date
Tony Butler
acf04add5f Merge 1ed99453dd into e8bbd134f9 2024-11-03 18:25:44 +01:00
XMRig
e8bbd134f9 v6.22.3-dev 2024-11-03 15:06:54 +07:00
XMRig
cf86a1e05c Merge branch 'master' into dev 2024-11-03 15:06:22 +07:00
Tony Butler
1ed99453dd CpuBackend/setJob: do not return early for same-threads if the algo is
different

Occasionally under some conditions autoswitching would not stop/start
between algos which also didn't reset the running hashrate averages
2024-08-20 19:08:57 -06:00
2 changed files with 3 additions and 3 deletions

View File

@@ -352,7 +352,7 @@ void xmrig::CpuBackend::setJob(const Job &job)
const auto &cpu = d_ptr->controller->config()->cpu(); const auto &cpu = d_ptr->controller->config()->cpu();
auto threads = cpu.get(d_ptr->controller->miner(), job.algorithm()); auto threads = cpu.get(d_ptr->controller->miner(), job.algorithm());
if (!d_ptr->threads.empty() && d_ptr->threads.size() == threads.size() && std::equal(d_ptr->threads.begin(), d_ptr->threads.end(), threads.begin())) { if (!d_ptr->threads.empty() && d_ptr->threads.size() == threads.size() && std::equal(d_ptr->threads.begin(), d_ptr->threads.end(), threads.begin()) && d_ptr->algo == job.algorithm()) {
return; return;
} }

View File

@@ -22,7 +22,7 @@
#define APP_ID "xmrig" #define APP_ID "xmrig"
#define APP_NAME "XMRig" #define APP_NAME "XMRig"
#define APP_DESC "XMRig miner" #define APP_DESC "XMRig miner"
#define APP_VERSION "6.22.2" #define APP_VERSION "6.22.3-dev"
#define APP_DOMAIN "xmrig.com" #define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com" #define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2024 xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2024 xmrig.com"
@@ -30,7 +30,7 @@
#define APP_VER_MAJOR 6 #define APP_VER_MAJOR 6
#define APP_VER_MINOR 22 #define APP_VER_MINOR 22
#define APP_VER_PATCH 2 #define APP_VER_PATCH 3
#ifdef _MSC_VER #ifdef _MSC_VER
# if (_MSC_VER >= 1930) # if (_MSC_VER >= 1930)