Merge ead82cdba9 into a32f9b5b04

CHANGELOG.md

@@ -1,10 +1,3 @@
-# v6.22.1
-- [#3531](https://github.com/xmrig/xmrig/pull/3531) Always reset nonce on RandomX dataset change.
-- [#3534](https://github.com/xmrig/xmrig/pull/3534) Fixed threads auto-config on Zen5.
-- [#3535](https://github.com/xmrig/xmrig/pull/3535) RandomX: tweaks for Zen5.
-- [#3539](https://github.com/xmrig/xmrig/pull/3539) Added Zen5 to `randomx_boost.sh`.
-- [#3540](https://github.com/xmrig/xmrig/pull/3540) Detect AMD engineering samples in `randomx_boost.sh`.
-
 # v6.22.0
 - [#2411](https://github.com/xmrig/xmrig/pull/2411) Added support for [Yada](https://yadacoin.io/) (`rx/yada` algorithm).
 - [#3492](https://github.com/xmrig/xmrig/pull/3492) Fixed `--background` option on Unix systems.

src/backend/cpu/CpuBackend.cpp

@@ -180,11 +180,11 @@ public:
         }
     #   endif
 
-        mutex.lock();
+        {
+            std::lock_guard<std::mutex> lock(mutex);
 
-        pages += status.hugePages();
+            pages += status.hugePages();
-
+        }
-        mutex.unlock();
 
         rapidjson::Value hugepages;
 
@@ -380,14 +380,14 @@ void xmrig::CpuBackend::setJob(const Job &job)
 
 void xmrig::CpuBackend::start(IWorker *worker, bool ready)
 {
-    mutex.lock();
+    {
+        std::lock_guard<std::mutex> lock(mutex);
 
-    if (d_ptr->status.started(worker, ready)) {
+        if (d_ptr->status.started(worker, ready)) {
-        d_ptr->status.print();
+            d_ptr->status.print();
+        }
     }
 
-    mutex.unlock();
-
     if (ready) {
         worker->start();
     }

src/backend/cuda/CudaBackend.cpp

@@ -452,16 +452,17 @@ void xmrig::CudaBackend::setJob(const Job &job)
 
 void xmrig::CudaBackend::start(IWorker *worker, bool ready)
 {
-    mutex.lock();
+    {
+        std::lock_guard<std::mutex> lock(mutex);
 
-    if (d_ptr->status.started(ready)) {
+        if (d_ptr->status.started(ready)) {
-        d_ptr->status.print();
+            d_ptr->status.print();
+
+            CudaWorker::ready = true;
+        }
 
-        CudaWorker::ready = true;
     }
 
-    mutex.unlock();
-
     if (ready) {
         worker->start();
     }

src/backend/opencl/OclBackend.cpp

@@ -438,16 +438,16 @@ void xmrig::OclBackend::setJob(const Job &job)
 
 void xmrig::OclBackend::start(IWorker *worker, bool ready)
 {
-    mutex.lock();
+    {
+        std::lock_guard<std::mutex> lock(mutex);
 
-    if (d_ptr->status.started(ready)) {
+        if (d_ptr->status.started(ready)) {
-        d_ptr->status.print();
+            d_ptr->status.print();
 
-        OclWorker::ready = true;
+            OclWorker::ready = true;
+        }
     }
 
-    mutex.unlock();
-
     if (ready) {
         worker->start();
     }

src/core/Miner.cpp

@@ -556,7 +556,14 @@ void xmrig::Miner::setJob(const Job &job, bool donate)
 
     d_ptr->algorithm = job.algorithm();
 
-    mutex.lock();
+#   ifdef XMRIG_ALGO_RANDOMX
+    bool ready = false;
+#   else
+    constexpr const bool ready = true;
+#   endif
+
+    {
+    std::lock_guard<std::mutex> lock(mutex);
 
     const uint8_t index = donate ? 1 : 0;
 
@@ -575,14 +582,12 @@ void xmrig::Miner::setJob(const Job &job, bool donate)
     }
 
 #   ifdef XMRIG_ALGO_RANDOMX
-    const bool ready = d_ptr->initRX();
+    ready = d_ptr->initRX();
 
     // Always reset nonce on RandomX dataset change
     if (!ready) {
         d_ptr->reset = true;
     }
-#   else
-    constexpr const bool ready = true;
 #   endif
 
 #   ifdef XMRIG_ALGO_GHOSTRIDER
@@ -591,7 +596,7 @@ void xmrig::Miner::setJob(const Job &job, bool donate)
     }
 #   endif
 
-    mutex.unlock();
+    }
 
     d_ptr->active = true;
     d_ptr->m_taskbar.setActive(true);

src/version.h

@@ -22,7 +22,7 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "6.22.1"
+#define APP_VERSION   "6.22.1-dev"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2024 xmrig.com"