Merge 8f507b7d09 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/common/common.cmake

@@ -20,7 +20,7 @@ set(SOURCES_BACKEND_COMMON
     src/backend/common/Workers.cpp
    )
 
-if (WITH_RANDOMX AND WITH_BENCHMARK)
+if (WITH_BENCHMARK AND (WITH_RANDOMX OR WITH_GHOSTRIDER))
     list(APPEND HEADERS_BACKEND_COMMON
         src/backend/common/benchmark/Benchmark.h
         src/backend/common/benchmark/BenchState_test.h

src/base/base.cmake

@@ -259,7 +259,7 @@ if (WITH_KAWPOW OR WITH_GHOSTRIDER)
 endif()
 
 
-if (WITH_RANDOMX AND WITH_BENCHMARK)
+if (WITH_BENCHMARK AND (WITH_RANDOMX OR WITH_GHOSTRIDER))
     add_definitions(/DXMRIG_FEATURE_BENCHMARK)
 
     list(APPEND HEADERS_BASE

src/crypto/ghostrider/ghostrider.cpp

@@ -333,8 +333,8 @@ void benchmark()
 
         const CnHash::AlgoVariant* av = Cpu::info()->hasAES() ? av_hw_aes : av_soft_aes;
 
-        uint8_t buf[80];
+        uint8_t buf[80] = { 0 };
-        uint8_t hash[32 * 8];
+        uint8_t hash[32 * 8] = { 0 };
 
         LOG_VERBOSE("%24s |  N  | Hashrate", "Algorithm");
         LOG_VERBOSE("-------------------------|-----|-------------");
@@ -540,10 +540,13 @@ HelperThread* create_helper_thread(int64_t cpu_index, int priority, const std::v
             });
 
             if (hwloc_bitmap_weight(helper_cpu_set) > 0) {
+                hwloc_bitmap_free(main_threads_set);
                 return new HelperThread(helper_cpu_set, priority, is8MB);
             }
         }
     }
+    hwloc_bitmap_free(helper_cpu_set);
+    hwloc_bitmap_free(main_threads_set);
 #endif
 
     return nullptr;

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)