Merge f0f6d1666c into d5a8f8a5ae

KawPow: fixed data race when building programs

CMakeLists.txt

@@ -32,6 +32,7 @@ option(WITH_VAES            "Enable VAES instructions for Cryptonight" ON)
 option(WITH_BENCHMARK       "Enable builtin RandomX benchmark and stress test" ON)
 option(WITH_SECURE_JIT      "Enable secure access to JIT memory" OFF)
 option(WITH_DMI             "Enable DMI/SMBIOS reader" ON)
+option(WITH_BUNDLED_FMT     "Force use of bundled fmt library" ON)
 
 option(BUILD_STATIC         "Build static binary" OFF)
 option(ARM_V8               "Force ARMv8 (64 bit) architecture, use with caution if automatic detection fails, but you sure it may work" OFF)
@@ -198,6 +199,7 @@ add_definitions(-D__STDC_FORMAT_MACROS -DUNICODE -D_FILE_OFFSET_BITS=64)
 find_package(UV REQUIRED)
 
 include(cmake/flags.cmake)
+include(cmake/fmt.cmake)
 include(cmake/randomx.cmake)
 include(cmake/argon2.cmake)
 include(cmake/kawpow.cmake)
@@ -229,7 +231,7 @@ include(src/hw/api/api.cmake)
 include(src/hw/dmi/dmi.cmake)
 
 include_directories(src)
-include_directories(src/3rdparty)
+include_directories(src/3rdparty/CL)
 include_directories(${UV_INCLUDE_DIR})
 
 if (WITH_DEBUG_LOG)
@@ -237,7 +239,7 @@ if (WITH_DEBUG_LOG)
 endif()
 
 add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ETHASH_LIBRARY} ${GHOSTRIDER_LIBRARY})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ETHASH_LIBRARY} ${GHOSTRIDER_LIBRARY} ${FMT_LIBRARY})
 
 if (WIN32)
     add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/bin/WinRing0/WinRing0x64.sys" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)

cmake/fmt.cmake

@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: © 2023 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+
+if(WITH_BUNDLED_FMT)
+    add_library(fmt INTERFACE)
+    target_sources(fmt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/fmt/format.cc)
+    target_include_directories(fmt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/fmt)
+else()
+    set(FMT_LIBRARY fmt)
+    find_package(fmt REQUIRED)
+    set(FMT_LIBRARY fmt::fmt)
+endif()

src/3rdparty/cl.h

@@ -29,7 +29,7 @@
 #if defined(__APPLE__)
 #   include <OpenCL/cl.h>
 #else
-#   include "3rdparty/CL/cl.h"
+#   include <CL/cl.h>
 #endif
 
 

src/3rdparty/fmt/fmt/format.cc

@@ -5,7 +5,7 @@
 //
 // For the license information refer to format.h.
 
