Merge 8f507b7d09 into 64f5bb467a

Enabled keepalive for Windows (>= Vista)

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/base/kernel/Platform.h

@@ -49,6 +49,8 @@ public:
     static inline bool isUserActive(uint64_t ms)    { return idleTime() < ms; }
     static inline const String &userAgent()         { return m_userAgent; }
 
+    static bool hasKeepalive();
+
     static bool isOnBatteryPower();
     static uint64_t idleTime();
 

src/base/kernel/Platform_mac.cpp

@@ -55,6 +55,12 @@ char *xmrig::Platform::createUserAgent()
 }
 
 
+bool xmrig::Platform::hasKeepalive()
+{
+    return true;
+}
+
+
 bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id)
 {
     return true;

src/base/kernel/Platform_unix.cpp

@@ -70,6 +70,12 @@ char *xmrig::Platform::createUserAgent()
 }
 
 
+bool xmrig::Platform::hasKeepalive()
+{
+    return true;
+}
+
+
 #ifndef XMRIG_FEATURE_HWLOC
 #ifdef __DragonFly__
 

src/base/kernel/Platform_win.cpp

@@ -70,6 +70,12 @@ char *xmrig::Platform::createUserAgent()
 }
 
 
+bool xmrig::Platform::hasKeepalive()
+{
+    return winOsVersion().dwMajorVersion >= 6;
+}
+
+
 #ifndef XMRIG_FEATURE_HWLOC
 bool xmrig::Platform::setThreadAffinity(uint64_t cpu_id)
 {

src/base/net/stratum/Client.cpp

@@ -50,6 +50,7 @@
 #include "base/tools/Cvt.h"
 #include "base/tools/cryptonote/BlobReader.h"
 #include "net/JobResult.h"
+#include "base/kernel/Platform.h"
 
 
 #ifdef _MSC_VER
@@ -567,9 +568,9 @@ void xmrig::Client::connect(const sockaddr *addr)
     uv_tcp_init(uv_default_loop(), m_socket);
     uv_tcp_nodelay(m_socket, 1);
 
-#   ifndef WIN32
+    if (Platform::hasKeepalive()) {
-    uv_tcp_keepalive(m_socket, 1, 60);
+        uv_tcp_keepalive(m_socket, 1, 60);
-#   endif
+    }
 
     uv_tcp_connect(req, m_socket, addr, onConnect);
 }

src/base/net/stratum/DaemonClient.cpp

@@ -46,6 +46,7 @@
 #include "base/tools/Timer.h"
 #include "base/tools/cryptonote/Signatures.h"
 #include "net/JobResult.h"
+#include "base/kernel/Platform.h"
 
 
 #ifdef XMRIG_FEATURE_TLS
@@ -358,9 +359,9 @@ void xmrig::DaemonClient::onResolved(const DnsRecords &records, int status, cons
     uv_tcp_init(uv_default_loop(), s);
     uv_tcp_nodelay(s, 1);
 
-#   ifndef WIN32
+    if (Platform::hasKeepalive()) {
-    uv_tcp_keepalive(s, 1, 60);
+        uv_tcp_keepalive(s, 1, 60);
-#   endif
+    }
 
     if (m_pool.zmq_port() > 0) {
         delete m_ZMQSocket;

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.20.0"
+#define APP_VERSION   "6.20.1-dev"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2023 xmrig.com"
@@ -30,7 +30,7 @@
 
 #define APP_VER_MAJOR  6
 #define APP_VER_MINOR  20
-#define APP_VER_PATCH  0
+#define APP_VER_PATCH  1
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1930)