Merge ead82cdba9 into e8bbd134f9

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v6.22.2
+- [#3569](https://github.com/xmrig/xmrig/pull/3569) Fixed corrupted API output in some rare conditions.
+- [#3571](https://github.com/xmrig/xmrig/pull/3571) Fixed number of threads on the new Intel Core Ultra CPUs.
+
 # 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.

src/backend/cpu/CpuBackend.cpp

@@ -180,11 +180,11 @@ public:
         }
     #   endif
 
-        mutex.lock();
+        {
+            std::lock_guard<std::mutex> lock(mutex);
 
             pages += status.hugePages();
-
+        }
-        mutex.unlock();
 
         rapidjson::Value hugepages;
 
@@ -380,13 +380,13 @@ 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)) {
             d_ptr->status.print();
         }
-
+    }
-    mutex.unlock();
 
     if (ready) {
         worker->start();

src/backend/cuda/CudaBackend.cpp

@@ -465,7 +465,8 @@ 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)) {
             d_ptr->status.print();
@@ -473,7 +474,7 @@ void xmrig::CudaBackend::start(IWorker *worker, bool ready)
             CudaWorker::ready = true;
         }
 
-    mutex.unlock();
+    }
 
     if (ready) {
         worker->start();

src/backend/opencl/OclBackend.cpp

@@ -447,15 +447,15 @@ 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)) {
             d_ptr->status.print();
 
             OclWorker::ready = true;
         }
-
+    }
-    mutex.unlock();
 
     if (ready) {
         worker->start();

src/core/Miner.cpp

@@ -569,7 +569,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;
 
@@ -588,14 +595,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
@@ -604,7 +609,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.2-dev"
+#define APP_VERSION   "6.22.3-dev"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2024 xmrig.com"
@@ -30,7 +30,7 @@
 
 #define APP_VER_MAJOR  6
 #define APP_VER_MINOR  22
-#define APP_VER_PATCH  2
+#define APP_VER_PATCH  3
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1930)