-#include "3rdparty/fmt/format-inl.h"
+#include "fmt/format-inl.h"
 
 FMT_BEGIN_NAMESPACE
 namespace detail {

src/backend/cpu/platform/lscpu_arm.cpp

@@ -18,11 +18,11 @@
  */
 
 #include "base/tools/String.h"
-#include "3rdparty/fmt/core.h"
 
 
 #include <cstdio>
 #include <cctype>
+#include <fmt/core.h>
 
 
 namespace xmrig {

src/backend/opencl/runners/tools/OclKawPow.cpp

@@ -399,6 +399,9 @@ private:
     uv_loop_t* m_loop          = nullptr;
     uv_thread_t m_loopThread   = {};
     uv_async_t m_shutdownAsync = {};
+    uv_async_t m_batonAsync    = {};
+
+    std::vector<KawPowBaton> m_batons;
 
     static void loop(void* data)
     {
@@ -419,19 +422,37 @@ void KawPowBuilder::build_async(const IOclRunner& runner, uint64_t period, uint3
     if (!m_loop) {
         m_loop = new uv_loop_t{};
         uv_loop_init(m_loop);
-        uv_async_init(m_loop, &m_shutdownAsync, [](uv_async_t* handle) { uv_close(reinterpret_cast<uv_handle_t*>(handle), nullptr); });
+
+        uv_async_init(m_loop, &m_shutdownAsync, [](uv_async_t* handle)
+            {
+                KawPowBuilder* builder = reinterpret_cast<KawPowBuilder*>(handle->data);
+                uv_close(reinterpret_cast<uv_handle_t*>(&builder->m_shutdownAsync), nullptr);
+                uv_close(reinterpret_cast<uv_handle_t*>(&builder->m_batonAsync), nullptr);
+            });
+
+        uv_async_init(m_loop, &m_batonAsync, [](uv_async_t* handle)
+            {
+                std::vector<KawPowBaton> batons;
+                {
+                    KawPowBuilder* b = reinterpret_cast<KawPowBuilder*>(handle->data);
+
+                    std::lock_guard<std::mutex> lock(b->m_mutex);
+                    batons = std::move(b->m_batons);
+                }
+
+                for (const KawPowBaton& baton : batons) {
+                    builder.build(baton.runner, baton.period, baton.worksize);
+                }
+            });
+
+        m_shutdownAsync.data = this;
+        m_batonAsync.data = this;
+
         uv_thread_create(&m_loopThread, loop, this);
     }
 
-    KawPowBaton* baton = new KawPowBaton(runner, period, worksize);
+    m_batons.emplace_back(runner, period, worksize);
-
+    uv_async_send(&m_batonAsync);
-    uv_queue_work(m_loop, &baton->req,
-        [](uv_work_t* req) {
-            KawPowBaton* baton = static_cast<KawPowBaton*>(req->data);
-            builder.build(baton->runner, baton->period, baton->worksize);
-        },
-        [](uv_work_t* req, int) { delete static_cast<KawPowBaton*>(req->data); }
-    );
 }
 
 

src/backend/opencl/wrappers/AdlLib_linux.cpp

@@ -20,7 +20,6 @@
 
 
 #include "backend/opencl/wrappers/AdlLib.h"
-#include "3rdparty/fmt/core.h"
 #include "backend/opencl/wrappers/OclDevice.h"
 
 
@@ -31,6 +30,7 @@
 #include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <fmt/core.h>
 
 
 namespace xmrig {

src/base/base.cmake

@@ -88,7 +88,6 @@ set(HEADERS_BASE
    )
 
 set(SOURCES_BASE
-    src/3rdparty/fmt/format.cc
     src/base/crypto/Algorithm.cpp
     src/base/crypto/Coin.cpp
     src/base/crypto/keccak.cpp

src/base/kernel/Process.cpp

@@ -22,10 +22,10 @@
 
 
 #include "base/kernel/Process.h"
-#include "3rdparty/fmt/core.h"
 #include "base/tools/Chrono.h"
 #include "version.h"
 
+#include <fmt/core.h>
 
 #ifdef XMRIG_OS_WIN
 #   ifdef _MSC_VER

src/base/net/stratum/BaseClient.cpp

@@ -17,7 +17,6 @@
  */
 
 #include "base/net/stratum/BaseClient.h"
-#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "base/io/Env.h"
 #include "base/io/log/Log.h"
@@ -25,6 +24,8 @@
 #include "base/kernel/interfaces/IClientListener.h"
 #include "base/net/stratum/SubmitResult.h"
 
+#include <fmt/core.h>
+
 
 namespace xmrig {
 

src/base/net/stratum/benchmark/BenchClient.cpp

@@ -17,7 +17,6 @@
  */
 
 #include "base/net/stratum/benchmark/BenchClient.h"
-#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "backend/common/benchmark/BenchState.h"
 #include "backend/common/interfaces/IBackend.h"
@@ -39,6 +38,8 @@
 #   include "hw/dmi/DmiReader.h"
 #endif
 
+#include <fmt/core.h>
+
 
 xmrig::BenchClient::BenchClient(const std::shared_ptr<BenchConfig> &benchmark, IClientListener* listener) :
     m_listener(listener),

src/base/net/stratum/benchmark/BenchConfig.cpp

@@ -17,12 +17,12 @@
  */
 
 #include "base/net/stratum/benchmark/BenchConfig.h"
-#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
 
 
 #include <string>
+#include <fmt/core.h>
 
 
 #ifdef _MSC_VER

src/crypto/common/LinuxMemory.cpp

@@ -17,12 +17,12 @@
  */
 
 #include "crypto/common/LinuxMemory.h"
-#include "3rdparty/fmt/core.h"
 #include "crypto/common/VirtualMemory.h"
 
 
 #include <algorithm>
 #include <fstream>
+#include <fmt/core.h>
 #include <mutex>
 #include <string>
 

src/hw/dmi/DmiMemory.cpp

@@ -20,7 +20,6 @@
 
 
 #include "hw/dmi/DmiMemory.h"
-#include "3rdparty/fmt/format.h"
 #include "3rdparty/rapidjson/document.h"
 #include "hw/dmi/DmiTools.h"
 
@@ -28,6 +27,7 @@
 #include <algorithm>
 #include <array>
 #include <regex>
+#include <fmt/format.h>
 
 
 namespace xmrig {

src/hw/dmi/DmiReader.cpp

@@ -19,10 +19,11 @@
  */
 
 #include "hw/dmi/DmiReader.h"
-#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "hw/dmi/DmiTools.h"
 
+#include <fmt/core.h>
+
 
 namespace xmrig {
 

src/hw/msr/Msr_linux.cpp

@@ -18,7 +18,6 @@
 
 
 #include "hw/msr/Msr.h"
-#include "3rdparty/fmt/core.h"
 #include "backend/cpu/Cpu.h"
 #include "base/io/log/Log.h"
 
@@ -29,6 +28,7 @@
 #include <cstdio>
 #include <dirent.h>
 #include <fcntl.h>
+#include <fmt/core.h>
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>