Move legacy code to v6 folder.

CHANGELOG.md

@@ -1,63 +1,3 @@
-# v6.21.0
-- [#3302](https://github.com/xmrig/xmrig/pull/3302) [#3312](https://github.com/xmrig/xmrig/pull/3312) Enabled keepalive for Windows (>= Vista).
-- [#3320](https://github.com/xmrig/xmrig/pull/3320) Added "built for OS/architecture/bits" to "ABOUT".
-- [#3339](https://github.com/xmrig/xmrig/pull/3339) Added SNI option for TLS connections.
-- [#3342](https://github.com/xmrig/xmrig/pull/3342) Update `cn_main_loop.asm`.
-- [#3346](https://github.com/xmrig/xmrig/pull/3346) ARM64 JIT: don't use `x18` register.
-- [#3348](https://github.com/xmrig/xmrig/pull/3348) Update to latest `sse2neon.h`.
-- [#3356](https://github.com/xmrig/xmrig/pull/3356) Updated pricing record size for **Zephyr** solo mining.
-- [#3358](https://github.com/xmrig/xmrig/pull/3358) **Zephyr** solo mining: handle multiple outputs.
-
-# v6.20.0
-- Added new ARM CPU names.
-- [#2394](https://github.com/xmrig/xmrig/pull/2394) Added new CMake options `ARM_V8` and `ARM_V7`.
-- [#2830](https://github.com/xmrig/xmrig/pull/2830) Added API rebind polling.
-- [#2927](https://github.com/xmrig/xmrig/pull/2927) Fixed compatibility with hwloc 1.11.x.
-- [#3060](https://github.com/xmrig/xmrig/pull/3060) Added x86 to `README.md`.
-- [#3236](https://github.com/xmrig/xmrig/pull/3236) Fixed: receive CUDA loader error on Linux too.
-- [#3290](https://github.com/xmrig/xmrig/pull/3290) Added [Zephyr](https://www.zephyrprotocol.com/) coin support for solo mining.
-
-# v6.19.3
-- [#3245](https://github.com/xmrig/xmrig/issues/3245) Improved algorithm negotiation for donation rounds by sending extra information about current mining job.
-- [#3254](https://github.com/xmrig/xmrig/pull/3254) Tweaked auto-tuning for Intel CPUs.
-- [#3271](https://github.com/xmrig/xmrig/pull/3271) RandomX: optimized program generation.
-- [#3273](https://github.com/xmrig/xmrig/pull/3273) RandomX: fixed undefined behavior.
-- [#3275](https://github.com/xmrig/xmrig/pull/3275) RandomX: fixed `jccErratum` list.
-- [#3280](https://github.com/xmrig/xmrig/pull/3280) Updated example scripts.
-
-# v6.19.2
-- [#3230](https://github.com/xmrig/xmrig/pull/3230) Fixed parsing of `TX_EXTRA_MERGE_MINING_TAG`.
-- [#3232](https://github.com/xmrig/xmrig/pull/3232) Added new `X-Hash-Difficulty` HTTP header.
-- [#3240](https://github.com/xmrig/xmrig/pull/3240) Improved .cmd files when run by shortcuts on another drive.
-- [#3241](https://github.com/xmrig/xmrig/pull/3241) Added view tag calculation (fixes Wownero solo mining issue).
-
-# v6.19.1
-- Resolved deprecated methods warnings with OpenSSL 3.0.
-- [#3213](https://github.com/xmrig/xmrig/pull/3213) Fixed build with 32-bit clang 15.
-- [#3218](https://github.com/xmrig/xmrig/pull/3218) Fixed: `--randomx-wrmsr=-1` worked only on Intel.
-- [#3228](https://github.com/xmrig/xmrig/pull/3228) Fixed build with gcc 13.
-
-# v6.19.0
-- [#3144](https://github.com/xmrig/xmrig/pull/3144) Update to latest `sse2neon.h`.
-- [#3161](https://github.com/xmrig/xmrig/pull/3161) MSVC build: enabled parallel compilation.
-- [#3163](https://github.com/xmrig/xmrig/pull/3163) Improved Zen 3 MSR mod.
-- [#3176](https://github.com/xmrig/xmrig/pull/3176) Update cmake required version to 3.1.
-- [#3182](https://github.com/xmrig/xmrig/pull/3182) DragonflyBSD compilation fixes.
-- [#3196](https://github.com/xmrig/xmrig/pull/3196) Show IP address for failed connections.
-- [#3185](https://github.com/xmrig/xmrig/issues/3185) Fixed macOS DMI reader.
-- [#3198](https://github.com/xmrig/xmrig/pull/3198) Fixed broken RandomX light mode mining.
-- [#3202](https://github.com/xmrig/xmrig/pull/3202) Solo mining: added job timeout (default is 15 seconds).
-
-# v6.18.1
-- [#3129](https://github.com/xmrig/xmrig/pull/3129) Fix: protectRX flushed CPU cache only on MacOS/iOS.
-- [#3126](https://github.com/xmrig/xmrig/pull/3126) Don't reset when pool sends the same job blob.
-- [#3120](https://github.com/xmrig/xmrig/pull/3120) RandomX: optimized `CFROUND` elimination.
-- [#3109](https://github.com/xmrig/xmrig/pull/3109) RandomX: added Blake2 AVX2 version.
-- [#3082](https://github.com/xmrig/xmrig/pull/3082) Fixed GCC 12 warnings.
-- [#3075](https://github.com/xmrig/xmrig/pull/3075) Recognize `armv7ve` as valid ARMv7 target.
-- [#3132](https://github.com/xmrig/xmrig/pull/3132) RandomX: added MSR mod for Zen 4.
-- [#3134](https://github.com/xmrig/xmrig/pull/3134) Added Zen4 to `randomx_boost.sh`.
-
 # v6.18.0
 - [#3067](https://github.com/xmrig/xmrig/pull/3067) Monero v15 network upgrade support and more house keeping.
   - Removed deprecated AstroBWTv1 and v2.

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 2.8.12)
 project(xmrig)
 
 option(WITH_HWLOC           "Enable hwloc support" ON)
@@ -27,15 +27,13 @@ option(WITH_STRICT_CACHE    "Enable strict checks for OpenCL cache" ON)
 option(WITH_INTERLEAVE_DEBUG_LOG "Enable debug log for threads interleave" OFF)
 option(WITH_PROFILING       "Enable profiling for developers" OFF)
 option(WITH_SSE4_1          "Enable SSE 4.1 for Blake2" ON)
-option(WITH_AVX2            "Enable AVX2 for Blake2" ON)
 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(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)
-option(ARM_V7               "Force ARMv7 (32 bit) architecture, use with caution if automatic detection fails, but you sure it may work" OFF)
+option(ARM_TARGET           "Force use specific ARM target 8 or 7" 0)
 option(HWLOC_DEBUG          "Enable hwloc debug helpers and log" OFF)
 
 
@@ -158,14 +156,12 @@ endif()
 if (XMRIG_OS_WIN)
     list(APPEND SOURCES_OS
         res/app.rc
-        src/App_win.cpp
         src/crypto/common/VirtualMemory_win.cpp
         )
 
     set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv)
 elseif (XMRIG_OS_APPLE)
     list(APPEND SOURCES_OS
-        src/App_unix.cpp
         src/crypto/common/VirtualMemory_unix.cpp
         )
 
@@ -174,7 +170,6 @@ elseif (XMRIG_OS_APPLE)
     set(EXTRA_LIBS ${IOKIT_LIBRARY} ${CORESERVICES_LIBRARY})
 else()
     list(APPEND SOURCES_OS
-        src/App_unix.cpp
         src/crypto/common/VirtualMemory_unix.cpp
         )
 
@@ -192,7 +187,7 @@ else()
     endif()
 endif()
 
-add_definitions(-DXMRIG_MINER_PROJECT -DXMRIG_JSON_SINGLE_LINE_ARRAY)
+add_definitions(-DXMRIG_MINER_PROJECT -DXMRIG_LEGACY -DXMRIG_JSON_SINGLE_LINE_ARRAY)
 add_definitions(-D__STDC_FORMAT_MACROS -DUNICODE -D_FILE_OFFSET_BITS=64)
 
 find_package(UV REQUIRED)

README.md

@@ -10,7 +10,7 @@
 XMRig is a high performance, open source, cross platform RandomX, KawPow, CryptoNight and [GhostRider](https://github.com/xmrig/xmrig/tree/master/src/crypto/ghostrider#readme) unified CPU/GPU miner and [RandomX benchmark](https://xmrig.com/benchmark). Official binaries are available for Windows, Linux, macOS and FreeBSD.
 
 ## Mining backends
-- **CPU** (x86/x64/ARMv7/ARMv8)
+- **CPU** (x64/ARMv7/ARMv8)
 - **OpenCL** for AMD GPUs.
 - **CUDA** for NVIDIA GPUs via external [CUDA plugin](https://github.com/xmrig/xmrig-cuda).
 

cmake/cpu.cmake

@@ -25,20 +25,13 @@ if (XMRIG_64_BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$")
     add_definitions(-DRAPIDJSON_SSE2)
 else()
     set(WITH_SSE4_1 OFF)
-    set(WITH_AVX2 OFF)
     set(WITH_VAES OFF)
 endif()
 
-if (ARM_V8)
-    set(ARM_TARGET 8)
-elseif (ARM_V7)
-    set(ARM_TARGET 7)
-endif()
-
 if (NOT ARM_TARGET)
     if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|armv8-a)$")
         set(ARM_TARGET 8)
-    elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l|armv7ve)$")
+    elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l)$")
         set(ARM_TARGET 7)
     endif()
 endif()
@@ -64,7 +57,3 @@ endif()
 if (WITH_SSE4_1)
     add_definitions(-DXMRIG_FEATURE_SSE4_1)
 endif()
-
-if (WITH_AVX2)
-    add_definitions(-DXMRIG_FEATURE_AVX2)
-endif()

cmake/flags.cmake

@@ -10,7 +10,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
 endif()
 
 if (CMAKE_BUILD_TYPE STREQUAL "Release")
-    add_definitions(-DNDEBUG)
+    add_definitions(/DNDEBUG)
 endif()
 
 include(CheckSymbolExists)
@@ -32,7 +32,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
 
-        add_definitions(-DHAVE_ROTR)
+        add_definitions(/DHAVE_ROTR)
     endif()
 
     if (WIN32)
@@ -49,16 +49,28 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
     endif()
 
-    add_definitions(-D_GNU_SOURCE -DHAVE_BUILTIN_CLEAR_CACHE)
+    add_definitions(/D_GNU_SOURCE)
+
+    if (${CMAKE_VERSION} VERSION_LESS "3.1.0")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    endif()
+
+    #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -gdwarf-2")
+
+    add_definitions(/DHAVE_BUILTIN_CLEAR_CACHE)
 
 elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-    set(CMAKE_C_FLAGS_RELEASE "/MP /MT /O2 /Oi /DNDEBUG /GL")
-    set(CMAKE_CXX_FLAGS_RELEASE "/MP /MT /O2 /Oi /DNDEBUG /GL")
+    set(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Oi /DNDEBUG /GL")
+    set(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Oi /DNDEBUG /GL")
 
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MP /Ob1 /Zi /DRELWITHDEBINFO")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MP /Ob1 /Zi /DRELWITHDEBINFO")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "/Ob1 /Zi /DRELWITHDEBINFO")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Ob1 /Zi /DRELWITHDEBINFO")
 
-    add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DNOMINMAX -DHAVE_ROTR)
+    add_definitions(/D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(/D_CRT_NONSTDC_NO_WARNINGS)
+    add_definitions(/DNOMINMAX)
+    add_definitions(/DHAVE_ROTR)
 
 elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
 
@@ -80,7 +92,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
 
         check_symbol_exists("_rotr" "x86intrin.h" HAVE_ROTR)
         if (HAVE_ROTR)
-            add_definitions(-DHAVE_ROTR)
+            add_definitions(/DHAVE_ROTR)
         endif()
     endif()
 
@@ -93,6 +105,6 @@ endif()
 if (NOT WIN32)
     check_symbol_exists("__builtin___clear_cache" "stdlib.h" HAVE_BUILTIN_CLEAR_CACHE)
     if (HAVE_BUILTIN_CLEAR_CACHE)
-        add_definitions(-DHAVE_BUILTIN_CLEAR_CACHE)
+        add_definitions(/DHAVE_BUILTIN_CLEAR_CACHE)
     endif()
 endif()

cmake/os.cmake

@@ -15,7 +15,7 @@ else()
         set(XMRIG_OS_ANDROID ON)
     elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
         set(XMRIG_OS_LINUX ON)
-    elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL DragonFly)
+    elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
         set(XMRIG_OS_FREEBSD ON)
     endif()
 endif()

cmake/randomx.cmake

@@ -76,15 +76,7 @@ if (WITH_RANDOMX)
         list(APPEND SOURCES_CRYPTO src/crypto/randomx/blake2/blake2b_sse41.c)
 
         if (CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
-            set_source_files_properties(src/crypto/randomx/blake2/blake2b_sse41.c PROPERTIES COMPILE_FLAGS "-Ofast -msse4.1")
-        endif()
-    endif()
-
-    if (WITH_AVX2)
-        list(APPEND SOURCES_CRYPTO src/crypto/randomx/blake2/avx2/blake2b_avx2.c)
-
-        if (CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
-            set_source_files_properties(src/crypto/randomx/blake2/avx2/blake2b_avx2.c PROPERTIES COMPILE_FLAGS "-Ofast -mavx2")
+            set_source_files_properties(src/crypto/randomx/blake2/blake2b_sse41.c PROPERTIES COMPILE_FLAGS -msse4.1)
         endif()
     endif()
 

res/app.rc

@@ -20,7 +20,7 @@ VS_VERSION_INFO VERSIONINFO
     BEGIN
       BLOCK "000004b0"
       BEGIN
-        VALUE "CompanyName",      APP_SITE
+        VALUE "CompanyName",      APP_DOMAIN
         VALUE "FileDescription",  APP_DESC
         VALUE "FileVersion",      APP_VERSION
         VALUE "LegalCopyright",   APP_COPYRIGHT

scripts/benchmark_10M.cmd

@@ -1,4 +1,4 @@
 @echo off
-cd /d "%~dp0"
+cd %~dp0
 xmrig.exe --bench=10M --submit
 pause

scripts/benchmark_1M.cmd

@@ -1,4 +1,4 @@
 @echo off
-cd /d "%~dp0"
+cd %~dp0
 xmrig.exe --bench=1M --submit
 pause

scripts/build.hwloc.sh

@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
 HWLOC_VERSION_MAJOR="2"
-HWLOC_VERSION_MINOR="9"
-HWLOC_VERSION_PATCH="0"
+HWLOC_VERSION_MINOR="7"
+HWLOC_VERSION_PATCH="1"
 
 HWLOC_VERSION="${HWLOC_VERSION_MAJOR}.${HWLOC_VERSION_MINOR}.${HWLOC_VERSION_PATCH}"
 

scripts/build.openssl.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-OPENSSL_VERSION="1.1.1s"
+OPENSSL_VERSION="1.1.1o"
 
 mkdir -p deps
 mkdir -p deps/include

scripts/build.openssl3.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-OPENSSL_VERSION="3.0.7"
+OPENSSL_VERSION="3.0.3"
 
 mkdir -p deps
 mkdir -p deps/include

scripts/build.uv.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-UV_VERSION="1.44.2"
+UV_VERSION="1.44.1"
 
 mkdir -p deps
 mkdir -p deps/include

scripts/pool_mine_example.cmd

@@ -15,6 +15,6 @@
 :: Choose pools outside of top 5 to help Monero network be more decentralized!
 :: Smaller pools also often have smaller fees/payout limits.
 
-cd /d "%~dp0"
-xmrig.exe -o xmrpool.eu:3333 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD -p x
+cd %~dp0
+xmrig.exe -o pool.hashvault.pro:3333 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD -p x
 pause

scripts/randomx_boost.sh

@@ -10,24 +10,14 @@ fi
 
 if grep -E 'AMD Ryzen|AMD EPYC' /proc/cpuinfo > /dev/null;
 	then
-	if grep "cpu family[[:space:]]\{1,\}:[[:space:]]25" /proc/cpuinfo > /dev/null;
+	if grep "cpu family[[:space:]]:[[:space:]]25" /proc/cpuinfo > /dev/null;
 		then
-			if grep "model[[:space:]]\{1,\}:[[:space:]]97" /proc/cpuinfo > /dev/null;
-				then
-					echo "Detected Zen4 CPU"
-					wrmsr -a 0xc0011020 0x4400000000000
-					wrmsr -a 0xc0011021 0x4000000000040
-					wrmsr -a 0xc0011022 0x8680000401570000
-					wrmsr -a 0xc001102b 0x2040cc10
-					echo "MSR register values for Zen4 applied"
-				else
-					echo "Detected Zen3 CPU"
-					wrmsr -a 0xc0011020 0x4480000000000
-					wrmsr -a 0xc0011021 0x1c000200000040
-					wrmsr -a 0xc0011022 0xc000000401570000
-					wrmsr -a 0xc001102b 0x2000cc10
-					echo "MSR register values for Zen3 applied"
-				fi
+			echo "Detected Zen3 CPU"
+			wrmsr -a 0xc0011020 0x4480000000000
+			wrmsr -a 0xc0011021 0x1c000200000040
+			wrmsr -a 0xc0011022 0xc000000401500000
+			wrmsr -a 0xc001102b 0x2000cc14
+			echo "MSR register values for Zen3 applied"
 		else
 			echo "Detected Zen1/Zen2 CPU"
 			wrmsr -a 0xc0011020 0

scripts/rtm_ghostrider_example.cmd

@@ -15,7 +15,7 @@
 :: Choose pools outside of top 5 to help Raptoreum network be more decentralized!
 :: Smaller pools also often have smaller fees/payout limits.
 
-cd /d "%~dp0"
+cd %~dp0
 :: Use this command line to connect to non-SSL port
 xmrig.exe -a gr -o raptoreumemporium.com:3008 -u WALLET_ADDRESS -p x
 :: Or use this command line to connect to an SSL port

scripts/solo_mine_example.cmd

@@ -11,6 +11,6 @@
 :: Mining solo is the best way to help Monero network be more decentralized!
 :: But you will only get a payout when you find a block which can take more than a year for a single low-end PC.
 
-cd /d "%~dp0"
-xmrig.exe -o YOUR_NODE_IP:18081 -a rx/0 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD --daemon
+cd %~dp0
+xmrig.exe -o node.xmr.to:18081 -a rx/0 -u 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD --daemon
 pause

src/3rdparty/argon2/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 2.8.12)
 
 project(argon2 C)
 set(CMAKE_C_STANDARD 99)

src/3rdparty/hwloc/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required (VERSION  2.8.12)
 project (hwloc C)
 
 include_directories(include)

src/3rdparty/hwloc/NEWS

@@ -17,50 +17,6 @@ bug fixes (and other actions) for each version of hwloc since version
 0.9.
 
 
-Version 2.9.0
--------------
-* Backends
-  + Expose the memory size of CXL memory devices (Type 3) on Linux.
-  + The LevelZero backend now reports the "XeLinkBandwidth" distance
-    matrix between L0 devices (and subdevices) when available.
-  + Add support for CUDA compute capability up to 9.0.
-* Tools
-  + lstopo now switches to console mode when its output is redirected.
-    Graphical window mode may be forced back with --of window.
-  + hwloc-calc now accepts "numa" in -H, and I/O subtypes such as "gpu"
-    in -I and -N.
-
-
-Version 2.8.0
--------------
-* API
-  + Add HWLOC_TOPOLOGY_FLAG_NO_DISTANCES, _NO_MEMATTRS and _NO_CPUKINDS
-    to reduce the overhead when unneeded.
-  + Add separate Read/Write Bandwidth/Latency memory attributes and
-    implement them on Linux.
-* Backends
-  + NUMA nodes may now have a subtype such as DRAM, HBM, SPM, or NVM
-    on heterogeneous memory platforms on Linux.
-    - Add DAXType and DAXParent attributes on Linux to tell where a
-      DAX device or its corresponding NUMA node come from (SPM for
-      Specific-Purpose or NVM for Non-Volatile Memory).
-  + Detect heterogeneous caches in hybrid CPUs on MacOS X,
-    thanks to Paul Bone for the help.
-  + Max frequencies are not ignored in Linux cpukinds anymore (they were
-    ignored in hwloc 2.7.0), but they may be slightly adjusted to avoid
-    reporting hybrid CPUs because Intel Turbo Boost Max 3.0.
-    - See the documentation of environment variable HWLOC_CPUKINDS_MAXFREQ.
-  + Hardwire the PCI locality of HPE Cray EX235a nodes.
-* Tools
-  + lstopo and other tools may now load Linux and x86 cpuid topology files
-    from a tarball.
-  + lstopo may now replace the P# and L# index prefixes with custom strings
-    thanks to --os-index-prefix and --logical-index-prefix options.
-* Misc
-  + Add --disable-readme to avoid regenerating the top-level hwloc README
-    file from the documentation.
-
-
 Version 2.7.1
 -------------
 * Workaround crashes when virtual machines report incoherent x86 CPUID

src/3rdparty/hwloc/README

@@ -78,7 +78,7 @@ debug and report issues.
 Questions may be sent to the users or developers mailing lists (https://
 www.open-mpi.org/community/lists/hwloc.php).
 
-There is also a #hwloc IRC channel on Libera Chat (irc.libera.chat).
+There is also a #hwloc IRC channel on Freenode (irc.freenode.net).
 
 
 

src/3rdparty/hwloc/VERSION

@@ -8,8 +8,8 @@
 # Please update HWLOC_VERSION* in contrib/windows/hwloc_config.h too.
 
 major=2
-minor=9
-release=0
+minor=7
+release=1
 
 # greek is used for alpha or beta release tags.  If it is non-empty,
 # it will be appended to the version number.  It does not have to be
@@ -22,7 +22,7 @@ greek=
 
 # The date when this release was created
 
-date="Dec 14, 2022"
+date="Mar 20, 2022"
 
 # If snapshot=1, then use the value from snapshot_version as the
 # entire hwloc version (i.e., ignore major, minor, release, and
@@ -41,7 +41,7 @@ snapshot_version=${major}.${minor}.${release}${greek}-git
 # 2. Version numbers are described in the Libtool current:revision:age
 # format.
 
-libhwloc_so_version=21:1:6
+libhwloc_so_version=20:3:5
 libnetloc_so_version=0:0:0
 
 # Please also update the <TargetName> lines in contrib/windows/libhwloc.vcxproj

src/3rdparty/hwloc/include/hwloc.h

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2021 Inria.  All rights reserved.
  * Copyright © 2009-2012 Université Bordeaux
  * Copyright © 2009-2020 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -93,7 +93,7 @@ extern "C" {
  * Two stable releases of the same series usually have the same ::HWLOC_API_VERSION
  * even if their HWLOC_VERSION are different.
  */
-#define HWLOC_API_VERSION 0x00020800
+#define HWLOC_API_VERSION 0x00020500
 
 /** \brief Indicate at runtime which hwloc API version was used at build time.
  *
@@ -971,7 +971,7 @@ HWLOC_DECLSPEC const char * hwloc_obj_type_string (hwloc_obj_type_t type) __hwlo
  *
  * If \p size is 0, \p string may safely be \c NULL.
  *
- * \return the number of characters that were actually written if not truncating,
+ * \return the number of character that were actually written if not truncating,
  * or that would have been written (not including the ending \\0).
  */
 HWLOC_DECLSPEC int hwloc_obj_type_snprintf(char * __hwloc_restrict string, size_t size,
@@ -986,7 +986,7 @@ HWLOC_DECLSPEC int hwloc_obj_type_snprintf(char * __hwloc_restrict string, size_
  *
  * If \p size is 0, \p string may safely be \c NULL.
  *
- * \return the number of characters that were actually written if not truncating,
+ * \return the number of character that were actually written if not truncating,
  * or that would have been written (not including the ending \\0).
  */
 HWLOC_DECLSPEC int hwloc_obj_attr_snprintf(char * __hwloc_restrict string, size_t size,
@@ -2060,26 +2060,7 @@ enum hwloc_topology_flags_e {
    * not change to due thread binding changes on Windows
    * (see ::HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING).
    */
-  HWLOC_TOPOLOGY_FLAG_DONT_CHANGE_BINDING = (1UL<<6),
-
-  /** \brief Ignore distances.
-   *
-   * Ignore distance information from the operating systems (and from XML)
-   * and hence do not use distances for grouping.
-   */
-  HWLOC_TOPOLOGY_FLAG_NO_DISTANCES = (1UL<<7),
-
-  /** \brief Ignore memory attributes.
-   *
-   * Ignore memory attribues from the operating systems (and from XML).
-   */
-  HWLOC_TOPOLOGY_FLAG_NO_MEMATTRS = (1UL<<8),
-
-  /** \brief Ignore CPU Kinds.
-   *
-   * Ignore CPU kind information from the operating systems (and from XML).
-   */
-  HWLOC_TOPOLOGY_FLAG_NO_CPUKINDS = (1UL<<9)
+  HWLOC_TOPOLOGY_FLAG_DONT_CHANGE_BINDING = (1UL<<6)
 };
 
 /** \brief Set OR'ed flags to non-yet-loaded topology.

src/3rdparty/hwloc/include/hwloc/autogen/config.h

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2021 Inria.  All rights reserved.
  * Copyright © 2009-2012 Université Bordeaux
  * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -11,10 +11,10 @@
 #ifndef HWLOC_CONFIG_H
 #define HWLOC_CONFIG_H
 
-#define HWLOC_VERSION "2.9.0"
+#define HWLOC_VERSION "2.7.1"
 #define HWLOC_VERSION_MAJOR 2
-#define HWLOC_VERSION_MINOR 9
-#define HWLOC_VERSION_RELEASE 0
+#define HWLOC_VERSION_MINOR 7
+#define HWLOC_VERSION_RELEASE 1
 #define HWLOC_VERSION_GREEK ""
 
 #define __hwloc_restrict

src/3rdparty/hwloc/include/hwloc/bitmap.h

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2020 Inria.  All rights reserved.
  * Copyright © 2009-2012 Université Bordeaux
  * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -112,7 +112,7 @@ HWLOC_DECLSPEC int hwloc_bitmap_copy(hwloc_bitmap_t dst, hwloc_const_bitmap_t sr
  *
  * If \p buflen is 0, \p buf may safely be \c NULL.
  *
- * \return the number of characters that were actually written if not truncating,
+ * \return the number of character that were actually written if not truncating,
  * or that would have been written (not including the ending \\0).
  */
 HWLOC_DECLSPEC int hwloc_bitmap_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap);
@@ -137,7 +137,7 @@ HWLOC_DECLSPEC int hwloc_bitmap_sscanf(hwloc_bitmap_t bitmap, const char * __hwl
  *
  * If \p buflen is 0, \p buf may safely be \c NULL.
  *
- * \return the number of characters that were actually written if not truncating,
+ * \return the number of character that were actually written if not truncating,
  * or that would have been written (not including the ending \\0).
  */
 HWLOC_DECLSPEC int hwloc_bitmap_list_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap);
@@ -161,7 +161,7 @@ HWLOC_DECLSPEC int hwloc_bitmap_list_sscanf(hwloc_bitmap_t bitmap, const char *
  *
  * If \p buflen is 0, \p buf may safely be \c NULL.
  *
- * \return the number of characters that were actually written if not truncating,
+ * \return the number of character that were actually written if not truncating,
  * or that would have been written (not including the ending \\0).
  */
 HWLOC_DECLSPEC int hwloc_bitmap_taskset_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap);
@@ -357,11 +357,11 @@ HWLOC_DECLSPEC int hwloc_bitmap_last_unset(hwloc_const_bitmap_t bitmap) __hwloc_
  * The loop must start with hwloc_bitmap_foreach_begin() and end
  * with hwloc_bitmap_foreach_end() followed by a terminating ';'.
  *
- * \p id is the loop variable; it should be an unsigned int.  The
- * first iteration will set \p id to the lowest index in the bitmap.
+ * \p index is the loop variable; it should be an unsigned int.  The
+ * first iteration will set \p index to the lowest index in the bitmap.
  * Successive iterations will iterate through, in order, all remaining
  * indexes set in the bitmap.  To be specific: each iteration will return a
- * value for \p id such that hwloc_bitmap_isset(bitmap, id) is true.
+ * value for \p index such that hwloc_bitmap_isset(bitmap, index) is true.
  *
  * The assert prevents the loop from being infinite if the bitmap is infinitely set.
  *

src/3rdparty/hwloc/include/hwloc/deprecated.h

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2021 Inria.  All rights reserved.
  * Copyright © 2009-2012 Université Bordeaux
  * Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -55,7 +55,7 @@ hwloc_topology_insert_misc_object_by_parent(hwloc_topology_t topology, hwloc_obj
  *
  * If \p size is 0, \p string may safely be \c NULL.
  *
- * \return the number of characters that were actually written if not truncating,
+ * \return the number of character that were actually written if not truncating,
  * or that would have been written (not including the ending \\0).
  */
 static __hwloc_inline int

src/3rdparty/hwloc/include/hwloc/distances.h

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010-2022 Inria.  All rights reserved.
+ * Copyright © 2010-2021 Inria.  All rights reserved.
  * See COPYING in top-level directory.
  */
 
@@ -35,8 +35,8 @@ extern "C" {
  * from a core in another node.
  * The corresponding kind is ::HWLOC_DISTANCES_KIND_FROM_OS | ::HWLOC_DISTANCES_KIND_FROM_USER.
  * The name of this distances structure is "NUMALatency".
- * Others distance structures include and "XGMIBandwidth", "XGMIHops",
- * "XeLinkBandwidth" and "NVLinkBandwidth".
+ * Others distance structures include and "XGMIBandwidth", "XGMIHops"
+ * and "NVLinkBandwidth".
  *
  * The matrix may also contain bandwidths between random sets of objects,
  * possibly provided by the user, as specified in the \p kind attribute.
@@ -160,8 +160,7 @@ hwloc_distances_get_by_type(hwloc_topology_t topology, hwloc_obj_type_t type,
  * Usually only one distances structure may match a given name.
  *
  * The name of the most common structure is "NUMALatency".
- * Others include "XGMIBandwidth", "XGMIHops", "XeLinkBandwidth",
- * and "NVLinkBandwidth".
+ * Others include "XGMIBandwidth", "XGMIHops" and "NVLinkBandwidth".
  */
 HWLOC_DECLSPEC int
 hwloc_distances_get_by_name(hwloc_topology_t topology, const char *name,

src/3rdparty/hwloc/include/hwloc/helper.h

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2021 Inria.  All rights reserved.
  * Copyright © 2009-2012 Université Bordeaux
  * Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -886,6 +886,9 @@ enum hwloc_distrib_flags_e {
  * \p flags should be 0 or a OR'ed set of ::hwloc_distrib_flags_e.
  *
  * \note This function requires the \p roots objects to have a CPU set.
+ *
+ * \note This function replaces the now deprecated hwloc_distribute()
+ * and hwloc_distributev() functions.
  */
 static __hwloc_inline int
 hwloc_distrib(hwloc_topology_t topology,

src/3rdparty/hwloc/include/hwloc/intel-mic.h

@@ -0,0 +1,136 @@
+/*
+ * Copyright © 2013-2016 Inria.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/** \file
+ * \brief Macros to help interaction between hwloc and Intel Xeon Phi (MIC).
+ *
+ * Applications that use both hwloc and Intel Xeon Phi (MIC) may want to
+ * include this file so as to get topology information for MIC devices.
+ */
+
+#ifndef HWLOC_INTEL_MIC_H
+#define HWLOC_INTEL_MIC_H
+
+#include "hwloc.h"
+#include "hwloc/autogen/config.h"
+#include "hwloc/helper.h"
+
+#ifdef HWLOC_LINUX_SYS
+#include "hwloc/linux.h"
+
+#include <dirent.h>
+#include <string.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/** \defgroup hwlocality_intel_mic Interoperability with Intel Xeon Phi (MIC)
+ *
+ * This interface offers ways to retrieve topology information about
+ * Intel Xeon Phi (MIC) devices.
+ *
+ * @{
+ */
+
+/** \brief Get the CPU set of logical processors that are physically
+ * close to MIC device whose index is \p idx.
+ *
+ * Return the CPU set describing the locality of the MIC device whose index is \p idx.
+ *
+ * Topology \p topology and device index \p idx must match the local machine.
+ * I/O devices detection is not needed in the topology.
+ *
+ * The function only returns the locality of the device.
+ * If more information about the device is needed, OS objects should
+ * be used instead, see hwloc_intel_mic_get_device_osdev_by_index().
+ *
+ * This function is currently only implemented in a meaningful way for
+ * Linux; other systems will simply get a full cpuset.
+ */
+static __hwloc_inline int
+hwloc_intel_mic_get_device_cpuset(hwloc_topology_t topology __hwloc_attribute_unused,
+				  int idx __hwloc_attribute_unused,
+				  hwloc_cpuset_t set)
+{
+#ifdef HWLOC_LINUX_SYS
+	/* If we're on Linux, use the sysfs mechanism to get the local cpus */
+#define HWLOC_INTEL_MIC_DEVICE_SYSFS_PATH_MAX 128
+	char path[HWLOC_INTEL_MIC_DEVICE_SYSFS_PATH_MAX];
+	DIR *sysdir = NULL;
+	struct dirent *dirent;
+	unsigned pcibus, pcidev, pcifunc;
+
+	if (!hwloc_topology_is_thissystem(topology)) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	sprintf(path, "/sys/class/mic/mic%d", idx);
+	sysdir = opendir(path);
+	if (!sysdir)
+		return -1;
+
+	while ((dirent = readdir(sysdir)) != NULL) {
+		if (sscanf(dirent->d_name, "pci_%02x:%02x.%02x", &pcibus, &pcidev, &pcifunc) == 3) {
+			sprintf(path, "/sys/class/mic/mic%d/pci_%02x:%02x.%02x/local_cpus", idx, pcibus, pcidev, pcifunc);
+			if (hwloc_linux_read_path_as_cpumask(path, set) < 0
+			    || hwloc_bitmap_iszero(set))
+				hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
+			break;
+		}
+	}
+
+	closedir(sysdir);
+#else
+	/* Non-Linux systems simply get a full cpuset */
+	hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
+#endif
+	return 0;
+}
+
+/** \brief Get the hwloc OS device object corresponding to the
+ * MIC device for the given index.
+ *
+ * Return the OS device object describing the MIC device whose index is \p idx.
+ * Return NULL if there is none.
+ *
+ * The topology \p topology does not necessarily have to match the current
+ * machine. For instance the topology may be an XML import of a remote host.
+ * I/O devices detection must be enabled in the topology.
+ *
+ * \note The corresponding PCI device object can be obtained by looking
+ * at the OS device parent object.
+ */
+static __hwloc_inline hwloc_obj_t
+hwloc_intel_mic_get_device_osdev_by_index(hwloc_topology_t topology,
+					  unsigned idx)
+{
+	hwloc_obj_t osdev = NULL;
+	while ((osdev = hwloc_get_next_osdev(topology, osdev)) != NULL) {
+		if (HWLOC_OBJ_OSDEV_COPROC == osdev->attr->osdev.type
+                    && osdev->name
+		    && !strncmp("mic", osdev->name, 3)
+		    && atoi(osdev->name + 3) == (int) idx)
+                        return osdev;
+        }
+        return NULL;
+}
+
+/** @} */
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+
+#endif /* HWLOC_INTEL_MIC_H */

src/3rdparty/hwloc/include/hwloc/memattrs.h

@@ -54,8 +54,6 @@ extern "C" {
  * Attribute values for these nodes, if any, may then be obtained with
  * hwloc_memattr_get_value() and manually compared with the desired criteria.
  *
- * \sa An example is available in doc/examples/memory-attributes.c in the source tree.
- *
  * \note The API also supports specific objects as initiator,
  * but it is currently not used internally by hwloc.
  * Users may for instance use it to provide custom performance
@@ -67,19 +65,19 @@ extern "C" {
 
 /** \brief Memory node attributes. */
 enum hwloc_memattr_id_e {
-  /** \brief
-   * The \"Capacity\" is returned in bytes (local_memory attribute in objects).
+  /** \brief "Capacity".
+   * The capacity is returned in bytes
+   * (local_memory attribute in objects).
    *
    * Best capacity nodes are nodes with <b>higher capacity</b>.
    *
    * No initiator is involved when looking at this attribute.
    * The corresponding attribute flags are ::HWLOC_MEMATTR_FLAG_HIGHER_FIRST.
-   * \hideinitializer
    */
   HWLOC_MEMATTR_ID_CAPACITY = 0,
 
-  /** \brief
-   * The \"Locality\" is returned as the number of PUs in that locality
+  /** \brief "Locality".
+   * The locality is returned as the number of PUs in that locality
    * (e.g. the weight of its cpuset).
    *
    * Best locality nodes are nodes with <b>smaller locality</b>
@@ -89,87 +87,26 @@ enum hwloc_memattr_id_e {
    *
    * No initiator is involved when looking at this attribute.
    * The corresponding attribute flags are ::HWLOC_MEMATTR_FLAG_HIGHER_FIRST.
-   * \hideinitializer
    */
   HWLOC_MEMATTR_ID_LOCALITY = 1,
 
-  /** \brief
-   * The \"Bandwidth\" is returned in MiB/s, as seen from the given initiator location.
-   *
+  /** \brief "Bandwidth".
+   * The bandwidth is returned in MiB/s, as seen from the given initiator location.
    * Best bandwidth nodes are nodes with <b>higher bandwidth</b>.
-   *
    * The corresponding attribute flags are ::HWLOC_MEMATTR_FLAG_HIGHER_FIRST
    * and ::HWLOC_MEMATTR_FLAG_NEED_INITIATOR.
-   *
-   * This is the average bandwidth for read and write accesses. If the platform
-   * provides individual read and write bandwidths but no explicit average value,
-   * hwloc computes and returns the average.
-   * \hideinitializer
    */
   HWLOC_MEMATTR_ID_BANDWIDTH = 2,
 
-  /** \brief
-   * The \"ReadBandwidth\" is returned in MiB/s, as seen from the given initiator location.
-   *
-   * Best bandwidth nodes are nodes with <b>higher bandwidth</b>.
-   *
-   * The corresponding attribute flags are ::HWLOC_MEMATTR_FLAG_HIGHER_FIRST
-   * and ::HWLOC_MEMATTR_FLAG_NEED_INITIATOR.
-   * \hideinitializer
-   */
-  HWLOC_MEMATTR_ID_READ_BANDWIDTH = 4,
-
-  /** \brief
-   * The \"WriteBandwidth\" is returned in MiB/s, as seen from the given initiator location.
-   *
-   * Best bandwidth nodes are nodes with <b>higher bandwidth</b>.
-   *
-   * The corresponding attribute flags are ::HWLOC_MEMATTR_FLAG_HIGHER_FIRST
-   * and ::HWLOC_MEMATTR_FLAG_NEED_INITIATOR.
-   * \hideinitializer
-   */
-  HWLOC_MEMATTR_ID_WRITE_BANDWIDTH = 5,
-
-  /** \brief
-   * The \"Latency\" is returned as nanoseconds, as seen from the given initiator location.
-   *
+  /** \brief "Latency".
+   * The latency is returned as nanoseconds, as seen from the given initiator location.
    * Best latency nodes are nodes with <b>smaller latency</b>.
-   *
    * The corresponding attribute flags are ::HWLOC_MEMATTR_FLAG_LOWER_FIRST
    * and ::HWLOC_MEMATTR_FLAG_NEED_INITIATOR.
-   *
-   * This is the average latency for read and write accesses. If the platform
-   * provides individual read and write latencies but no explicit average value,
-   * hwloc computes and returns the average.
-   * \hideinitializer
    */
-  HWLOC_MEMATTR_ID_LATENCY = 3,
+  HWLOC_MEMATTR_ID_LATENCY = 3
 
-  /** \brief
-   * The \"ReadLatency\" is returned as nanoseconds, as seen from the given initiator location.
-   *
-   * Best latency nodes are nodes with <b>smaller latency</b>.
-   *
-   * The corresponding attribute flags are ::HWLOC_MEMATTR_FLAG_LOWER_FIRST
-   * and ::HWLOC_MEMATTR_FLAG_NEED_INITIATOR.
-   * \hideinitializer
-   */
-  HWLOC_MEMATTR_ID_READ_LATENCY = 6,
-
-  /** \brief
-   * The \"WriteLatency\" is returned as nanoseconds, as seen from the given initiator location.
-   *
-   * Best latency nodes are nodes with <b>smaller latency</b>.
-   *
-   * The corresponding attribute flags are ::HWLOC_MEMATTR_FLAG_LOWER_FIRST
-   * and ::HWLOC_MEMATTR_FLAG_NEED_INITIATOR.
-   * \hideinitializer
-   */
-  HWLOC_MEMATTR_ID_WRITE_LATENCY = 7,
-
-  /* TODO persistence? */
-
-  HWLOC_MEMATTR_ID_MAX /**< \private Sentinel value */
+  /* TODO read vs write, persistence? */
 };
 
 /** \brief A memory attribute identifier.

src/3rdparty/hwloc/include/hwloc/plugins.h

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2022 Inria.  All rights reserved.
+ * Copyright © 2013-2021 Inria.  All rights reserved.
  * Copyright © 2016 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
  */
@@ -338,15 +338,9 @@ struct hwloc_component {
  * This function return 1 by default (show critical only),
  * 0 in lstopo (show all),
  * or anything set in HWLOC_HIDE_ERRORS in the environment.
- *
- * Use macros HWLOC_SHOW_CRITICAL_ERRORS() and HWLOC_SHOW_ALL_ERRORS()
- * for clarity.
  */
 HWLOC_DECLSPEC int hwloc_hide_errors(void);
 
-#define HWLOC_SHOW_CRITICAL_ERRORS() (hwloc_hide_errors() < 2)
-#define HWLOC_SHOW_ALL_ERRORS() (hwloc_hide_errors() == 0)
-
 /** \brief Add an object to the topology.
  *
  * Insert new object \p obj in the topology starting under existing object \p root
@@ -507,7 +501,6 @@ hwloc_filter_check_pcidev_subtype_important(unsigned classid)
 	  || baseclass == 0x0b /* PCI_BASE_CLASS_PROCESSOR */
 	  || classid == 0x0c04 /* PCI_CLASS_SERIAL_FIBER */
 	  || classid == 0x0c06 /* PCI_CLASS_SERIAL_INFINIBAND */
-          || classid == 0x0502 /* PCI_CLASS_MEMORY_CXL */
           || baseclass == 0x06 /* PCI_BASE_CLASS_BRIDGE with non-PCI downstream. the core will drop the useless ones later */
 	  || baseclass == 0x12 /* Processing Accelerators */);
 }

src/3rdparty/hwloc/include/hwloc/rename.h

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
- * Copyright © 2010-2022 Inria.  All rights reserved.
+ * Copyright © 2010-2021 Inria.  All rights reserved.
  * See COPYING in top-level directory.
  */
 
@@ -123,9 +123,6 @@ extern "C" {
 #define HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING HWLOC_NAME_CAPS(TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING)
 #define HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_MEMBINDING HWLOC_NAME_CAPS(TOPOLOGY_FLAG_RESTRICT_TO_MEMBINDING)
 #define HWLOC_TOPOLOGY_FLAG_DONT_CHANGE_BINDING HWLOC_NAME_CAPS(TOPOLOGY_FLAG_DONT_CHANGE_BINDING)
-#define HWLOC_TOPOLOGY_FLAG_NO_DISTANCES HWLOC_NAME_CAPS(TOPOLOGY_FLAG_NO_DISTANCES)
-#define HWLOC_TOPOLOGY_FLAG_NO_MEMATTRS HWLOC_NAME_CAPS(TOPOLOGY_FLAG_NO_MEMATTRS)
-#define HWLOC_TOPOLOGY_FLAG_NO_CPUKINDS HWLOC_NAME_CAPS(TOPOLOGY_FLAG_NO_CPUKINDS)
 
 #define hwloc_topology_set_pid HWLOC_NAME(topology_set_pid)
 #define hwloc_topology_set_synthetic HWLOC_NAME(topology_set_synthetic)
@@ -384,11 +381,6 @@ extern "C" {
 #define HWLOC_MEMATTR_ID_LOCALITY HWLOC_NAME_CAPS(MEMATTR_ID_LOCALITY)
 #define HWLOC_MEMATTR_ID_BANDWIDTH HWLOC_NAME_CAPS(MEMATTR_ID_BANDWIDTH)
 #define HWLOC_MEMATTR_ID_LATENCY HWLOC_NAME_CAPS(MEMATTR_ID_LATENCY)
-#define HWLOC_MEMATTR_ID_READ_BANDWIDTH HWLOC_NAME_CAPS(MEMATTR_ID_READ_BANDWIDTH)
-#define HWLOC_MEMATTR_ID_WRITE_BANDWIDTH HWLOC_NAME_CAPS(MEMATTR_ID_WRITE_BANDWIDTH)
-#define HWLOC_MEMATTR_ID_READ_LATENCY HWLOC_NAME_CAPS(MEMATTR_ID_READ_LATENCY)
-#define HWLOC_MEMATTR_ID_WRITE_LATENCY HWLOC_NAME_CAPS(MEMATTR_ID_WRITE_LATENCY)
-#define HWLOC_MEMATTR_ID_MAX HWLOC_NAME_CAPS(MEMATTR_ID_MAX)
 
 #define hwloc_memattr_id_t HWLOC_NAME(memattr_id_t)
 #define hwloc_memattr_get_by_name HWLOC_NAME(memattr_get_by_name)
@@ -870,7 +862,6 @@ extern "C" {
 #define hwloc_internal_memattrs_destroy HWLOC_NAME(internal_memattrs_destroy)
 #define hwloc_internal_memattrs_need_refresh HWLOC_NAME(internal_memattrs_need_refresh)
 #define hwloc_internal_memattrs_refresh HWLOC_NAME(internal_memattrs_refresh)
-#define hwloc_internal_memattrs_guess_memory_tiers HWLOC_NAME(internal_memattrs_guess_memory_tiers)
 
 #define hwloc_internal_cpukind_s HWLOC_NAME(internal_cpukind_s)
 #define hwloc_internal_cpukinds_init HWLOC_NAME(internal_cpukinds_init)

src/3rdparty/hwloc/include/private/private.h

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009      CNRS
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2021 Inria.  All rights reserved.
  * Copyright © 2009-2012, 2020 Université Bordeaux
  * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
  *
@@ -259,7 +259,6 @@ struct hwloc_topology {
     unsigned bus_first, bus_last;
     hwloc_bitmap_t cpuset;
   } * pci_forced_locality;
-  hwloc_uint64_t pci_locality_quirks;
 
   /* component blacklisting */
   unsigned nr_blacklisted_components;
@@ -420,7 +419,6 @@ extern void hwloc_internal_memattrs_need_refresh(hwloc_topology_t topology);
 extern void hwloc_internal_memattrs_refresh(hwloc_topology_t topology);
 extern int hwloc_internal_memattrs_dup(hwloc_topology_t new, hwloc_topology_t old);
 extern int hwloc_internal_memattr_set_value(hwloc_topology_t topology, hwloc_memattr_id_t id, hwloc_obj_type_t target_type, hwloc_uint64_t target_gp_index, unsigned target_os_index, struct hwloc_internal_location_s *initiator, hwloc_uint64_t value);
-extern int hwloc_internal_memattrs_guess_memory_tiers(hwloc_topology_t topology);
 
 extern void hwloc_internal_cpukinds_init(hwloc_topology_t topology);
 extern int hwloc_internal_cpukinds_rank(hwloc_topology_t topology);

src/3rdparty/hwloc/include/private/windows.h

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 Université Bordeaux
- * Copyright © 2020-2022 Inria.  All rights reserved.
+ * Copyright © 2020 Inria.  All rights reserved.
  *
  * See COPYING in top-level directory.
  */
@@ -8,22 +8,13 @@
 #ifndef HWLOC_PRIVATE_WINDOWS_H
 #define HWLOC_PRIVATE_WINDOWS_H
 
-#ifndef _ANONYMOUS_UNION
 #ifdef __GNUC__
 #define _ANONYMOUS_UNION __extension__
-#else
-#define _ANONYMOUS_UNION
-#endif /* __GNUC__ */
-#endif /* _ANONYMOUS_UNION */
-
-#ifndef _ANONYMOUS_STRUCT
-#ifdef __GNUC__
 #define _ANONYMOUS_STRUCT __extension__
 #else
+#define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif /* __GNUC__ */
-#endif /* _ANONYMOUS_STRUCT */
-
 #define DUMMYUNIONNAME
 #define DUMMYSTRUCTNAME
 

src/3rdparty/hwloc/src/components.c

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2021 Inria.  All rights reserved.
  * Copyright © 2012 Université Bordeaux
  * See COPYING in top-level directory.
  */
@@ -386,7 +386,7 @@ hwloc_disc_component_register(struct hwloc_disc_component *component,
 				   |HWLOC_DISC_PHASE_MISC
 				   |HWLOC_DISC_PHASE_ANNOTATE
 				   |HWLOC_DISC_PHASE_TWEAK))) {
-    if (HWLOC_SHOW_CRITICAL_ERRORS())
+    if (hwloc_hide_errors() < 2)
       fprintf(stderr, "hwloc: Cannot register discovery component `%s' with invalid phases 0x%x\n",
               component->name, component->phases);
     return -1;
@@ -476,7 +476,7 @@ hwloc_components_init(void)
   /* hwloc_static_components is created by configure in static-components.h */
   for(i=0; NULL != hwloc_static_components[i]; i++) {
     if (hwloc_static_components[i]->flags) {
-      if (HWLOC_SHOW_CRITICAL_ERRORS())
+      if (hwloc_hide_errors() < 2)
         fprintf(stderr, "hwloc: Ignoring static component with invalid flags %lx\n",
                 hwloc_static_components[i]->flags);
       continue;
@@ -505,7 +505,7 @@ hwloc_components_init(void)
 #ifdef HWLOC_HAVE_PLUGINS
   for(desc = hwloc_plugins; NULL != desc; desc = desc->next) {
     if (desc->component->flags) {
-      if (HWLOC_SHOW_CRITICAL_ERRORS())
+      if (hwloc_hide_errors() < 2)
         fprintf(stderr, "hwloc: Ignoring plugin `%s' component with invalid flags %lx\n",
                 desc->name, desc->component->flags);
       continue;
@@ -738,7 +738,7 @@ hwloc_disc_component_try_enable(struct hwloc_topology *topology,
   backend = comp->instantiate(topology, comp, topology->backend_excluded_phases | blacklisted_phases,
 			      NULL, NULL, NULL);
   if (!backend) {
-    if (hwloc_components_verbose || (envvar_forced && HWLOC_SHOW_CRITICAL_ERRORS()))
+    if (hwloc_components_verbose || (envvar_forced && hwloc_hide_errors() < 2))
       fprintf(stderr, "hwloc: Failed to instantiate discovery component `%s'\n", comp->name);
     return -1;
   }
@@ -835,7 +835,7 @@ hwloc_disc_components_enable_others(struct hwloc_topology *topology)
 	  if (comp->phases & ~blacklisted_phases)
 	    hwloc_disc_component_try_enable(topology, comp, 1 /* envvar forced */, blacklisted_phases);
 	} else {
-          if (HWLOC_SHOW_CRITICAL_ERRORS())
+          if (hwloc_hide_errors() < 2)
             fprintf(stderr, "hwloc: Cannot find discovery component `%s'\n", name);
 	}
 
@@ -967,7 +967,7 @@ hwloc_backend_enable(struct hwloc_backend *backend)
 
   /* check backend flags */
   if (backend->flags) {
-    if (HWLOC_SHOW_CRITICAL_ERRORS())
+    if (hwloc_hide_errors() < 2)
       fprintf(stderr, "hwloc: Cannot enable discovery component `%s' phases 0x%x with unknown flags %lx\n",
               backend->component->name, backend->component->phases, backend->flags);
     return -1;

src/3rdparty/hwloc/src/cpukinds.c

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020-2022 Inria.  All rights reserved.
+ * Copyright © 2020-2021 Inria.  All rights reserved.
  * See COPYING in top-level directory.
  */
 
@@ -504,7 +504,7 @@ hwloc_internal_cpukinds_rank(struct hwloc_topology *topology)
       heuristics = HWLOC_CPUKINDS_RANKING_FORCED_EFFICIENCY;
     else if (!strcmp(env, "no_forced_efficiency"))
       heuristics = HWLOC_CPUKINDS_RANKING_NO_FORCED_EFFICIENCY;
-    else if (HWLOC_SHOW_CRITICAL_ERRORS())
+    else if (hwloc_hide_errors() < 2)
       fprintf(stderr, "hwloc: Failed to recognize HWLOC_CPUKINDS_RANKING value %s\n", env);
   }
 

src/3rdparty/hwloc/src/diff.c

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2022 Inria.  All rights reserved.
+ * Copyright © 2013-2020 Inria.  All rights reserved.
  * See COPYING in top-level directory.
  */
 
@@ -218,7 +218,7 @@ hwloc_diff_trees(hwloc_topology_t topo1, hwloc_obj_t obj1,
 		struct hwloc_info_s *info1 = &obj1->infos[i], *info2 = &obj2->infos[i];
 		if (strcmp(info1->name, info2->name))
 			goto out_too_complex;
-		if (strcmp(info1->value, info2->value)) {
+		if (strcmp(obj1->infos[i].value, obj2->infos[i].value)) {
 			err = hwloc_append_diff_obj_attr_string(obj1,
 								HWLOC_TOPOLOGY_DIFF_OBJ_ATTR_INFO,
 								info1->name,

src/3rdparty/hwloc/src/distances.c

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010-2022 Inria.  All rights reserved.
+ * Copyright © 2010-2021 Inria.  All rights reserved.
  * Copyright © 2011-2012 Université Bordeaux
  * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -860,7 +860,7 @@ struct hwloc_distances_container_s {
   struct hwloc_distances_s distances;
 };
 
-#define HWLOC_DISTANCES_CONTAINER_OFFSET ((uintptr_t)(&((struct hwloc_distances_container_s*)NULL)->distances) - (uintptr_t)NULL)
+#define HWLOC_DISTANCES_CONTAINER_OFFSET ((char*)&((struct hwloc_distances_container_s*)NULL)->distances - (char*)NULL)
 #define HWLOC_DISTANCES_CONTAINER(_d) (struct hwloc_distances_container_s *) ( ((char*)_d) - HWLOC_DISTANCES_CONTAINER_OFFSET )
 
 static struct hwloc_internal_distances_s *

src/3rdparty/hwloc/src/memattrs.c

@@ -1,12 +1,11 @@
 /*
- * Copyright © 2020-2022 Inria.  All rights reserved.
+ * Copyright © 2020-2021 Inria.  All rights reserved.
  * See COPYING in top-level directory.
  */
 
 #include "private/autogen/config.h"
 #include "hwloc.h"
 #include "private/private.h"
-#include "private/debug.h"
 
 
 /*****************************
@@ -50,51 +49,36 @@ hwloc__setup_memattr(struct hwloc_internal_memattr_s *imattr,
 void
 hwloc_internal_memattrs_prepare(struct hwloc_topology *topology)
 {
-  topology->memattrs = malloc(HWLOC_MEMATTR_ID_MAX * sizeof(*topology->memattrs));
+#define NR_DEFAULT_MEMATTRS 4
+  topology->memattrs = malloc(NR_DEFAULT_MEMATTRS * sizeof(*topology->memattrs));
   if (!topology->memattrs)
     return;
 
+  assert(HWLOC_MEMATTR_ID_CAPACITY < NR_DEFAULT_MEMATTRS);
   hwloc__setup_memattr(&topology->memattrs[HWLOC_MEMATTR_ID_CAPACITY],
                        (char *) "Capacity",
                        HWLOC_MEMATTR_FLAG_HIGHER_FIRST,
                        HWLOC_IMATTR_FLAG_STATIC_NAME|HWLOC_IMATTR_FLAG_CONVENIENCE);
 
+  assert(HWLOC_MEMATTR_ID_LOCALITY < NR_DEFAULT_MEMATTRS);
   hwloc__setup_memattr(&topology->memattrs[HWLOC_MEMATTR_ID_LOCALITY],
                        (char *) "Locality",
                        HWLOC_MEMATTR_FLAG_LOWER_FIRST,
                        HWLOC_IMATTR_FLAG_STATIC_NAME|HWLOC_IMATTR_FLAG_CONVENIENCE);
 
+  assert(HWLOC_MEMATTR_ID_BANDWIDTH < NR_DEFAULT_MEMATTRS);
   hwloc__setup_memattr(&topology->memattrs[HWLOC_MEMATTR_ID_BANDWIDTH],
                        (char *) "Bandwidth",
                        HWLOC_MEMATTR_FLAG_HIGHER_FIRST|HWLOC_MEMATTR_FLAG_NEED_INITIATOR,
                        HWLOC_IMATTR_FLAG_STATIC_NAME);
 
-  hwloc__setup_memattr(&topology->memattrs[HWLOC_MEMATTR_ID_READ_BANDWIDTH],
-                       (char *) "ReadBandwidth",
-                       HWLOC_MEMATTR_FLAG_HIGHER_FIRST|HWLOC_MEMATTR_FLAG_NEED_INITIATOR,
-                       HWLOC_IMATTR_FLAG_STATIC_NAME);
-
-  hwloc__setup_memattr(&topology->memattrs[HWLOC_MEMATTR_ID_WRITE_BANDWIDTH],
-                       (char *) "WriteBandwidth",
-                       HWLOC_MEMATTR_FLAG_HIGHER_FIRST|HWLOC_MEMATTR_FLAG_NEED_INITIATOR,
-                       HWLOC_IMATTR_FLAG_STATIC_NAME);
-
+  assert(HWLOC_MEMATTR_ID_LATENCY < NR_DEFAULT_MEMATTRS);
   hwloc__setup_memattr(&topology->memattrs[HWLOC_MEMATTR_ID_LATENCY],
                        (char *) "Latency",
                        HWLOC_MEMATTR_FLAG_LOWER_FIRST|HWLOC_MEMATTR_FLAG_NEED_INITIATOR,
                        HWLOC_IMATTR_FLAG_STATIC_NAME);
 
-  hwloc__setup_memattr(&topology->memattrs[HWLOC_MEMATTR_ID_READ_LATENCY],
-                       (char *) "ReadLatency",
-                       HWLOC_MEMATTR_FLAG_LOWER_FIRST|HWLOC_MEMATTR_FLAG_NEED_INITIATOR,
-                       HWLOC_IMATTR_FLAG_STATIC_NAME);
-
-  hwloc__setup_memattr(&topology->memattrs[HWLOC_MEMATTR_ID_WRITE_LATENCY],
-                       (char *) "WriteLatency",
-                       HWLOC_MEMATTR_FLAG_LOWER_FIRST|HWLOC_MEMATTR_FLAG_NEED_INITIATOR,
-                       HWLOC_IMATTR_FLAG_STATIC_NAME);
-
-  topology->nr_memattrs = HWLOC_MEMATTR_ID_MAX;
+  topology->nr_memattrs = NR_DEFAULT_MEMATTRS;
 }
 
 static void
@@ -1213,214 +1197,3 @@ hwloc_get_local_numanode_objs(hwloc_topology_t topology,
   *nrp = i;
   return 0;
 }
-
-
-/**************************************
- * Using memattrs to identify HBM/DRAM
- */
-
-struct hwloc_memory_tier_s {
-  hwloc_obj_t node;
-  uint64_t local_bw;
-  enum hwloc_memory_tier_type_e {
-    /* warning the order is important for guess_memory_tiers() after qsort() */
-    HWLOC_MEMORY_TIER_UNKNOWN,
-    HWLOC_MEMORY_TIER_DRAM,
-    HWLOC_MEMORY_TIER_HBM,
-    HWLOC_MEMORY_TIER_SPM, /* Specific-Purpose Memory is usually HBM, we'll use BW to confirm */
-    HWLOC_MEMORY_TIER_NVM,
-    HWLOC_MEMORY_TIER_GPU,
-  } type;
-};
-
-static int compare_tiers(const void *_a, const void *_b)
-{
-  const struct hwloc_memory_tier_s *a = _a, *b = _b;
-  /* sort by type of tier first */
-  if (a->type != b->type)
-    return a->type - b->type;
-  /* then by bandwidth */
-  if (a->local_bw > b->local_bw)
-    return -1;
-  else if (a->local_bw < b->local_bw)
-    return 1;
-  return 0;
-}
-
-int
-hwloc_internal_memattrs_guess_memory_tiers(hwloc_topology_t topology)
-{
-  struct hwloc_internal_memattr_s *imattr;
-  struct hwloc_memory_tier_s *tiers;
-  unsigned i, j, n;
-  const char *env;
-  int spm_is_hbm = -1; /* -1 will guess from BW, 0 no, 1 forced */
-  int mark_dram = 1;
-  unsigned first_spm, first_nvm;
-  hwloc_uint64_t max_unknown_bw, min_spm_bw;
-
-  env = getenv("HWLOC_MEMTIERS_GUESS");
-  if (env) {
-    if (!strcmp(env, "none")) {
-      return 0;
-    } else if (!strcmp(env, "default")) {
-      /* nothing */
-    } else if (!strcmp(env, "spm_is_hbm")) {
-      hwloc_debug("Assuming SPM-tier is HBM, ignore bandwidth\n");
-      spm_is_hbm = 1;
-    } else if (HWLOC_SHOW_CRITICAL_ERRORS()) {
-      fprintf(stderr, "hwloc: Failed to recognize HWLOC_MEMTIERS_GUESS value %s\n", env);
-    }
-  }
-
-  imattr = &topology->memattrs[HWLOC_MEMATTR_ID_BANDWIDTH];
-
-  if (!(imattr->iflags & HWLOC_IMATTR_FLAG_CACHE_VALID))
-    hwloc__imattr_refresh(topology, imattr);
-
-  n = hwloc_get_nbobjs_by_depth(topology, HWLOC_TYPE_DEPTH_NUMANODE);
-  assert(n);
-
-  tiers = malloc(n * sizeof(*tiers));
-  if (!tiers)
-    return -1;
-
-  for(i=0; i<n; i++) {
-    hwloc_obj_t node;
-    const char *daxtype;
-    struct hwloc_internal_location_s iloc;
-    struct hwloc_internal_memattr_target_s *imtg = NULL;
-    struct hwloc_internal_memattr_initiator_s *imi;
-
-    node = hwloc_get_obj_by_depth(topology, HWLOC_TYPE_DEPTH_NUMANODE, i);
-    assert(node);
-    tiers[i].node = node;
-
-    /* defaults */
-    tiers[i].type = HWLOC_MEMORY_TIER_UNKNOWN;
-    tiers[i].local_bw = 0; /* unknown */
-
-    daxtype = hwloc_obj_get_info_by_name(node, "DAXType");
-    /* mark NVM, SPM and GPU nodes */
-    if (daxtype && !strcmp(daxtype, "NVM"))
-      tiers[i].type = HWLOC_MEMORY_TIER_NVM;
-    if (daxtype && !strcmp(daxtype, "SPM"))
-      tiers[i].type = HWLOC_MEMORY_TIER_SPM;
-    if (node->subtype && !strcmp(node->subtype, "GPUMemory"))
-      tiers[i].type = HWLOC_MEMORY_TIER_GPU;
-
-    if (spm_is_hbm == -1) {
-      for(j=0; j<imattr->nr_targets; j++)
-        if (imattr->targets[j].obj == node) {
-          imtg = &imattr->targets[j];
-          break;
-        }
-      if (imtg && !hwloc_bitmap_iszero(node->cpuset)) {
-        iloc.type = HWLOC_LOCATION_TYPE_CPUSET;
-        iloc.location.cpuset = node->cpuset;
-        imi = hwloc__memattr_target_get_initiator(imtg, &iloc, 0);
-        if (imi)
-          tiers[i].local_bw = imi->value;
-      }
-    }
-  }
-
-  /* sort tiers */
-  qsort(tiers, n, sizeof(*tiers), compare_tiers);
-  hwloc_debug("Sorting memory tiers...\n");
-  for(i=0; i<n; i++)
-    hwloc_debug("  tier %u = node L#%u P#%u with tier type %d and local BW #%llu\n",
-                i,
-                tiers[i].node->logical_index, tiers[i].node->os_index,
-                tiers[i].type, (unsigned long long) tiers[i].local_bw);
-
-  /* now we have UNKNOWN tiers (sorted by BW), then SPM tiers (sorted by BW), then NVM, then GPU */
-
-  /* iterate over UNKNOWN tiers, and find their BW */
-  for(i=0; i<n; i++) {
-    if (tiers[i].type > HWLOC_MEMORY_TIER_UNKNOWN)
-      break;
-  }
-  first_spm = i;
-  /* get max BW from first */
-  if (first_spm > 0)
-    max_unknown_bw = tiers[0].local_bw;
-  else
-    max_unknown_bw = 0;
-
-  /* there are no DRAM or HBM tiers yet */
-
-  /* iterate over SPM tiers, and find their BW */
-  for(i=first_spm; i<n; i++) {
-    if (tiers[i].type > HWLOC_MEMORY_TIER_SPM)
-      break;
-  }
-  first_nvm = i;
-  /* get min BW from last */
-  if (first_nvm > first_spm)
-    min_spm_bw = tiers[first_nvm-1].local_bw;
-  else
-    min_spm_bw = 0;
-
-  /* FIXME: if there's more than 10% between some sets of nodes inside a tier, split it? */
-  /* FIXME: if there are cpuset-intersecting nodes in same tier, abort? */
-
-  if (spm_is_hbm == -1) {
-    /* if we have BW for all SPM and UNKNOWN
-     * and all SPM BW are 2x superior to all UNKNOWN BW
-     */
-    hwloc_debug("UNKNOWN-memory-tier max bandwidth %llu\n", (unsigned long long) max_unknown_bw);
-    hwloc_debug("SPM-memory-tier min bandwidth %llu\n", (unsigned long long) min_spm_bw);
-    if (max_unknown_bw > 0 && min_spm_bw > 0 && max_unknown_bw*2 < min_spm_bw) {
-      hwloc_debug("assuming SPM means HBM and !SPM means DRAM since bandwidths are very different\n");
-      spm_is_hbm = 1;
-    } else {
-      hwloc_debug("cannot assume SPM means HBM\n");
-      spm_is_hbm = 0;
-    }
-  }
-
-  if (spm_is_hbm) {
-    for(i=0; i<first_spm; i++)
-      tiers[i].type = HWLOC_MEMORY_TIER_DRAM;
-    for(i=first_spm; i<first_nvm; i++)
-      tiers[i].type = HWLOC_MEMORY_TIER_HBM;
-  }
-
-  if (first_spm == n)
-    mark_dram = 0;
-
-    /* now apply subtypes */
-  for(i=0; i<n; i++) {
-    const char *type = NULL;
-    if (tiers[i].node->subtype) /* don't overwrite the existing subtype */
-      continue;
-    switch (tiers[i].type) {
-    case HWLOC_MEMORY_TIER_DRAM:
-      if (mark_dram)
-        type = "DRAM";
-      break;
-    case HWLOC_MEMORY_TIER_HBM:
-      type = "HBM";
-      break;
-    case HWLOC_MEMORY_TIER_SPM:
-      type = "SPM";
-      break;
-    case HWLOC_MEMORY_TIER_NVM:
-      type = "NVM";
-      break;
-    default:
-      /* GPU memory is already marked with subtype="GPUMemory",
-       * UNKNOWN doesn't deserve any subtype
-       */
-      break;
-    }
-    if (type) {
-      hwloc_debug("Marking node L#%u P#%u as %s\n", tiers[i].node->logical_index, tiers[i].node->os_index, type);
-      tiers[i].node->subtype = strdup(type);
-    }
-  }
-
-  free(tiers);
-  return 0;
-}

src/3rdparty/hwloc/src/pci-common.c

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2021 Inria.  All rights reserved.
  * See COPYING in top-level directory.
  */
 
@@ -119,13 +119,6 @@ hwloc_pci_discovery_init(struct hwloc_topology *topology)
   topology->pci_forced_locality = NULL;
 
   topology->first_pci_locality = topology->last_pci_locality = NULL;
-
-#define HWLOC_PCI_LOCALITY_QUIRK_CRAY_EX235A (1ULL<<0)
-#define HWLOC_PCI_LOCALITY_QUIRK_FAKE (1ULL<<62)
-  topology->pci_locality_quirks = (uint64_t) -1;
-  /* -1 is unknown, 0 is disabled, >0 is bitmask of enabled quirks.
-   * bit 63 should remain unused so that -1 is unaccessible as a bitmask.
-   */
 }
 
 void
@@ -153,7 +146,7 @@ hwloc_pci_discovery_prepare(struct hwloc_topology *topology)
 	  }
 	  free(buffer);
 	} else {
-          if (HWLOC_SHOW_CRITICAL_ERRORS())
+          if (hwloc_hide_errors() < 2)
             fprintf(stderr, "hwloc/pci: Ignoring HWLOC_PCI_LOCALITY file `%s' too large (%lu bytes)\n",
                     env, (unsigned long) st.st_size);
 	}
@@ -340,7 +333,7 @@ hwloc_pci_add_object(struct hwloc_obj *parent, struct hwloc_obj **parent_io_firs
     }
     case HWLOC_PCI_BUSID_EQUAL: {
       static int reported = 0;
-      if (!reported && HWLOC_SHOW_CRITICAL_ERRORS()) {
+      if (!reported && hwloc_hide_errors() < 2) {
         fprintf(stderr, "*********************************************************\n");
         fprintf(stderr, "* hwloc %s received invalid PCI information.\n", HWLOC_VERSION);
         fprintf(stderr, "*\n");
@@ -449,90 +442,13 @@ hwloc_pcidisc_add_hostbridges(struct hwloc_topology *topology,
   return new;
 }
 
-/* return 1 if a quirk was applied */
-static int
-hwloc__pci_find_busid_parent_quirk(struct hwloc_topology *topology,
-                                   struct hwloc_pcidev_attr_s *busid,
-                                   hwloc_cpuset_t cpuset)
+static struct hwloc_obj *
+hwloc_pci_fixup_busid_parent(struct hwloc_topology *topology __hwloc_attribute_unused,
+			     struct hwloc_pcidev_attr_s *busid __hwloc_attribute_unused,
+			     struct hwloc_obj *parent __hwloc_attribute_unused)
 {
-  if (topology->pci_locality_quirks == (uint64_t)-1 /* unknown */) {
-    const char *dmi_board_name, *env;
-
-    /* first invokation, detect which quirks are needed */
-    topology->pci_locality_quirks = 0; /* no quirk yet */
-
-    dmi_board_name = hwloc_obj_get_info_by_name(hwloc_get_root_obj(topology), "DMIBoardName");
-    if (dmi_board_name && !strcmp(dmi_board_name, "HPE CRAY EX235A")) {
-      hwloc_debug("enabling for PCI locality quirk for HPE Cray EX235A\n");
-      topology->pci_locality_quirks |= HWLOC_PCI_LOCALITY_QUIRK_CRAY_EX235A;
-    }
-
-    env = getenv("HWLOC_PCI_LOCALITY_QUIRK_FAKE");
-    if (env && atoi(env)) {
-      hwloc_debug("enabling for PCI locality fake quirk (attaching everything to last PU)\n");
-      topology->pci_locality_quirks |= HWLOC_PCI_LOCALITY_QUIRK_FAKE;
-    }
-  }
-
-  if (topology->pci_locality_quirks & HWLOC_PCI_LOCALITY_QUIRK_FAKE) {
-    unsigned last = hwloc_bitmap_last(hwloc_topology_get_topology_cpuset(topology));
-    hwloc_bitmap_set(cpuset, last);
-    return 1;
-  }
-
-  if (topology->pci_locality_quirks & HWLOC_PCI_LOCALITY_QUIRK_CRAY_EX235A) {
-    /* AMD Trento has xGMI ports connected to individual CCDs (8 cores + L3)
-     * instead of NUMA nodes (pairs of CCDs within Trento) as is usual in AMD EPYC CPUs.
-     * This is not described by the ACPI tables, hence we need to manually hardwire
-     * the xGMI locality for the (currently single) server that currently uses that CPU.
-     * It's not clear if ACPI tables can/will ever be fixed (would require one initiator
-     * proximity domain per CCD), or if Linux can/will work around the issue.
-     */
-    if (busid->domain == 0) {
-      if (busid->bus >= 0xd0 && busid->bus <= 0xd1) {
-        hwloc_bitmap_set_range(cpuset, 0, 7);
-        hwloc_bitmap_set_range(cpuset, 64, 71);
-        return 1;
-      }
-      if (busid->bus >= 0xd4 && busid->bus <= 0xd6) {
-        hwloc_bitmap_set_range(cpuset, 8, 15);
-        hwloc_bitmap_set_range(cpuset, 72, 79);
-        return 1;
-      }
-      if (busid->bus >= 0xc8 && busid->bus <= 0xc9) {
-        hwloc_bitmap_set_range(cpuset, 16, 23);
-        hwloc_bitmap_set_range(cpuset, 80, 87);
-        return 1;
-      }
-      if (busid->bus >= 0xcc && busid->bus <= 0xce) {
-        hwloc_bitmap_set_range(cpuset, 24, 31);
-        hwloc_bitmap_set_range(cpuset, 88, 95);
-        return 1;
-      }
-      if (busid->bus >= 0xd8 && busid->bus <= 0xd9) {
-        hwloc_bitmap_set_range(cpuset, 32, 39);
-        hwloc_bitmap_set_range(cpuset, 96, 103);
-        return 1;
-      }
-      if (busid->bus >= 0xdc && busid->bus <= 0xde) {
-        hwloc_bitmap_set_range(cpuset, 40, 47);
-        hwloc_bitmap_set_range(cpuset, 104, 111);
-        return 1;
-      }
-      if (busid->bus >= 0xc0 && busid->bus <= 0xc1) {
-        hwloc_bitmap_set_range(cpuset, 48, 55);
-        hwloc_bitmap_set_range(cpuset, 112, 119);
-        return 1;
-      }
-      if (busid->bus >= 0xc4 && busid->bus <= 0xc6) {
-        hwloc_bitmap_set_range(cpuset, 56, 63);
-        hwloc_bitmap_set_range(cpuset, 120, 127);
-        return 1;
-      }
-    }
-  }
-
-  return 0;
+  /* no quirk for now */
+  return parent;
 }
 
 static struct hwloc_obj *
@@ -541,7 +457,7 @@ hwloc__pci_find_busid_parent(struct hwloc_topology *topology, struct hwloc_pcide
   hwloc_bitmap_t cpuset = hwloc_bitmap_alloc();
   hwloc_obj_t parent;
   int forced = 0;
-  int noquirks = 0, got_quirked = 0;
+  int noquirks = 0;
   unsigned i;
   int err;
 
@@ -574,7 +490,7 @@ hwloc__pci_find_busid_parent(struct hwloc_topology *topology, struct hwloc_pcide
     if (env) {
       static int reported = 0;
       if (!topology->pci_has_forced_locality && !reported) {
-        if (HWLOC_SHOW_ALL_ERRORS())
+        if (!hwloc_hide_errors())
           fprintf(stderr, "hwloc/pci: Environment variable %s is deprecated, please use HWLOC_PCI_LOCALITY instead.\n", env);
 	reported = 1;
       }
@@ -589,13 +505,7 @@ hwloc__pci_find_busid_parent(struct hwloc_topology *topology, struct hwloc_pcide
     }
   }
 
-  if (!forced && !noquirks && topology->pci_locality_quirks /* either quirks are unknown yet, or some are enabled */) {
-    err = hwloc__pci_find_busid_parent_quirk(topology, busid, cpuset);
-    if (err > 0)
-      got_quirked = 1;
-  }
-
-  if (!forced && !got_quirked) {
+  if (!forced) {
     /* get the cpuset by asking the backend that provides the relevant hook, if any. */
     struct hwloc_backend *backend = topology->get_pci_busid_cpuset_backend;
     if (backend)
@@ -610,7 +520,11 @@ hwloc__pci_find_busid_parent(struct hwloc_topology *topology, struct hwloc_pcide
   hwloc_debug_bitmap("  will attach PCI bus to cpuset %s\n", cpuset);
 
   parent = hwloc_find_insert_io_parent_by_complete_cpuset(topology, cpuset);
-  if (!parent) {
+  if (parent) {
+    if (!noquirks)
+      /* We found a valid parent. Check that the OS didn't report invalid locality */
+      parent = hwloc_pci_fixup_busid_parent(topology, busid, parent);
+  } else {
     /* Fallback to root */
     parent = hwloc_get_root_obj(topology);
   }
@@ -891,28 +805,19 @@ hwloc_pcidisc_find_linkspeed(const unsigned char *config,
   memcpy(&linksta, &config[offset + HWLOC_PCI_EXP_LNKSTA], 4);
   speed = linksta & HWLOC_PCI_EXP_LNKSTA_SPEED; /* PCIe generation */
   width = (linksta & HWLOC_PCI_EXP_LNKSTA_WIDTH) >> 4; /* how many lanes */
-  /*
-   * These are single-direction bandwidths only.
-   *
-   * Gen1 used NRZ with 8/10 encoding.
-   * PCIe Gen1 = 2.5GT/s signal-rate per lane x 8/10    =  0.25GB/s data-rate per lane
-   * PCIe Gen2 = 5  GT/s signal-rate per lane x 8/10    =  0.5 GB/s data-rate per lane
-   * Gen3 switched to NRZ with 128/130 encoding.
-   * PCIe Gen3 = 8  GT/s signal-rate per lane x 128/130 =  1   GB/s data-rate per lane
-   * PCIe Gen4 = 16 GT/s signal-rate per lane x 128/130 =  2   GB/s data-rate per lane
-   * PCIe Gen5 = 32 GT/s signal-rate per lane x 128/130 =  4   GB/s data-rate per lane
-   * Gen6 switched to PAM with with 242/256 FLIT (242B payload protected by 8B CRC + 6B FEC).
-   * PCIe Gen6 = 64 GT/s signal-rate per lane x 242/256 =  8   GB/s data-rate per lane
-   * PCIe Gen7 = 128GT/s signal-rate per lane x 242/256 = 16   GB/s data-rate per lane
+  /* PCIe Gen1 = 2.5GT/s signal-rate per lane with 8/10 encoding    = 0.25GB/s data-rate per lane
+   * PCIe Gen2 = 5  GT/s signal-rate per lane with 8/10 encoding    = 0.5 GB/s data-rate per lane
+   * PCIe Gen3 = 8  GT/s signal-rate per lane with 128/130 encoding = 1   GB/s data-rate per lane
+   * PCIe Gen4 = 16 GT/s signal-rate per lane with 128/130 encoding = 2   GB/s data-rate per lane
+   * PCIe Gen5 = 32 GT/s signal-rate per lane with 128/130 encoding = 4   GB/s data-rate per lane
+   * PCIe Gen6 = 64 GT/s signal-rate per lane with 128/130 encoding = 8   GB/s data-rate per lane
    */
 
   /* lanespeed in Gbit/s */
   if (speed <= 2)
     lanespeed = 2.5f * speed * 0.8f;
-  else if (speed <= 5)
-    lanespeed = 8.0f * (1<<(speed-3)) * 128/130;
   else
-    lanespeed = 8.0f * (1<<(speed-3)) * 242/256; /* assume Gen8 will be 256 GT/s and so on */
+    lanespeed = 8.0f * (1<<(speed-3)) * 128/130; /* assume Gen7 will be 128 GT/s and so on */
 
   /* linkspeed in GB/s */
   *linkspeed = lanespeed * width / 8;
@@ -1039,7 +944,6 @@ hwloc_pci_class_string(unsigned short class_id)
       switch (class_id) {
 	case 0x0500: return "RAM";
 	case 0x0501: return "Flash";
-        case 0x0502: return "CXLMem";
       }
       return "Memory";
     case 0x06:

src/3rdparty/hwloc/src/topology-synthetic.c

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2020 Inria.  All rights reserved.
  * Copyright © 2009-2010 Université Bordeaux
  * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -323,29 +323,17 @@ hwloc_synthetic_parse_memory_attr(const char *attr, const char **endp)
   hwloc_uint64_t size;
   size = strtoull(attr, (char **) &endptr, 0);
   if (!hwloc_strncasecmp(endptr, "TB", 2)) {
-    size *= 1000ULL*1000ULL*1000ULL*1000ULL;
-    endptr += 2;
-  } else if (!hwloc_strncasecmp(endptr, "TiB", 3)) {
     size <<= 40;
-    endptr += 3;
+    endptr += 2;
   } else if (!hwloc_strncasecmp(endptr, "GB", 2)) {
-    size *= 1000ULL*1000ULL*1000ULL;
-    endptr += 2;
-  } else if (!hwloc_strncasecmp(endptr, "GiB", 3)) {
     size <<= 30;
-    endptr += 3;
+    endptr += 2;
   } else if (!hwloc_strncasecmp(endptr, "MB", 2)) {
-    size *= 1000ULL*1000ULL;
-    endptr += 2;
-  } else if (!hwloc_strncasecmp(endptr, "MiB", 3)) {
     size <<= 20;
-    endptr += 3;
-  } else if (!hwloc_strncasecmp(endptr, "kB", 2)) {
-    size *= 1000ULL;
     endptr += 2;
-  } else if (!hwloc_strncasecmp(endptr, "kiB", 3)) {
+  } else if (!hwloc_strncasecmp(endptr, "kB", 2)) {
     size <<= 10;
-    endptr += 3;
+    endptr += 2;
   }
   *endp = endptr;
   return size;
@@ -814,15 +802,15 @@ hwloc_backend_synthetic_init(struct hwloc_synthetic_backend_data_s *data,
     } else if (hwloc__obj_type_is_cache(type)) {
       if (!curlevel->attr.memorysize) {
 	if (1 == curlevel->attr.depth)
-	  /* 32KiB in L1 */
+	  /* 32Kb in L1 */
 	  curlevel->attr.memorysize = 32*1024;
 	else
-	  /* *4 at each level, starting from 1MiB for L2, unified */
+	  /* *4 at each level, starting from 1MB for L2, unified */
 	  curlevel->attr.memorysize = 256ULL*1024 << (2*curlevel->attr.depth);
       }
 
     } else if (type == HWLOC_OBJ_NUMANODE && !curlevel->attr.memorysize) {
-      /* 1GiB in memory nodes. */
+      /* 1GB in memory nodes. */
       curlevel->attr.memorysize = 1024*1024*1024;
     }
 

src/3rdparty/hwloc/src/topology-windows.c

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2021 Inria.  All rights reserved.
  * Copyright © 2009-2012, 2020 Université Bordeaux
  * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -366,7 +366,7 @@ hwloc_win_get_processor_groups(void)
   hwloc_debug("found %lu windows processor groups\n", nr_processor_groups);
 
   if (nr_processor_groups > 1 && SIZEOF_VOID_P == 4) {
-    if (HWLOC_SHOW_ALL_ERRORS())
+    if (!hwloc_hide_errors())
       fprintf(stderr, "hwloc: multiple processor groups found on 32bits Windows, topology may be invalid/incomplete.\n");
   }
 

src/3rdparty/hwloc/src/topology-x86.c

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010-2022 Inria.  All rights reserved.
+ * Copyright © 2010-2021 Inria.  All rights reserved.
  * Copyright © 2010-2013 Université Bordeaux
  * Copyright © 2010-2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -1349,7 +1349,7 @@ look_procs(struct hwloc_backend *backend, struct procinfo *infos, unsigned long
   if (data->apicid_unique) {
     summarize(backend, infos, flags);
 
-    if (has_hybrid(features) && !(topology->flags & HWLOC_TOPOLOGY_FLAG_NO_CPUKINDS)) {
+    if (has_hybrid(features)) {
       /* use hybrid info for cpukinds */
       hwloc_bitmap_t atomset = hwloc_bitmap_alloc();
       hwloc_bitmap_t coreset = hwloc_bitmap_alloc();

src/3rdparty/hwloc/src/topology-xml.c

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2021 Inria.  All rights reserved.
  * Copyright © 2009-2011, 2020 Université Bordeaux
  * Copyright © 2009-2018 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -123,17 +123,6 @@ hwloc__xml_import_object_attr(struct hwloc_topology *topology,
       fprintf(stderr, "%s: unexpected zero gp_index, topology may be invalid\n", state->global->msgprefix);
     if (obj->gp_index >= topology->next_gp_index)
       topology->next_gp_index = obj->gp_index + 1;
-  } else if (!strcmp(name, "id")) { /* forward compat */
-    if (!strncmp(value, "obj", 3)) {
-      obj->gp_index = strtoull(value+3, NULL, 10);
-      if (!obj->gp_index && hwloc__xml_verbose())
-        fprintf(stderr, "%s: unexpected zero id, topology may be invalid\n", state->global->msgprefix);
-      if (obj->gp_index >= topology->next_gp_index)
-        topology->next_gp_index = obj->gp_index + 1;
-    } else {
-      if (hwloc__xml_verbose())
-        fprintf(stderr, "%s: unexpected id `%s' not-starting with `obj', ignoring\n", state->global->msgprefix, value);
-    }
   } else if (!strcmp(name, "cpuset")) {
     if (!obj->cpuset)
       obj->cpuset = hwloc_bitmap_alloc();
@@ -274,7 +263,7 @@ hwloc__xml_import_object_attr(struct hwloc_topology *topology,
 #ifndef HWLOC_HAVE_32BITS_PCI_DOMAIN
       } else if (domain > 0xffff) {
 	static int warned = 0;
-	if (!warned && HWLOC_SHOW_ALL_ERRORS())
+	if (!warned && hwloc_hide_errors() < 2)
 	  fprintf(stderr, "hwloc/xml: Ignoring PCI device with non-16bit domain.\nPass --enable-32bits-pci-domain to configure to support such devices\n(warning: it would break the library ABI, don't enable unless really needed).\n");
 	warned = 1;
 	*ignore = 1;
@@ -374,7 +363,7 @@ hwloc__xml_import_object_attr(struct hwloc_topology *topology,
 #ifndef HWLOC_HAVE_32BITS_PCI_DOMAIN
       } else if (domain > 0xffff) {
 	static int warned = 0;
-	if (!warned && HWLOC_SHOW_ALL_ERRORS())
+	if (!warned && hwloc_hide_errors() < 2)
 	  fprintf(stderr, "hwloc/xml: Ignoring bridge to PCI with non-16bit domain.\nPass --enable-32bits-pci-domain to configure to support such devices\n(warning: it would break the library ABI, don't enable unless really needed).\n");
 	warned = 1;
 	*ignore = 1;
@@ -1246,7 +1235,7 @@ hwloc__xml_import_object(hwloc_topology_t topology,
 	/* next should be before cur */
 	if (!childrengotignored) {
 	  static int reported = 0;
-	  if (!reported && HWLOC_SHOW_CRITICAL_ERRORS()) {
+	  if (!reported && hwloc_hide_errors() < 2) {
 	    hwloc__xml_import_report_outoforder(topology, next, cur);
 	    reported = 1;
 	  }
@@ -1579,9 +1568,6 @@ hwloc__xml_v2import_distances(hwloc_topology_t topology,
     }
   }
 
-  if (topology->flags & HWLOC_TOPOLOGY_FLAG_NO_DISTANCES)
-    goto out_ignore;
-
   hwloc_internal_distances_add_by_index(topology, name, unique_type, different_types, nbobjs, indexes, u64values, kind, 0 /* assume grouping was applied when this matrix was discovered before exporting to XML */);
 
   /* prevent freeing below */
@@ -1736,8 +1722,7 @@ hwloc__xml_import_memattr(hwloc_topology_t topology,
     }
   }
 
-  if (name && flags != (unsigned long) -1
-      && !(topology->flags & HWLOC_TOPOLOGY_FLAG_NO_MEMATTRS)) {
+  if (name && flags != (unsigned long) -1) {
     hwloc_memattr_id_t _id;
 
     ret = hwloc_memattr_get_by_name(topology, name, &_id);
@@ -1848,13 +1833,7 @@ hwloc__xml_import_cpukind(hwloc_topology_t topology,
     goto error;
   }
 
-  if (topology->flags & HWLOC_TOPOLOGY_FLAG_NO_CPUKINDS) {
-    hwloc__free_infos(infos, nr_infos);
-    hwloc_bitmap_free(cpuset);
-  } else {
-    hwloc_internal_cpukinds_register(topology, cpuset, forced_efficiency, infos, nr_infos, HWLOC_CPUKINDS_REGISTER_FLAG_OVERWRITE_FORCED_EFFICIENCY);
-    hwloc__free_infos(infos, nr_infos);
-  }
+  hwloc_internal_cpukinds_register(topology, cpuset, forced_efficiency, infos, nr_infos, HWLOC_CPUKINDS_REGISTER_FLAG_OVERWRITE_FORCED_EFFICIENCY);
 
   return state->global->close_tag(state);
 
@@ -2189,8 +2168,7 @@ done:
        * but it would require to have those objects in the original XML order (like the first_numanode cousin-list).
        * because the topology order can be different if some parents are ignored during load.
        */
-      if (nbobjs == data->nbnumanodes
-          && !(topology->flags & HWLOC_TOPOLOGY_FLAG_NO_DISTANCES)) {
+      if (nbobjs == data->nbnumanodes) {
 	hwloc_obj_t *objs = malloc(nbobjs*sizeof(hwloc_obj_t));
 	uint64_t *values = malloc(nbobjs*nbobjs*sizeof(*values));
         assert(data->nbnumanodes > 0); /* v1dist->nbobjs is >0 after import */
@@ -2672,7 +2650,7 @@ hwloc__xml_export_object_contents (hwloc__xml_export_state_t state, hwloc_topolo
 
       logical_to_v2array = malloc(nbobjs * sizeof(*logical_to_v2array));
       if (!logical_to_v2array) {
-        if (HWLOC_SHOW_ALL_ERRORS())
+        if (!hwloc_hide_errors())
           fprintf(stderr, "hwloc/xml/export/v1: failed to allocated logical_to_v2array\n");
 	continue;
       }
@@ -3146,11 +3124,9 @@ hwloc__xml_export_memattrs(hwloc__xml_export_state_t state, hwloc_topology_t top
       continue;
 
     imattr = &topology->memattrs[id];
-    if (id < HWLOC_MEMATTR_ID_MAX && !imattr->nr_targets)
-      /* no need to export standard attributes without any target,
-       * their definition is now standardized,
-       * the old hwloc importing this XML may recreate these attributes just like it would for a non-imported topology.
-       */
+    if ((id == HWLOC_MEMATTR_ID_LATENCY || id == HWLOC_MEMATTR_ID_BANDWIDTH)
+        && !imattr->nr_targets)
+      /* no need to export target-less attributes for initial attributes, no release support attributes without those definitions */
       continue;
 
     state->new_child(state, &mstate, "memattr");

src/3rdparty/hwloc/src/topology.c

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2022 Inria.  All rights reserved.
+ * Copyright © 2009-2021 Inria.  All rights reserved.
  * Copyright © 2009-2012, 2020 Université Bordeaux
  * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
  * Copyright © 2022 IBM Corporation.  All rights reserved.
@@ -114,25 +114,14 @@ int hwloc_topology_abi_check(hwloc_topology_t topology)
   return topology->topology_abi != HWLOC_TOPOLOGY_ABI ? -1 : 0;
 }
 
-/* callers should rather use wrappers HWLOC_SHOW_ALL_ERRORS() and HWLOC_SHOW_CRITICAL_ERRORS() for clarity */
 int hwloc_hide_errors(void)
 {
   static int hide = 1; /* only show critical errors by default. lstopo will show others */
   static int checked = 0;
   if (!checked) {
     const char *envvar = getenv("HWLOC_HIDE_ERRORS");
-    if (envvar) {
+    if (envvar)
       hide = atoi(envvar);
-#ifdef HWLOC_DEBUG
-    } else {
-      /* if debug is enabled and HWLOC_DEBUG_VERBOSE isn't forced to 0,
-       * show all errors jus like we show all debug messages.
-       */
-      envvar = getenv("HWLOC_DEBUG_VERBOSE");
-      if (!envvar || atoi(envvar))
-        hide = 0;
-#endif
-    }
     checked = 1;
   }
   return hide;
@@ -169,7 +158,7 @@ static void report_insert_error(hwloc_obj_t new, hwloc_obj_t old, const char *ms
 {
   static int reported = 0;
 
-  if (reason && !reported && HWLOC_SHOW_CRITICAL_ERRORS()) {
+  if (reason && !reported && hwloc_hide_errors() < 2) {
     char newstr[512];
     char oldstr[512];
     report_insert_error_format_obj(newstr, sizeof(newstr), new);
@@ -3189,7 +3178,7 @@ hwloc_connect_levels(hwloc_topology_t topology)
       tmpnbobjs = realloc(topology->level_nbobjects,
 			  2 * topology->nb_levels_allocated * sizeof(*topology->level_nbobjects));
       if (!tmplevels || !tmpnbobjs) {
-        if (HWLOC_SHOW_CRITICAL_ERRORS())
+        if (hwloc_hide_errors() < 2)
           fprintf(stderr, "hwloc: failed to realloc level arrays to %u\n", topology->nb_levels_allocated * 2);
 
 	/* if one realloc succeeded, make sure the caller will free the new buffer */
@@ -3547,8 +3536,6 @@ hwloc_discover(struct hwloc_topology *topology,
   /*
    * Additional discovery
    */
-  hwloc_pci_discovery_prepare(topology);
-
   if (topology->backend_phases & HWLOC_DISC_PHASE_PCI) {
     dstatus->phase = HWLOC_DISC_PHASE_PCI;
     hwloc_discover_by_phase(topology, dstatus, "PCI");
@@ -3566,8 +3553,6 @@ hwloc_discover(struct hwloc_topology *topology,
     hwloc_discover_by_phase(topology, dstatus, "ANNOTATE");
   }
 
-  hwloc_pci_discovery_exit(topology); /* pci needed up to annotate */
-
   if (getenv("HWLOC_DEBUG_SORT_CHILDREN"))
     hwloc_debug_sort_children(topology->levels[0][0]);
 
@@ -3580,17 +3565,17 @@ hwloc_discover(struct hwloc_topology *topology,
   hwloc_debug("%s", "\nRemoving empty objects\n");
   remove_empty(topology, &topology->levels[0][0]);
   if (!topology->levels[0][0]) {
-    if (HWLOC_SHOW_CRITICAL_ERRORS())
+    if (hwloc_hide_errors() < 2)
       fprintf(stderr, "hwloc: Topology became empty, aborting!\n");
     return -1;
   }
   if (hwloc_bitmap_iszero(topology->levels[0][0]->cpuset)) {
-    if (HWLOC_SHOW_CRITICAL_ERRORS())
+    if (hwloc_hide_errors() < 2)
       fprintf(stderr, "hwloc: Topology does not contain any PU, aborting!\n");
     return -1;
   }
   if (hwloc_bitmap_iszero(topology->levels[0][0]->nodeset)) {
-    if (HWLOC_SHOW_CRITICAL_ERRORS())
+    if (hwloc_hide_errors() < 2)
       fprintf(stderr, "hwloc: Topology does not contain any NUMA node, aborting!\n");
     return -1;
   }
@@ -3826,16 +3811,7 @@ hwloc_topology_set_flags (struct hwloc_topology *topology, unsigned long flags)
     return -1;
   }
 
-  if (flags & ~(HWLOC_TOPOLOGY_FLAG_INCLUDE_DISALLOWED
-                |HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM
-                |HWLOC_TOPOLOGY_FLAG_THISSYSTEM_ALLOWED_RESOURCES
-                |HWLOC_TOPOLOGY_FLAG_IMPORT_SUPPORT
-                |HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING
-                |HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_MEMBINDING
-                |HWLOC_TOPOLOGY_FLAG_DONT_CHANGE_BINDING
-                |HWLOC_TOPOLOGY_FLAG_NO_DISTANCES
-                |HWLOC_TOPOLOGY_FLAG_NO_MEMATTRS
-                |HWLOC_TOPOLOGY_FLAG_NO_CPUKINDS)) {
+  if (flags & ~(HWLOC_TOPOLOGY_FLAG_INCLUDE_DISALLOWED|HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM|HWLOC_TOPOLOGY_FLAG_THISSYSTEM_ALLOWED_RESOURCES|HWLOC_TOPOLOGY_FLAG_IMPORT_SUPPORT|HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_CPUBINDING|HWLOC_TOPOLOGY_FLAG_RESTRICT_TO_MEMBINDING|HWLOC_TOPOLOGY_FLAG_DONT_CHANGE_BINDING)) {
     errno = EINVAL;
     return -1;
   }
@@ -4100,11 +4076,15 @@ hwloc_topology_load (struct hwloc_topology *topology)
    */
   hwloc_set_binding_hooks(topology);
 
+  hwloc_pci_discovery_prepare(topology);
+
   /* actual topology discovery */
   err = hwloc_discover(topology, &dstatus);
   if (err < 0)
     goto out;
 
+  hwloc_pci_discovery_exit(topology);
+
 #ifndef HWLOC_DEBUG
   if (getenv("HWLOC_DEBUG_CHECK"))
 #endif
@@ -4126,7 +4106,6 @@ hwloc_topology_load (struct hwloc_topology *topology)
   /* Same for memattrs */
   hwloc_internal_memattrs_need_refresh(topology);
   hwloc_internal_memattrs_refresh(topology);
-  hwloc_internal_memattrs_guess_memory_tiers(topology);
 
   topology->is_loaded = 1;
 

src/3rdparty/libethash/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required (VERSION 2.8.12)
 project (ethash C)
 
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os")

src/App.cpp

@@ -1,13 +1,6 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -21,9 +14,15 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+  * Additional permission under GNU GPL version 3 section 7
+  *
+  * If you modify this Program, or any covered work, by linking or combining
+  * it with OpenSSL (or a modified version of that library), containing parts
+  * covered by the terms of OpenSSL License and SSLeay License, the licensors
+  * of this Program grant you additional permission to convey the resulting work.
  */
 
-
 #include <cstdlib>
 #include <uv.h>
 
@@ -34,7 +33,6 @@
 #include "base/io/log/Log.h"
 #include "base/io/log/Tags.h"
 #include "base/io/Signals.h"
-#include "base/kernel/Platform.h"
 #include "core/config/Config.h"
 #include "core/Controller.h"
 #include "Summary.h"
@@ -63,12 +61,7 @@ int xmrig::App::exec()
 
     m_signals = std::make_shared<Signals>(this);
 
-    int rc = 0;
-    if (background(rc)) {
-        return rc;
-    }
-
-    rc = m_controller->init();
+    int rc = m_controller->init();
     if (rc != 0) {
         return rc;
     }

src/App.h

@@ -1,13 +1,6 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -21,6 +14,13 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+  * Additional permission under GNU GPL version 3 section 7
+  *
+  * If you modify this Program, or any covered work, by linking or combining
+  * it with OpenSSL (or a modified version of that library), containing parts
+  * covered by the terms of OpenSSL License and SSLeay License, the licensors
+  * of this Program grant you additional permission to convey the resulting work.
  */
 
 #ifndef XMRIG_APP_H
@@ -60,7 +60,6 @@ protected:
     void onSignal(int signum) override;
 
 private:
-    bool background(int &rc);
     void close();
 
     std::shared_ptr<Console> m_console;

src/App_unix.cpp

@@ -1,68 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <cstdlib>
-#include <csignal>
-#include <cerrno>
-#include <unistd.h>
-
-
-#include "App.h"
-#include "base/io/log/Log.h"
-#include "core/Controller.h"
-
-
-bool xmrig::App::background(int &rc)
-{
-    if (!m_controller->isBackground()) {
-        return false;
-    }
-
-    int i = fork();
-    if (i < 0) {
-        rc = 1;
-
-        return true;
-    }
-
-    if (i > 0) {
-        rc = 0;
-
-        return true;
-    }
-
-    i = setsid();
-
-    if (i < 0) {
-        LOG_ERR("setsid() failed (errno = %d)", errno);
-    }
-
-    i = chdir("/");
-    if (i < 0) {
-        LOG_ERR("chdir() failed (errno = %d)", errno);
-    }
-
-    return false;
-}

src/backend/common/Worker.cpp

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 
 #include "backend/common/Worker.h"
-#include "base/kernel/Platform.h"
+#include "base/kernel/OS.h"
 #include "crypto/common/VirtualMemory.h"
 
 
@@ -28,6 +28,6 @@ xmrig::Worker::Worker(size_t id, int64_t affinity, int priority) :
 {
     m_node = VirtualMemory::bindToNUMANode(affinity);
 
-    Platform::trySetThreadAffinity(affinity);
-    Platform::setThreadPriority(priority);
+    OS::trySetThreadAffinity(affinity);
+    OS::setThreadPriority(priority);
 }

src/backend/cpu/Cpu.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ public:
 };
 
 
-} // namespace xmrig
+} /* namespace xmrig */
 
 
-#endif // XMRIG_CPU_H
+#endif /* XMRIG_CPU_H */

src/backend/cpu/CpuWorker.cpp

@@ -33,7 +33,6 @@
 #include "crypto/common/Nonce.h"
 #include "crypto/common/VirtualMemory.h"
 #include "crypto/rx/Rx.h"
-#include "crypto/rx/RxCache.h"
 #include "crypto/rx/RxDataset.h"
 #include "crypto/rx/RxVm.h"
 #include "crypto/ghostrider/ghostrider.h"
@@ -78,11 +77,8 @@ xmrig::CpuWorker<N>::CpuWorker(size_t id, const CpuLaunchData &data) :
 {
 #   ifdef XMRIG_ALGO_CN_HEAVY
     // cn-heavy optimization for Zen3 CPUs
-    const auto arch = Cpu::info()->arch();
-    const uint32_t model = Cpu::info()->model();
-    const bool is_vermeer = (arch == ICpuInfo::ARCH_ZEN3) && (model == 0x21);
-    const bool is_raphael = (arch == ICpuInfo::ARCH_ZEN4) && (model == 0x61);
-    if ((N == 1) && (m_av == CnHash::AV_SINGLE) && (m_algorithm.family() == Algorithm::CN_HEAVY) && (m_assembly != Assembly::NONE) && (is_vermeer || is_raphael)) {
+    const bool is_vermeer = (Cpu::info()->arch() == ICpuInfo::ARCH_ZEN3) && (Cpu::info()->model() == 0x21);
+    if ((N == 1) && (m_av == CnHash::AV_SINGLE) && (m_algorithm.family() == Algorithm::CN_HEAVY) && (m_assembly != Assembly::NONE) && is_vermeer) {
         std::lock_guard<std::mutex> lock(cn_heavyZen3MemoryMutex);
         if (!cn_heavyZen3Memory) {
             // Round up number of threads to the multiple of 8
@@ -146,11 +142,6 @@ void xmrig::CpuWorker<N>::allocateRandomX_VM()
         uint8_t* scratchpad = m_memory->isHugePages() ? m_memory->scratchpad() : dataset->tryAllocateScrathpad();
         m_vm = RxVm::create(dataset, scratchpad ? scratchpad : m_memory->scratchpad(), !m_hwAES, m_assembly, node());
     }
-    else if (!dataset->get() && (m_job.currentJob().seed() != m_seed)) {
-        // Update RandomX light VM with the new seed
-        randomx_vm_set_cache(m_vm, dataset->cache()->get());
-    }
-    m_seed = m_job.currentJob().seed();
 }
 #endif
 

src/backend/cpu/CpuWorker.h

@@ -97,7 +97,6 @@ private:
 
 #   ifdef XMRIG_ALGO_RANDOMX
     randomx_vm *m_vm        = nullptr;
-    Buffer m_seed;
 #   endif
 
 #   ifdef XMRIG_ALGO_GHOSTRIDER

src/backend/cpu/interfaces/ICpuInfo.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -26,12 +26,6 @@
 #include "crypto/common/Assembly.h"
 
 
-#ifdef XMRIG_FEATURE_HWLOC
-using hwloc_const_bitmap_t  = const struct hwloc_bitmap_s *;
-using hwloc_topology_t      = struct hwloc_topology *;
-#endif
-
-
 namespace xmrig {
 
 
@@ -51,21 +45,19 @@ public:
         ARCH_ZEN,
         ARCH_ZEN_PLUS,
         ARCH_ZEN2,
-        ARCH_ZEN3,
-        ARCH_ZEN4
+        ARCH_ZEN3
     };
 
     enum MsrMod : uint32_t {
         MSR_MOD_NONE,
         MSR_MOD_RYZEN_17H,
         MSR_MOD_RYZEN_19H,
-        MSR_MOD_RYZEN_19H_ZEN4,
         MSR_MOD_INTEL,
         MSR_MOD_CUSTOM,
         MSR_MOD_MAX
     };
 
-#   define MSR_NAMES_LIST "none", "ryzen_17h", "ryzen_19h", "ryzen_19h_zen4", "intel", "custom"
+#   define MSR_NAMES_LIST "none", "ryzen_17h", "ryzen_19h", "intel", "custom"
 
     enum Flag : uint32_t {
         FLAG_AES,
@@ -122,16 +114,10 @@ public:
     virtual size_t threads() const                                                  = 0;
     virtual Vendor vendor() const                                                   = 0;
     virtual uint32_t model() const                                                  = 0;
-
-#   ifdef XMRIG_FEATURE_HWLOC
-    virtual bool membind(hwloc_const_bitmap_t nodeset)                              = 0;
-    virtual const std::vector<uint32_t> &nodeset() const                            = 0;
-    virtual hwloc_topology_t topology() const                                       = 0;
-#   endif
 };
 
 
-} // namespace xmrig
+} /* namespace xmrig */
 
 
 #endif // XMRIG_CPUINFO_H

src/backend/cpu/platform/BasicCpuInfo.cpp

@@ -64,7 +64,7 @@ static_assert(kCpuFlagsSize == ICpuInfo::FLAG_MAX, "kCpuFlagsSize and FLAG_MAX m
 
 
 #ifdef XMRIG_FEATURE_MSR
-constexpr size_t kMsrArraySize                                  = 6;
+constexpr size_t kMsrArraySize                                  = 5;
 static const std::array<const char *, kMsrArraySize> msrNames   = { MSR_NAMES_LIST };
 static_assert(kMsrArraySize == ICpuInfo::MSR_MOD_MAX, "kMsrArraySize and MSR_MOD_MAX mismatch");
 #endif
@@ -250,14 +250,8 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
                     break;
 
                 case 0x19:
-                    if (m_model == 0x61) {
-                        m_arch = ARCH_ZEN4;
-                        m_msrMod = MSR_MOD_RYZEN_19H_ZEN4;
-                    }
-                    else {
-                        m_arch = ARCH_ZEN3;
-                        m_msrMod = MSR_MOD_RYZEN_19H;
-                    }
+                    m_arch = ARCH_ZEN3;
+                    m_msrMod = MSR_MOD_RYZEN_19H;
                     break;
 
                 default:
@@ -296,7 +290,7 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
                 // Affected CPU models and stepping numbers are taken from https://www.intel.com/content/dam/support/us/en/documents/processors/mitigations-jump-conditional-code-erratum.pdf
                 m_jccErratum =
                     ((model == 0x4E) && (stepping == 0x3)) ||
-                    ((model == 0x55) && ((stepping == 0x4) || (stepping == 0x7))) ||
+                    ((model == 0x55) && (stepping == 0x4)) ||
                     ((model == 0x5E) && (stepping == 0x3)) ||
                     ((model == 0x8E) && (stepping >= 0x9) && (stepping <= 0xC)) ||
                     ((model == 0x9E) && (stepping >= 0x9) && (stepping <= 0xD)) ||

src/backend/cpu/platform/BasicCpuInfo.h

@@ -1,7 +1,7 @@
 /* XMRig
  * Copyright (c) 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -72,10 +72,11 @@ protected:
 #   endif
     }
 
+protected:
     Arch m_arch             = ARCH_UNKNOWN;
     bool m_jccErratum       = false;
     char m_brand[64 + 6]{};
-    size_t m_threads        = 0;
+    size_t m_threads;
     std::vector<int32_t> m_units;
     Vendor m_vendor         = VENDOR_UNKNOWN;
 
@@ -93,7 +94,7 @@ private:
 };
 
 
-} // namespace xmrig
+} /* namespace xmrig */
 
 
-#endif // XMRIG_BASICCPUINFO_H
+#endif /* XMRIG_BASICCPUINFO_H */

src/backend/cpu/platform/BasicCpuInfo_arm.cpp

@@ -27,7 +27,7 @@
 
 #if __ARM_FEATURE_CRYPTO && !defined(__APPLE__)
 #   include <sys/auxv.h>
-#   if !defined(XMRIG_OS_FREEBSD)
+#   ifndef __FreeBSD__
 #       include <asm/hwcap.h>
 #   else
 #       include <stdint.h>
@@ -71,7 +71,7 @@ xmrig::BasicCpuInfo::BasicCpuInfo() :
 #   if __ARM_FEATURE_CRYPTO
 #   if defined(__APPLE__)
     m_flags.set(FLAG_AES, true);
-#   elif defined(XMRIG_OS_FREEBSD)
+#   elif defined(__FreeBSD__)
     uint64_t isar0 = READ_SPECIALREG(id_aa64isar0_el1);
     m_flags.set(FLAG_AES, ID_AA64ISAR0_AES_VAL(isar0) >= ID_AA64ISAR0_AES_BASE);
 #   else

src/backend/cpu/platform/HwlocCpuInfo.cpp

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -36,22 +36,27 @@
 #include "base/io/log/Log.h"
 
 
-#if HWLOC_API_VERSION < 0x20000
-static inline int hwloc_obj_type_is_cache(hwloc_obj_type_t type)
-{
-    return type == HWLOC_OBJ_CACHE;
-}
-#endif
-
-
 namespace xmrig {
 
 
+uint32_t HwlocCpuInfo::m_features = 0;
+
+
+static inline bool isCacheObject(hwloc_obj_t obj)
+{
+#   if HWLOC_API_VERSION >= 0x20000
+    return hwloc_obj_type_is_cache(obj->type);
+#   else
+    return obj->type == HWLOC_OBJ_CACHE;
+#   endif
+}
+
+
 template <typename func>
 static inline void findCache(hwloc_obj_t obj, unsigned min, unsigned max, func lambda)
 {
     for (size_t i = 0; i < obj->arity; i++) {
-        if (hwloc_obj_type_is_cache(obj->children[i]->type)) {
+        if (isCacheObject(obj->children[i])) {
             const unsigned depth = obj->children[i]->attr->cache.depth;
             if (depth < min || depth > max) {
                 continue;
@@ -169,6 +174,10 @@ xmrig::HwlocCpuInfo::HwlocCpuInfo()
     m_packages  = countByType(m_topology, HWLOC_OBJ_PACKAGE);
 
     if (m_nodes > 1) {
+        if (hwloc_topology_get_support(m_topology)->membind->set_thisthread_membind) {
+            m_features |= SET_THISTHREAD_MEMBIND;
+        }
+
         m_nodeset.reserve(m_nodes);
         hwloc_obj_t node = nullptr;
 
@@ -289,10 +298,8 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
     cores.reserve(m_cores);
     findByType(cache, HWLOC_OBJ_CORE, [&cores](hwloc_obj_t found) { cores.emplace_back(found); });
 
-    const bool L3_exclusive = isCacheExclusive(cache);
-
 #   ifdef XMRIG_ALGO_GHOSTRIDER
-    if ((algorithm == Algorithm::GHOSTRIDER_RTM) && L3_exclusive && (PUs > cores.size()) && (PUs < cores.size() * 2)) {
+    if ((algorithm == Algorithm::GHOSTRIDER_RTM) && (PUs > cores.size()) && (PUs < cores.size() * 2)) {
         // Don't use E-cores on Alder Lake
         cores.erase(std::remove_if(cores.begin(), cores.end(), [](hwloc_obj_t c) { return hwloc_bitmap_weight(c->cpuset) == 1; }), cores.end());
 
@@ -304,6 +311,7 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
 #   endif
 
     size_t L3               = cache->attr->cache.size;
+    const bool L3_exclusive = isCacheExclusive(cache);
     size_t L2               = 0;
     int L2_associativity    = 0;
     size_t extra            = 0;
@@ -313,7 +321,7 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
     if (cache->attr->cache.depth == 3) {
         for (size_t i = 0; i < cache->arity; ++i) {
             hwloc_obj_t l2 = cache->children[i];
-            if (!hwloc_obj_type_is_cache(l2->type) || l2->attr == nullptr) {
+            if (!isCacheObject(l2) || l2->attr == nullptr) {
                 continue;
             }
 
@@ -341,10 +349,6 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
     }
 
 #   ifdef XMRIG_ALGO_RANDOMX
-    if ((algorithm.family() == Algorithm::RANDOM_X) && L3_exclusive && (PUs > cores.size()) && (PUs < cores.size() * 2)) {
-        // Use all L3+L2 on latest Intel CPUs with P-cores, E-cores and exclusive L3 cache
-        cacheHashes = (L3 + L2) / scratchpad;
-    }
     if (extra == 0 && algorithm.l2() > 0) {
         cacheHashes = std::min<size_t>(std::max<size_t>(L2 / algorithm.l2(), cores.size()), cacheHashes);
     }

src/backend/cpu/platform/HwlocCpuInfo.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -21,9 +21,12 @@
 
 
 #include "backend/cpu/platform/BasicCpuInfo.h"
+#include "base/tools/Object.h"
 
 
-using hwloc_obj_t = struct hwloc_obj *;
+using hwloc_const_bitmap_t  = const struct hwloc_bitmap_s *;
+using hwloc_obj_t           = struct hwloc_obj *;
+using hwloc_topology_t      = struct hwloc_topology *;
 
 
 namespace xmrig {
@@ -34,27 +37,39 @@ class HwlocCpuInfo : public BasicCpuInfo
 public:
     XMRIG_DISABLE_COPY_MOVE(HwlocCpuInfo)
 
+
+    enum Feature : uint32_t {
+        SET_THISTHREAD_MEMBIND = 1
+    };
+
+
     HwlocCpuInfo();
     ~HwlocCpuInfo() override;
 
+    static inline bool hasFeature(Feature feature)              { return m_features & feature; }
+
+    inline const std::vector<uint32_t> &nodeset() const         { return m_nodeset; }
+    inline hwloc_topology_t topology() const                    { return m_topology; }
+
+    bool membind(hwloc_const_bitmap_t nodeset);
+
 protected:
-    bool membind(hwloc_const_bitmap_t nodeset) override;
     CpuThreads threads(const Algorithm &algorithm, uint32_t limit) const override;
 
-    inline const char *backend() const override                     { return m_backend; }
-    inline const std::vector<uint32_t> &nodeset() const override    { return m_nodeset; }
-    inline hwloc_topology_t topology() const override               { return m_topology; }
-    inline size_t cores() const override                            { return m_cores; }
-    inline size_t L2() const override                               { return m_cache[2]; }
-    inline size_t L3() const override                               { return m_cache[3]; }
-    inline size_t nodes() const override                            { return m_nodes; }
-    inline size_t packages() const override                         { return m_packages; }
+    inline const char *backend() const override     { return m_backend; }
+    inline size_t cores() const override            { return m_cores; }
+    inline size_t L2() const override               { return m_cache[2]; }
+    inline size_t L3() const override               { return m_cache[3]; }
+    inline size_t nodes() const override            { return m_nodes; }
+    inline size_t packages() const override         { return m_packages; }
 
 private:
     CpuThreads allThreads(const Algorithm &algorithm, uint32_t limit) const;
     void processTopLevelCache(hwloc_obj_t cache, const Algorithm &algorithm, CpuThreads &threads, size_t limit) const;
     void setThreads(size_t threads);
 
+    static uint32_t m_features;
+
     char m_backend[20]          = { 0 };
     hwloc_topology_t m_topology = nullptr;
     size_t m_cache[5]           = { 0 };
@@ -65,7 +80,7 @@ private:
 };
 
 
-} // namespace xmrig
+} /* namespace xmrig */
 
 
-#endif // XMRIG_HWLOCCPUINFO_H
+#endif /* XMRIG_HWLOCCPUINFO_H */

src/backend/cpu/platform/lscpu_arm.cpp

@@ -1,7 +1,7 @@
 /* XMRig
  * Copyright (c) 2018      Riku Voipio <riku.voipio@iki.fi>
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "base/tools/String.h"
 #include "3rdparty/fmt/core.h"
 
@@ -83,7 +84,6 @@ static const id_part arm_part[] = {
     { 0xc27, "Cortex-M7" },
     { 0xc60, "Cortex-M0+" },
     { 0xd01, "Cortex-A32" },
-    { 0xd02, "Cortex-A34" },
     { 0xd03, "Cortex-A53" },
     { 0xd04, "Cortex-A35" },
     { 0xd05, "Cortex-A55" },
@@ -97,60 +97,40 @@ static const id_part arm_part[] = {
     { 0xd0d, "Cortex-A77" },
     { 0xd0e, "Cortex-A76AE" },
     { 0xd13, "Cortex-R52" },
-    { 0xd15, "Cortex-R82" },
     { 0xd20, "Cortex-M23" },
     { 0xd21, "Cortex-M33" },
-    { 0xd40, "Neoverse-V1" },
     { 0xd41, "Cortex-A78" },
     { 0xd42, "Cortex-A78AE" },
-    { 0xd43, "Cortex-A65AE" },
-    { 0xd44, "Cortex-X1" },
-    { 0xd46, "Cortex-A510" },
-    { 0xd47, "Cortex-A710" },
-    { 0xd48, "Cortex-X2" },
-    { 0xd49, "Neoverse-N2" },
     { 0xd4a, "Neoverse-E1" },
     { 0xd4b, "Cortex-A78C" },
-    { 0xd4c, "Cortex-X1C" },
-    { 0xd4d, "Cortex-A715" },
-    { 0xd4e, "Cortex-X3" },
-    { 0xd4f, "Neoverse-V2" },
-    { -1, nullptr }
+    { -1, nullptr },
 };
 
 static const id_part brcm_part[] = {
-    { 0x0f, "Brahma-B15" },
-    { 0x100, "Brahma-B53" },
+    { 0x0f, "Brahma B15" },
+    { 0x100, "Brahma B53" },
     { 0x516, "ThunderX2" },
-    { -1, nullptr }
+    { -1, nullptr },
 };
 
 static const id_part dec_part[] = {
     { 0xa10, "SA110" },
     { 0xa11, "SA1100" },
-    { -1, nullptr }
+    { -1, nullptr },
 };
 
 static const id_part cavium_part[] = {
     { 0x0a0, "ThunderX" },
-    { 0x0a1, "ThunderX-88XX" },
-    { 0x0a2, "ThunderX-81XX" },
-    { 0x0a3, "ThunderX-83XX" },
-    { 0x0af, "ThunderX2-99xx" },
-    { 0x0b0, "OcteonTX2" },
-    { 0x0b1, "OcteonTX2-98XX" },
-    { 0x0b2, "OcteonTX2-96XX" },
-    { 0x0b3, "OcteonTX2-95XX" },
-    { 0x0b4, "OcteonTX2-95XXN" },
-    { 0x0b5, "OcteonTX2-95XXMM" },
-    { 0x0b6, "OcteonTX2-95XXO" },
-    { 0x0b8, "ThunderX3-T110" },
-    { -1, nullptr }
+    { 0x0a1, "ThunderX 88XX" },
+    { 0x0a2, "ThunderX 81XX" },
+    { 0x0a3, "ThunderX 83XX" },
+    { 0x0af, "ThunderX2 99xx" },
+    { -1, nullptr },
 };
 
 static const id_part apm_part[] = {
     { 0x000, "X-Gene" },
-    { -1, nullptr }
+    { -1, nullptr },
 };
 
 static const id_part qcom_part[] = {
@@ -161,43 +141,36 @@ static const id_part qcom_part[] = {
     { 0x201, "Kryo" },
     { 0x205, "Kryo" },
     { 0x211, "Kryo" },
-    { 0x800, "Falkor-V1/Kryo" },
-    { 0x801, "Kryo-V2" },
-    { 0x802, "Kryo-3XX-Gold" },
-    { 0x803, "Kryo-3XX-Silver" },
-    { 0x804, "Kryo-4XX-Gold" },
-    { 0x805, "Kryo-4XX-Silver" },
+    { 0x800, "Falkor V1/Kryo" },
+    { 0x801, "Kryo V2" },
     { 0xc00, "Falkor" },
     { 0xc01, "Saphira" },
-    { -1, nullptr }
+    { -1, nullptr },
 };
 
 static const id_part samsung_part[] = {
     { 0x001, "exynos-m1" },
-    { 0x002, "exynos-m3" },
-    { 0x003, "exynos-m4" },
-    { 0x004, "exynos-m5" },
-    { -1, nullptr }
+    { -1, nullptr },
 };
 
 static const id_part nvidia_part[] = {
     { 0x000, "Denver" },
     { 0x003, "Denver 2" },
     { 0x004, "Carmel" },
-    { -1, nullptr }
+    { -1, nullptr },
 };
 
 static const id_part marvell_part[] = {
-    { 0x131, "Feroceon-88FR131" },
+    { 0x131, "Feroceon 88FR131" },
     { 0x581, "PJ4/PJ4b" },
     { 0x584, "PJ4B-MP" },
-    { -1, nullptr }
+    { -1, nullptr },
 };
 
 static const id_part faraday_part[] = {
     { 0x526, "FA526" },
     { 0x626, "FA626" },
-    { -1, nullptr }
+    { -1, nullptr },
 };
 
 static const id_part intel_part[] = {
@@ -222,50 +195,23 @@ static const id_part intel_part[] = {
     { 0x689, "PXA31x" },
     { 0xb11, "SA1110" },
     { 0xc12, "IPX1200" },
-    { -1, nullptr }
+    { -1, nullptr },
 };
 
 static const struct id_part fujitsu_part[] = {
     { 0x001, "A64FX" },
-    { -1, nullptr }
+    { -1, "unknown" },
 };
 
 static const id_part hisi_part[] = {
-    { 0xd01, "Kunpeng-920" },	/* aka tsv110 */
-    { 0xd40, "Cortex-A76" },	/* HiSilicon uses this ID though advertises A76 */
-    { -1, nullptr }
+    { 0xd01, "Kunpeng-920" }, /* aka tsv110 */
+    { -1, nullptr },
 };
 
 static const id_part apple_part[] = {
     { 0x022, "M1" },
     { 0x023, "M1" },
-    { 0x024, "M1-Pro" },
-    { 0x025, "M1-Pro" },
-    { 0x028, "M1-Max" },
-    { 0x029, "M1-Max" },
-    { 0x032, "M2" },
-    { 0x033, "M2" },
-    { 0x034, "M2-Pro" },
-    { 0x035, "M2-Pro" },
-    { 0x038, "M2-Max" },
-    { 0x039, "M2-Max" },
-    { -1, nullptr }
-};
-
-
-static const struct id_part ft_part[] = {
-    { 0x660, "FTC660" },
-    { 0x661, "FTC661" },
-    { 0x662, "FTC662" },
-    { 0x663, "FTC663" },
-    { -1, nullptr }
-};
-
-
-static const struct id_part ampere_part[] = {
-    { 0xac3, "Ampere-1" },
-    { 0xac4, "Ampere-1a" },
-    { -1, nullptr }
+    { -1, nullptr },
 };
 
 
@@ -283,9 +229,7 @@ static const hw_impl hw_implementer[] = {
     { 0x56, marvell_part, "Marvell" },
     { 0x61, apple_part,   "Apple" },
     { 0x66, faraday_part, "Faraday" },
-    { 0x69, intel_part,   "Intel" },
-    { 0x70, ft_part,      "Phytium" },
-    { 0xc0, ampere_part,  "Ampere" }
+    { 0x69, intel_part,   "Intel" }
 };
 
 

src/backend/cuda/wrappers/CudaLib.cpp

@@ -353,9 +353,13 @@ bool xmrig::CudaLib::open()
 #   ifdef XMRIG_OS_LINUX
     if (m_loader == defaultLoader) {
         m_loader = Process::location(Process::ExeLocation, m_loader);
-        if (uv_dlopen(m_loader, &cudaLib) == 0) {
-            return true;
-        }
+    }
+    else {
+        return false;
+    }
+
+    if (uv_dlopen(m_loader, &cudaLib) == 0) {
+        return true;
     }
 #   endif
 

src/backend/opencl/runners/OclBaseRunner.cpp

@@ -23,9 +23,6 @@
  */
 
 
-#include <stdexcept>
-
-
 #include "backend/opencl/runners/OclBaseRunner.h"
 #include "backend/opencl/cl/OclSource.h"
 #include "backend/opencl/OclCache.h"

src/backend/opencl/runners/OclCnRunner.cpp

@@ -16,9 +16,6 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdexcept>
-
-
 #include "backend/opencl/runners/OclCnRunner.h"
 #include "backend/opencl/kernels/Cn0Kernel.h"
 #include "backend/opencl/kernels/Cn1Kernel.h"

src/backend/opencl/runners/OclKawPowRunner.cpp

@@ -16,9 +16,6 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdexcept>
-
-
 #include "backend/opencl/runners/OclKawPowRunner.h"
 #include "backend/common/Tags.h"
 #include "3rdparty/libethash/ethash_internal.h"

src/backend/opencl/runners/OclRxJitRunner.cpp

@@ -16,9 +16,6 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdexcept>
-
-
 #include "backend/opencl/runners/OclRxJitRunner.h"
 #include "backend/opencl/cl/rx/randomx_run_gfx803.h"
 #include "backend/opencl/cl/rx/randomx_run_gfx900.h"

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

@@ -399,9 +399,6 @@ 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)
     {
@@ -422,37 +419,19 @@ 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)
-            {
-                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_async_init(m_loop, &m_shutdownAsync, [](uv_async_t* handle) { uv_close(reinterpret_cast<uv_handle_t*>(handle), nullptr); });
         uv_thread_create(&m_loopThread, loop, this);
     }
 
-    m_batons.emplace_back(runner, period, worksize);
-    uv_async_send(&m_batonAsync);
+    KawPowBaton* baton = new KawPowBaton(runner, period, worksize);
+
+    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/base/api/Api.cpp

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 #include "base/crypto/keccak.h"
 #include "base/io/Env.h"
 #include "base/io/json/Json.h"
-#include "base/kernel/Base.h"
+#include "base/kernel/OS.h"
 #include "base/tools/Chrono.h"
 #include "base/tools/Cvt.h"
 #include "core/config/Config.h"
@@ -123,21 +123,6 @@ void xmrig::Api::stop()
 }
 
 
-void xmrig::Api::tick()
-{
-#   ifdef XMRIG_FEATURE_HTTP
-    if (m_httpd->isBound() || !m_base->config()->http().isEnabled()) {
-        return;
-    }
-
-    if (++m_ticks % 10 == 0) {
-        m_ticks = 0;
-        m_httpd->start();
-    }
-#   endif
-}
-
-
 void xmrig::Api::onConfigChanged(Config *config, Config *previousConfig)
 {
     if (config->apiId() != previousConfig->apiId()) {
@@ -247,6 +232,6 @@ void xmrig::Api::genWorkerId(const String &id)
 {
     m_workerId = Env::expand(id);
     if (m_workerId.isEmpty()) {
-        m_workerId = Env::hostname();
+        m_workerId = OS::hostname();
     }
 }

src/base/api/Api.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 
 
 #include <vector>
+#include <cstdint>
 
 
 #include "base/kernel/interfaces/IBaseListener.h"
@@ -43,7 +44,7 @@ class Api : public IBaseListener
 public:
     XMRIG_DISABLE_COPY_MOVE_DEFAULT(Api)
 
-    explicit Api(Base *base);
+    Api(Base *base);
     ~Api() override;
 
     inline const char *id() const                   { return m_id; }
@@ -53,7 +54,6 @@ public:
     void request(const HttpData &req);
     void start();
     void stop();
-    void tick();
 
 protected:
     void onConfigChanged(Config *config, Config *previousConfig) override;
@@ -65,15 +65,14 @@ private:
 
     Base *m_base;
     char m_id[32]{};
-    const uint64_t m_timestamp;
-    Httpd *m_httpd  = nullptr;
-    std::vector<IApiListener *> m_listeners;
     String m_workerId;
-    uint8_t m_ticks = 0;
+    const uint64_t m_timestamp;
+    Httpd *m_httpd = nullptr;
+    std::vector<IApiListener *> m_listeners;
 };
 
 
 } // namespace xmrig
 
 
-#endif // XMRIG_API_H
+#endif /* XMRIG_API_H */

src/base/api/Httpd.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,6 +22,11 @@
 
 #include "base/kernel/interfaces/IBaseListener.h"
 #include "base/net/http/HttpListener.h"
+#include "base/tools/Object.h"
+
+
+#include <cstdint>
+#include <memory>
 
 
 namespace xmrig {
@@ -38,11 +43,9 @@ class Httpd : public IBaseListener, public IHttpListener
 public:
     XMRIG_DISABLE_COPY_MOVE_DEFAULT(Httpd)
 
-    explicit Httpd(Base *base);
+    Httpd(Base *base);
     ~Httpd() override;
 
-    inline bool isBound() const { return m_server != nullptr; }
-
     bool start();
     void stop();
 
@@ -66,7 +69,7 @@ private:
 };
 
 
-} // namespace xmrig
+} /* namespace xmrig */
 
 
-#endif // XMRIG_HTTPD_H
+#endif /* XMRIG_HTTPD_H */

src/base/api/requests/ApiRequest.cpp

@@ -1,12 +1,6 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,7 +16,6 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "base/api/requests/ApiRequest.h"
 
 

src/base/api/requests/ApiRequest.h

@@ -1,12 +1,6 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,7 +16,6 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #ifndef XMRIG_APIREQUEST_H
 #define XMRIG_APIREQUEST_H
 

src/base/api/requests/HttpApiRequest.cpp

@@ -16,7 +16,6 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "base/api/requests/HttpApiRequest.h"
 #include "3rdparty/llhttp/llhttp.h"
 #include "3rdparty/rapidjson/error/en.h"

src/base/api/requests/HttpApiRequest.h

@@ -16,7 +16,6 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #ifndef XMRIG_HTTPAPIREQUEST_H
 #define XMRIG_HTTPAPIREQUEST_H
 

src/base/base.cmake

@@ -18,10 +18,9 @@ set(HEADERS_BASE
     src/base/io/log/Tags.h
     src/base/io/Signals.h
     src/base/io/Watcher.h
-    src/base/kernel/Base.h
-    src/base/kernel/config/BaseConfig.h
-    src/base/kernel/config/BaseTransform.h
-    src/base/kernel/config/Title.h
+    src/base/kernel/v6/Base.h
+    src/base/kernel/v6/config/BaseConfig.h
+    src/base/kernel/v6/config/BaseTransform.h
     src/base/kernel/constants.h
     src/base/kernel/Entry.h
     src/base/kernel/interfaces/IAsyncListener.h
@@ -29,7 +28,6 @@ set(HEADERS_BASE
     src/base/kernel/interfaces/IClient.h
     src/base/kernel/interfaces/IClientListener.h
     src/base/kernel/interfaces/IConfig.h
-    src/base/kernel/interfaces/IConfigListener.h
     src/base/kernel/interfaces/IConfigTransform.h
     src/base/kernel/interfaces/IConsoleListener.h
     src/base/kernel/interfaces/IDnsBackend.h
@@ -41,10 +39,13 @@ set(HEADERS_BASE
     src/base/kernel/interfaces/IStrategyListener.h
     src/base/kernel/interfaces/ITimerListener.h
     src/base/kernel/interfaces/IWatcherListener.h
-    src/base/kernel/Platform.h
+    src/base/kernel/Lib.h
+    src/base/kernel/OS.h
+    src/base/kernel/private/DnsConfig.h
+    src/base/kernel/private/Title.h
     src/base/kernel/Process.h
+    src/base/kernel/Versions.h
     src/base/net/dns/Dns.h
-    src/base/net/dns/DnsConfig.h
     src/base/net/dns/DnsRecord.h
     src/base/net/dns/DnsRecords.h
     src/base/net/dns/DnsRequest.h
@@ -106,15 +107,17 @@ set(SOURCES_BASE
     src/base/io/log/Tags.cpp
     src/base/io/Signals.cpp
     src/base/io/Watcher.cpp
-    src/base/kernel/Base.cpp
-    src/base/kernel/config/BaseConfig.cpp
-    src/base/kernel/config/BaseTransform.cpp
-    src/base/kernel/config/Title.cpp
+    src/base/kernel/v6/Base.cpp
+    src/base/kernel/v6/config/BaseConfig.cpp
+    src/base/kernel/v6/config/BaseTransform.cpp
     src/base/kernel/Entry.cpp
-    src/base/kernel/Platform.cpp
+    src/base/kernel/Lib.cpp
+    src/base/kernel/OS.cpp
+    src/base/kernel/private/DnsConfig.cpp
+    src/base/kernel/private/Title.cpp
     src/base/kernel/Process.cpp
+    src/base/kernel/Versions.cpp
     src/base/net/dns/Dns.cpp
-    src/base/net/dns/DnsConfig.cpp
     src/base/net/dns/DnsRecord.cpp
     src/base/net/dns/DnsRecords.cpp
     src/base/net/dns/DnsUvBackend.cpp
@@ -148,19 +151,22 @@ set(SOURCES_BASE
 if (WIN32)
     set(SOURCES_OS
         src/base/io/json/Json_win.cpp
-        src/base/kernel/Platform_win.cpp
+        src/base/kernel/Entry_win.cpp
+        src/base/kernel/OS_win.cpp
         src/base/kernel/Process_win.cpp
         )
 elseif (APPLE)
     set(SOURCES_OS
         src/base/io/json/Json_unix.cpp
-        src/base/kernel/Platform_mac.cpp
+        src/base/kernel/Entry_unix.cpp
+        src/base/kernel/OS_mac.cpp
         src/base/kernel/Process_unix.cpp
         )
 else()
     set(SOURCES_OS
         src/base/io/json/Json_unix.cpp
-        src/base/kernel/Platform_unix.cpp
+        src/base/kernel/Entry_unix.cpp
+        src/base/kernel/OS_unix.cpp
         src/base/kernel/Process_unix.cpp
         )
 endif()
@@ -168,7 +174,7 @@ endif()
 
 if (WITH_HWLOC)
     list(APPEND SOURCES_OS
-        src/base/kernel/Platform_hwloc.cpp
+        src/base/kernel/OS_hwloc.cpp
         )
 endif()
 

src/base/crypto/Algorithm.h

@@ -1,7 +1,7 @@
 /* XMRig
  * Copyright (c) 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -209,7 +209,7 @@ private:
 using Algorithms = std::vector<Algorithm>;
 
 
-} /* namespace xmrig */
+} // namespace xmrig
 
 
-#endif /* XMRIG_ALGORITHM_H */
+#endif // XMRIG_ALGORITHM_H

src/base/crypto/Coin.cpp

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -53,7 +53,6 @@ static const CoinInfo coinInfo[] = {
     { Algorithm::RX_KEVA,         "KVA",      "Kevacoin",     0,      0,              MAGENTA_BG_BOLD(WHITE_BOLD_S " keva    ") },
     { Algorithm::KAWPOW_RVN,      "RVN",      "Ravencoin",    0,      0,              BLUE_BG_BOLD(   WHITE_BOLD_S " raven   ") },
     { Algorithm::RX_WOW,          "WOW",      "Wownero",      300,    100000000000,   MAGENTA_BG_BOLD(WHITE_BOLD_S " wownero ") },
-    { Algorithm::RX_0,            "ZEPH",     "Zephyr",       120,    1000000000000,  BLUE_BG_BOLD(   WHITE_BOLD_S " zephyr  ") },
 };
 
 

src/base/crypto/Coin.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -39,7 +39,6 @@ public:
         KEVA,
         RAVEN,
         WOWNERO,
-        ZEPHYR,
         MAX
     };
 
@@ -83,7 +82,7 @@ private:
 };
 
 
-} /* namespace xmrig */
+} // namespace xmrig
 
 
-#endif /* XMRIG_COIN_H */
+#endif // XMRIG_COIN_H

src/base/crypto/keccak.cpp

@@ -1,13 +1,7 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik               <jgarzik@pobox.com>
- * Copyright 2011      Markku-Juhani O. Saarinen <mjos@iki.fi>
- * Copyright 2012-2014 pooler                    <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones               <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466                  <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee                 <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak                  <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2020 SChernykh                 <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig                     <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2011      Markku-Juhani O. Saarinen <mjos@iki.fi>
+ * Copyright (c) 2018-2021 SChernykh                 <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig                     <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -23,7 +17,6 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <memory.h>
 
 

src/base/crypto/keccak.h

@@ -1,13 +1,7 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik               <jgarzik@pobox.com>
- * Copyright 2011      Markku-Juhani O. Saarinen <mjos@iki.fi>
- * Copyright 2012-2014 pooler                    <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones               <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466                  <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee                 <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak                  <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2020 SChernykh                 <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig                     <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2011      Markku-Juhani O. Saarinen <mjos@iki.fi>
+ * Copyright (c) 2018-2021 SChernykh                 <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig                     <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/base/io/Async.cpp

@@ -1,8 +1,8 @@
 /* XMRig
  * Copyright (c) 2015-2020 libuv project contributors.
  * Copyright (c) 2020      cohcho      <https://github.com/cohcho>
- * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/base/io/Async.h

@@ -1,8 +1,8 @@
 /* XMRig
  * Copyright (c) 2015-2020 libuv project contributors.
  * Copyright (c) 2020      cohcho      <https://github.com/cohcho>
- * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/base/io/Console.cpp

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -14,16 +14,98 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+  * Additional permission under GNU GPL version 3 section 7
+  *
+  * If you modify this Program, or any covered work, by linking or combining
+  * it with OpenSSL (or a modified version of that library), containing parts
+  * covered by the terms of OpenSSL License and SSLeay License, the licensors
+  * of this Program grant you additional permission to convey the resulting work.
  */
 
 #include "base/io/Console.h"
+#include "base/io/log/Log.h"
+#include "base/io/Signals.h"
 #include "base/kernel/interfaces/IConsoleListener.h"
+#include "base/kernel/private/Title.h"
+#include "base/kernel/Process.h"
+#include "base/tools/Cvt.h"
 #include "base/tools/Handle.h"
 
 
-xmrig::Console::Console(IConsoleListener *listener)
-    : m_listener(listener)
+#ifdef XMRIG_FEATURE_EVENTS
+#   include "base/kernel/Events.h"
+#   include "base/kernel/events/ConsoleEvent.h"
+#endif
+
+
+namespace xmrig {
+
+
+class Console::Private : public IConsoleListener
 {
+public:
+    XMRIG_DISABLE_COPY_MOVE(Private)
+
+    Private();
+    ~Private() override;
+
+#   ifdef XMRIG_OS_WIN
+    std::wstring title;
+#   endif
+
+    IConsoleListener *listener = nullptr;
+
+protected:
+    void onConsoleCommand(char command) override;
+
+private:
+    static bool isSupported();
+
+    static void onAllocBuffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf);
+    static void onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf);
+
+    char m_buf[1] = { 0 };
+    uv_tty_t *m_tty = nullptr;
+};
+
+
+} // namespace xmrig
+
+
+xmrig::Console::Console() :
+    d(std::make_shared<Private>())
+{
+    d->listener = d.get();
+}
+
+
+xmrig::Console::Console(IConsoleListener *listener) :
+    d(std::make_shared<Private>())
+{
+    d->listener = listener;
+}
+
+
+#ifdef XMRIG_OS_WIN
+void xmrig::Console::setTitle(const Title &title) const
+{
+    SetConsoleTitleW(title.isEnabled() ? Cvt::toUtf16(title.value()).c_str() : d->title.c_str());
+}
+#endif
+
+
+xmrig::Console::Private::Private()
+{
+#   ifdef XMRIG_OS_WIN
+    {
+        constexpr size_t kMaxTitleLength = 8192;
+
+        wchar_t title_w[kMaxTitleLength]{};
+        title = { title_w, GetConsoleTitleW(title_w, kMaxTitleLength) };
+    }
+#   endif
+
     if (!isSupported()) {
         return;
     }
@@ -37,11 +119,11 @@ xmrig::Console::Console(IConsoleListener *listener)
     }
 
     uv_tty_set_mode(m_tty, UV_TTY_MODE_RAW);
-    uv_read_start(reinterpret_cast<uv_stream_t*>(m_tty), Console::onAllocBuffer, Console::onRead);
+    uv_read_start(reinterpret_cast<uv_stream_t*>(m_tty), onAllocBuffer, onRead);
 }
 
 
-xmrig::Console::~Console()
+xmrig::Console::Private::~Private()
 {
     uv_tty_reset_mode();
 
@@ -49,28 +131,45 @@ xmrig::Console::~Console()
 }
 
 
-bool xmrig::Console::isSupported()
+void xmrig::Console::Private::onConsoleCommand(char command)
+{
+#   ifdef XMRIG_FEATURE_EVENTS
+    if (command == 3) {
+        LOG_WARN("%s " YELLOW_BOLD("Ctrl+C ") YELLOW("received, exiting"), Signals::tag());
+
+        Process::exit(0);
+    }
+    else {
+        Process::events().send<ConsoleEvent>(command);
+    }
+#   else
+    assert(!command);
+#   endif            
+}
+
+
+bool xmrig::Console::Private::isSupported()
 {
     const uv_handle_type type = uv_guess_handle(0);
     return type == UV_TTY || type == UV_NAMED_PIPE;
 }
 
 
-void xmrig::Console::onAllocBuffer(uv_handle_t *handle, size_t, uv_buf_t *buf)
+void xmrig::Console::Private::onAllocBuffer(uv_handle_t *handle, size_t, uv_buf_t *buf)
 {
-    auto console = static_cast<Console*>(handle->data);
+    auto console = static_cast<Private *>(handle->data);
     buf->len  = 1;
     buf->base = console->m_buf;
 }
 
 
-void xmrig::Console::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf)
+void xmrig::Console::Private::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf)
 {
     if (nread < 0) {
         return uv_close(reinterpret_cast<uv_handle_t*>(stream), nullptr);
     }
 
     if (nread == 1) {
-        static_cast<Console*>(stream->data)->m_listener->onConsoleCommand(buf->base[0]);
+        static_cast<Private *>(stream->data)->listener->onConsoleCommand(*buf->base);
     }
 }

src/base/io/Console.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -14,6 +14,13 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+  * Additional permission under GNU GPL version 3 section 7
+  *
+  * If you modify this Program, or any covered work, by linking or combining
+  * it with OpenSSL (or a modified version of that library), containing parts
+  * covered by the terms of OpenSSL License and SSLeay License, the licensors
+  * of this Program grant you additional permission to convey the resulting work.
  */
 
 #ifndef XMRIG_CONSOLE_H
@@ -23,45 +30,32 @@
 #include "base/tools/Object.h"
 
 
-using uv_buf_t      = struct uv_buf_t;
-using uv_handle_t   = struct uv_handle_s;
-using uv_stream_t   = struct uv_stream_s;
-using uv_tty_t      = struct uv_tty_s;
-
-#ifdef XMRIG_OS_WIN
-using ssize_t = intptr_t;
-#else
-#   include <sys/types.h>
-#endif
-
-
 namespace xmrig {
 
 
+class Title;
 class IConsoleListener;
 
 
 class Console
 {
 public:
-    XMRIG_DISABLE_COPY_MOVE_DEFAULT(Console)
+    XMRIG_DISABLE_COPY_MOVE(Console)
 
-    Console(IConsoleListener *listener);
-    ~Console();
+    Console();
+    explicit Console(IConsoleListener *listener);
+    ~Console() = default;
+
+#   ifdef XMRIG_OS_WIN
+    void setTitle(const Title &title) const;
+#   endif
 
 private:
-    static bool isSupported();
-
-    static void onAllocBuffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf);
-    static void onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf);
-
-    char m_buf[1] = { 0 };
-    IConsoleListener *m_listener;
-    uv_tty_t *m_tty = nullptr;
+    XMRIG_DECL_PRIVATE()
 };
 
 
-} /* namespace xmrig */
+} // namespace xmrig
 
 
-#endif /* XMRIG_CONSOLE_H */
+#endif // XMRIG_CONSOLE_H

src/base/io/Env.cpp

@@ -17,29 +17,15 @@
  */
 
 #include "base/io/Env.h"
+#include "base/kernel/OS.h"
 #include "base/kernel/Process.h"
 #include "version.h"
 
 
 #include <regex>
-#include <uv.h>
 #include <map>
 
 
-#ifndef _WIN32
-#   include <unistd.h>
-#endif
-
-
-#ifndef UV_MAXHOSTNAMESIZE
-#   ifdef MAXHOSTNAMELEN
-#       define UV_MAXHOSTNAMESIZE (MAXHOSTNAMELEN + 1)
-#   else
-#       define UV_MAXHOSTNAMESIZE 256
-#   endif
-#endif
-
-
 namespace xmrig {
 
 
@@ -51,17 +37,17 @@ static void createVariables()
 {
     variables.insert({ "XMRIG_VERSION",  APP_VERSION });
     variables.insert({ "XMRIG_KIND",     APP_KIND });
-    variables.insert({ "XMRIG_HOSTNAME", Env::hostname() });
-    variables.insert({ "XMRIG_EXE",      Process::exepath() });
-    variables.insert({ "XMRIG_EXE_DIR",  Process::location(Process::ExeLocation) });
-    variables.insert({ "XMRIG_CWD",      Process::location(Process::CwdLocation) });
-    variables.insert({ "XMRIG_HOME_DIR", Process::location(Process::HomeLocation) });
-    variables.insert({ "XMRIG_TEMP_DIR", Process::location(Process::TempLocation) });
-    variables.insert({ "XMRIG_DATA_DIR", Process::location(Process::DataLocation) });
+    variables.insert({ "XMRIG_HOSTNAME", OS::hostname() });
+    variables.insert({ "XMRIG_EXE",      Process::locate(Process::ExePathLocation) });
+    variables.insert({ "XMRIG_EXE_DIR",  Process::locate(Process::ExeLocation) });
+    variables.insert({ "XMRIG_CWD",      Process::locate(Process::CwdLocation) });
+    variables.insert({ "XMRIG_HOME_DIR", Process::locate(Process::HomeLocation) });
+    variables.insert({ "XMRIG_TEMP_DIR", Process::locate(Process::TempLocation) });
+    variables.insert({ "XMRIG_DATA_DIR", Process::locate(Process::DataLocation) });
 
     String hostname = "HOSTNAME";
     if (!getenv(hostname)) { // NOLINT(concurrency-mt-unsafe)
-        variables.insert({ std::move(hostname), Env::hostname() });
+        variables.insert({ std::move(hostname), OS::hostname() });
     }
 }
 #endif
@@ -138,15 +124,3 @@ xmrig::String xmrig::Env::get(const String &name, const std::map<String, String>
 
     return static_cast<const char *>(getenv(name)); // NOLINT(concurrency-mt-unsafe)
 }
-
-
-xmrig::String xmrig::Env::hostname()
-{
-    char buf[UV_MAXHOSTNAMESIZE]{};
-
-    if (gethostname(buf, sizeof(buf)) == 0) {
-        return static_cast<const char *>(buf);
-    }
-
-    return {};
-}

src/base/io/Env.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -34,7 +34,6 @@ class Env
 public:
     static String expand(const char *in, const std::map<String, String> &extra = {});
     static String get(const String &name, const std::map<String, String> &extra = {});
-    static String hostname();
 };
 
 

src/base/io/Signals.cpp

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -14,25 +14,113 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+  * Additional permission under GNU GPL version 3 section 7
+  *
+  * If you modify this Program, or any covered work, by linking or combining
+  * it with OpenSSL (or a modified version of that library), containing parts
+  * covered by the terms of OpenSSL License and SSLeay License, the licensors
+  * of this Program grant you additional permission to convey the resulting work.
  */
 
-
-#include "base/kernel/interfaces/ISignalListener.h"
-#include "base/io/log/Log.h"
-#include "base/io/log/Tags.h"
 #include "base/io/Signals.h"
+#include "base/io/log/Log.h"
+#include "base/kernel/interfaces/ISignalListener.h"
+#include "base/kernel/Process.h"
 #include "base/tools/Handle.h"
 
 
-#ifdef SIGUSR1
-static const int signums[xmrig::Signals::kSignalsCount] = { SIGHUP, SIGINT, SIGTERM, SIGUSR1 };
-#else
-static const int signums[xmrig::Signals::kSignalsCount] = { SIGHUP, SIGINT, SIGTERM };
+#ifdef XMRIG_FEATURE_EVENTS
+#   include "base/kernel/Events.h"
+#   include "base/kernel/events/SignalEvent.h"
 #endif
 
 
-xmrig::Signals::Signals(ISignalListener *listener)
-    : m_listener(listener)
+#include <csignal>
+
+
+namespace xmrig {
+
+
+#ifdef SIGUSR1
+constexpr static const size_t kSignalsCount = 4;
+constexpr static const int signums[kSignalsCount] = { SIGHUP, SIGINT, SIGTERM, SIGUSR1 };
+#else
+constexpr static const size_t kSignalsCount = 3;
+constexpr static const int signums[kSignalsCount] = { SIGHUP, SIGINT, SIGTERM };
+#endif
+
+
+#ifdef XMRIG_FEATURE_EVENTS
+static const char *signame(int signum)
+{
+    switch (signum) {
+    case SIGHUP:
+        return "SIGHUP";
+
+    case SIGINT:
+        return "SIGINT";
+
+    case SIGTERM:
+        return "SIGTERM";
+
+    default:
+        break;
+    }
+
+    return nullptr;
+}
+#endif
+
+
+class Signals::Private : public ISignalListener
+{
+public:
+    XMRIG_DISABLE_COPY_MOVE(Private)
+
+    Private();
+    ~Private() override;
+
+    ISignalListener *listener = nullptr;
+
+protected:
+    void onSignal(int signum) override;
+
+private:
+    static void onSignal(uv_signal_t *handle, int signum);
+
+
+
+    uv_signal_t *signals[kSignalsCount]{};
+};
+
+
+} // namespace xmrig
+
+
+xmrig::Signals::Signals() :
+    d(std::make_shared<Private>())
+{
+    d->listener = d.get();
+}
+
+
+xmrig::Signals::Signals(ISignalListener *listener) :
+    d(std::make_shared<Private>())
+{
+    d->listener = listener;
+}
+
+
+const char *xmrig::Signals::tag()
+{
+    static const char *tag = YELLOW_BG_BOLD(WHITE_BOLD_S " signal  ");
+
+    return tag;
+}
+
+
+xmrig::Signals::Private::Private()
 {
 #   ifndef XMRIG_OS_WIN
     signal(SIGPIPE, SIG_IGN);
@@ -42,47 +130,44 @@ xmrig::Signals::Signals(ISignalListener *listener)
         auto signal  = new uv_signal_t;
         signal->data = this;
 
-        m_signals[i] = signal;
+        signals[i] = signal;
 
         uv_signal_init(uv_default_loop(), signal);
-        uv_signal_start(signal, Signals::onSignal, signums[i]);
+        uv_signal_start(signal, onSignal, signums[i]);
     }
 }
 
 
-xmrig::Signals::~Signals()
+xmrig::Signals::Private::~Private()
 {
-    for (auto signal : m_signals) {
+    for (auto signal : signals) {
         Handle::close(signal);
     }
 }
 
 
-void xmrig::Signals::onSignal(uv_signal_t *handle, int signum)
+void xmrig::Signals::Private::onSignal(int signum)
 {
+#   ifdef XMRIG_FEATURE_EVENTS
+    Process::events().send<SignalEvent>(signum);
+
     switch (signum)
     {
     case SIGHUP:
-        LOG_WARN("%s " YELLOW("SIGHUP received, exiting"), Tags::signal());
-        break;
-
     case SIGTERM:
-        LOG_WARN("%s " YELLOW("SIGTERM received, exiting"), Tags::signal());
-        break;
-
     case SIGINT:
-        LOG_WARN("%s " YELLOW("SIGINT received, exiting"), Tags::signal());
+        LOG_WARN("%s " YELLOW_BOLD("%s ") YELLOW("received, exiting"), tag(), signame(signum));
+        Process::exit(128 + signum);
         break;
 
-#   ifdef SIGUSR1
-    case SIGUSR1:
-        LOG_V5("%s " WHITE_BOLD("SIGUSR1 received"), Tags::signal());
-        break;
-#   endif
-
     default:
         break;
     }
-
-    static_cast<Signals *>(handle->data)->m_listener->onSignal(signum);
+#   endif
+}
+
+
+void xmrig::Signals::Private::onSignal(uv_signal_t *handle, int signum)
+{
+    static_cast<Private *>(handle->data)->listener->onSignal(signum);
 }

src/base/io/Signals.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -14,6 +14,13 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+  * Additional permission under GNU GPL version 3 section 7
+  *
+  * If you modify this Program, or any covered work, by linking or combining
+  * it with OpenSSL (or a modified version of that library), containing parts
+  * covered by the terms of OpenSSL License and SSLeay License, the licensors
+  * of this Program grant you additional permission to convey the resulting work.
  */
 
 #ifndef XMRIG_SIGNALS_H
@@ -23,13 +30,6 @@
 #include "base/tools/Object.h"
 
 
-#include <csignal>
-#include <cstddef>
-
-
-using uv_signal_t = struct uv_signal_s;
-
-
 namespace xmrig {
 
 
@@ -39,28 +39,20 @@ class ISignalListener;
 class Signals
 {
 public:
-    XMRIG_DISABLE_COPY_MOVE_DEFAULT(Signals)
+    XMRIG_DISABLE_COPY_MOVE(Signals)
 
-#   ifdef SIGUSR1
-    constexpr static const size_t kSignalsCount = 4;
-#   else
-    constexpr static const size_t kSignalsCount = 3;
-#   endif
+    Signals();
+    explicit Signals(ISignalListener *listener);
+    ~Signals() = default;
 
-    Signals(ISignalListener *listener);
-    ~Signals();
+    static const char *tag();
 
 private:
-    void close(int signum);
-
-    static void onSignal(uv_signal_t *handle, int signum);
-
-    ISignalListener *m_listener;
-    uv_signal_t *m_signals[kSignalsCount]{};
+    XMRIG_DECL_PRIVATE()
 };
 
 
-} /* namespace xmrig */
+} // namespace xmrig
 
 
-#endif /* XMRIG_SIGNALS_H */
+#endif // XMRIG_SIGNALS_H

src/base/io/Watcher.cpp

@@ -1,12 +1,6 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -20,37 +14,45 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+  * Additional permission under GNU GPL version 3 section 7
+  *
+  * If you modify this Program, or any covered work, by linking or combining
+  * it with OpenSSL (or a modified version of that library), containing parts
+  * covered by the terms of OpenSSL License and SSLeay License, the licensors
+  * of this Program grant you additional permission to convey the resulting work.
  */
 
-
-#include <uv.h>
-
-
-#include "base/kernel/interfaces/IWatcherListener.h"
 #include "base/io/Watcher.h"
+#include "base/kernel/interfaces/IWatcherListener.h"
 #include "base/tools/Handle.h"
 #include "base/tools/Timer.h"
 
 
 xmrig::Watcher::Watcher(const String &path, IWatcherListener *listener) :
-    m_listener(listener),
-    m_path(path)
+    m_path(path),
+    m_listener(listener)
 {
-    m_timer = new Timer(this);
+    m_timer = std::make_shared<Timer>(this);
 
-    m_fsEvent = new uv_fs_event_t;
-    m_fsEvent->data = this;
-    uv_fs_event_init(uv_default_loop(), m_fsEvent);
-
-    start();
+    startTimer();
 }
 
 
 xmrig::Watcher::~Watcher()
 {
-    delete m_timer;
+    Handle::close(m_event);
+}
 
-    Handle::close(m_fsEvent);
+
+void xmrig::Watcher::onTimer(const Timer * /*timer*/)
+{
+    if (m_event) {
+        reload();
+    }
+    else {
+        start();
+    }
 }
 
 
@@ -60,14 +62,7 @@ void xmrig::Watcher::onFsEvent(uv_fs_event_t *handle, const char *filename, int,
         return;
     }
 
-    static_cast<Watcher *>(handle->data)->queueUpdate();
-}
-
-
-void xmrig::Watcher::queueUpdate()
-{
-    m_timer->stop();
-    m_timer->start(kDelay, 0);
+    static_cast<Watcher *>(handle->data)->startTimer();
 }
 
 
@@ -75,8 +70,8 @@ void xmrig::Watcher::reload()
 {
     m_listener->onFileChanged(m_path);
 
-#   ifndef _WIN32
-    uv_fs_event_stop(m_fsEvent);
+#   ifndef XMRIG_OS_WIN
+    stop();
     start();
 #   endif
 }
@@ -84,5 +79,23 @@ void xmrig::Watcher::reload()
 
 void xmrig::Watcher::start()
 {
-    uv_fs_event_start(m_fsEvent, xmrig::Watcher::onFsEvent, m_path, 0);
+    if (!m_event) {
+        m_event = new uv_fs_event_t;
+        m_event->data = this;
+        uv_fs_event_init(uv_default_loop(), m_event);
+    }
+
+    uv_fs_event_start(m_event, onFsEvent, m_path, 0);
+}
+
+
+void xmrig::Watcher::startTimer()
+{
+    m_timer->singleShot(kDelay);
+}
+
+
+void xmrig::Watcher::stop()
+{
+    uv_fs_event_stop(m_event);
 }

src/base/io/Watcher.h

@@ -1,12 +1,6 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -20,6 +14,13 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+  * Additional permission under GNU GPL version 3 section 7
+  *
+  * If you modify this Program, or any covered work, by linking or combining
+  * it with OpenSSL (or a modified version of that library), containing parts
+  * covered by the terms of OpenSSL License and SSLeay License, the licensors
+  * of this Program grant you additional permission to convey the resulting work.
  */
 
 #ifndef XMRIG_WATCHER_H
@@ -30,7 +31,10 @@
 #include "base/tools/String.h"
 
 
-typedef struct uv_fs_event_s uv_fs_event_t;
+#include <memory>
+
+
+using uv_fs_event_t = struct uv_fs_event_s;
 
 
 namespace xmrig {
@@ -43,29 +47,32 @@ class Timer;
 class Watcher : public ITimerListener
 {
 public:
+    XMRIG_DISABLE_COPY_MOVE_DEFAULT(Watcher)
+
     Watcher(const String &path, IWatcherListener *listener);
     ~Watcher() override;
 
 protected:
-    inline void onTimer(const Timer *) override { reload(); }
+    void onTimer(const Timer *timer) override;
 
 private:
     constexpr static int kDelay = 500;
 
     static void onFsEvent(uv_fs_event_t *handle, const char *filename, int events, int status);
 
-    void queueUpdate();
     void reload();
     void start();
+    void startTimer();
+    void stop();
 
+    const String m_path;
     IWatcherListener *m_listener;
-    String m_path;
-    Timer *m_timer;
-    uv_fs_event_t *m_fsEvent;
+    std::shared_ptr<Timer> m_timer;
+    uv_fs_event_t *m_event  = nullptr;
 };
 
 
-} /* namespace xmrig */
+} // namespace xmrig
 
 
-#endif /* XMRIG_WATCHER_H */
+#endif // XMRIG_WATCHER_H

src/base/io/json/Json_win.cpp

@@ -34,37 +34,21 @@
 #include "3rdparty/rapidjson/istreamwrapper.h"
 #include "3rdparty/rapidjson/ostreamwrapper.h"
 #include "3rdparty/rapidjson/prettywriter.h"
+#include "base/tools/Cvt.h"
 
 
 namespace xmrig {
 
 
-#if defined(_MSC_VER) || defined (__GNUC__)
-static std::wstring toUtf16(const char *str)
-{
-    const int size = static_cast<int>(strlen(str));
-    std::wstring ret;
-
-    int len = MultiByteToWideChar(CP_UTF8, 0, str, size, nullptr, 0);
-    if (len > 0) {
-        ret.resize(static_cast<size_t>(len));
-        MultiByteToWideChar(CP_UTF8, 0, str, size, &ret[0], len);
-    }
-
-    return ret;
-}
-#endif
-
-
 #if defined(_MSC_VER)
 #   define OPEN_IFS(name)                                                               \
-    std::ifstream ifs(toUtf16(name), std::ios_base::in | std::ios_base::binary);        \
+    std::ifstream ifs(Cvt::toUtf16(name), std::ios_base::in | std::ios_base::binary);        \
     if (!ifs.is_open()) {                                                               \
         return false;                                                                   \
     }
 #elif defined(__GNUC__)
 #   define OPEN_IFS(name)                                                               \
-    const int fd = _wopen(toUtf16(name).c_str(), _O_RDONLY | _O_BINARY);                \
+    const int fd = _wopen(Cvt::toUtf16(name).c_str(), _O_RDONLY | _O_BINARY);                \
     if (fd == -1) {                                                                     \
         return false;                                                                   \
     }                                                                                   \
@@ -99,12 +83,12 @@ bool xmrig::Json::save(const char *fileName, const rapidjson::Document &doc)
     constexpr const std::ios_base::openmode mode = std::ios_base::out | std::ios_base::binary | std::ios_base::trunc;
 
 #   if defined(_MSC_VER)
-    std::ofstream ofs(toUtf16(fileName), mode);
+    std::ofstream ofs(Cvt::toUtf16(fileName), mode);
     if (!ofs.is_open()) {
         return false;
     }
 #   elif defined(__GNUC__)
-    const int fd = _wopen(toUtf16(fileName).c_str(), _O_WRONLY | _O_BINARY | _O_CREAT | _O_TRUNC, _S_IWRITE);
+    const int fd = _wopen(Cvt::toUtf16(fileName).c_str(), _O_WRONLY | _O_BINARY | _O_CREAT | _O_TRUNC, _S_IWRITE);
     if (fd == -1) {
         return false;
     }

src/base/io/log/FileLogWriter.cpp

@@ -16,7 +16,6 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "base/io/log/FileLogWriter.h"
 #include "base/io/Env.h"
 

src/base/io/log/Log.cpp

@@ -1,7 +1,7 @@
 /* XMRig
  * Copyright (c) 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -15,9 +15,16 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+  * Additional permission under GNU GPL version 3 section 7
+  *
+  * If you modify this Program, or any covered work, by linking or combining
+  * it with OpenSSL (or a modified version of that library), containing parts
+  * covered by the terms of OpenSSL License and SSLeay License, the licensors
+  * of this Program grant you additional permission to convey the resulting work.
  */
 
-#ifdef WIN32
+#ifdef XMRIG_OS_WIN
 #   include <winsock2.h>
 #   include <windows.h>
 #endif
@@ -25,40 +32,149 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdarg>
 #include <cstring>
 #include <ctime>
 #include <mutex>
-#include <string>
-#include <uv.h>
 #include <vector>
 
 
 #include "base/io/log/Log.h"
-#include "base/kernel/interfaces/ILogBackend.h"
 #include "base/tools/Chrono.h"
-#include "base/tools/Object.h"
+
+
+#ifdef XMRIG_FEATURE_EVENTS
+#   include "base/kernel/Events.h"
+#   include "base/kernel/events/LogEvent.h"
+#   include "base/kernel/private/LogConfig.h"
+#   include "base/kernel/Process.h"
+#else
+#   include "base/kernel/interfaces/ILogBackend.h"
+#endif
 
 
 namespace xmrig {
 
 
+bool Log::m_background      = false;
+bool Log::m_colors          = true;
+LogPrivate *Log::d          = nullptr;
+uint32_t Log::m_verbose     = 0;
+
+
+static char buf[Log::kMaxBufferSize]{};
+static std::mutex mutex;
+
+
 static const char *colors_map[] = {
-    RED_BOLD_S,    // EMERG
-    RED_BOLD_S,    // ALERT
-    RED_BOLD_S,    // CRIT
-    RED_S,         // ERR
-    YELLOW_S,      // WARNING
-    WHITE_BOLD_S,  // NOTICE
-    nullptr,       // INFO
-#   ifdef WIN32
-    BLACK_BOLD_S   // DEBUG
+    RED_BOLD_S      "E ", // EMERG
+    RED_BOLD_S      "A ", // ALERT
+    RED_BOLD_S      "C ", // CRIT
+    RED_S           "E ", // ERR
+    YELLOW_S        "W ", // WARNING
+    WHITE_BOLD_S    "N ", // NOTICE
+                    "I ", // INFO
+                    "1 ", // V1
+                    "2 ", // V2
+                    "3 ", // V3
+                    "4 ", // V4
+#   ifdef XMRIG_OS_WIN
+    BLACK_BOLD_S    "5 ", // V5
+    BLACK_BOLD_S    "D "  // DEBUG
 #   else
-    BRIGHT_BLACK_S // DEBUG
+    BRIGHT_BLACK_S  "5 ", // V5
+    BRIGHT_BLACK_S  "D "  // DEBUG
 #   endif
 };
 
 
+static void log_endl(size_t &size)
+{
+#   ifdef XMRIG_OS_WIN
+    memcpy(buf + size, CLEAR "\r\n", 7);
+    size += 6;
+#   else
+    memcpy(buf + size, CLEAR "\n", 6);
+    size += 5;
+#   endif
+}
 
+
+static void log_color(Log::Level level, size_t &size)
+{
+    if (level == Log::NONE) {
+        return;
+    }
+
+    const char *color = colors_map[level];
+    if (color == nullptr) {
+        return;
+    }
+
+    const size_t s = strlen(color);
+    memcpy(buf + size, color, s); // NOLINT(bugprone-not-null-terminated-result)
+
+    size += s;
+}
+
+
+static uint64_t log_timestamp(Log::Level level, size_t &size, size_t &offset)
+{
+    const uint64_t ms = Chrono::currentMSecsSinceEpoch();
+
+    if (level == Log::NONE) {
+        return ms;
+    }
+
+    time_t now = ms / 1000;
+    tm stime{};
+
+#   ifdef XMRIG_OS_WIN
+    localtime_s(&stime, &now);
+#   else
+    localtime_r(&now, &stime);
+#   endif
+
+    const int rc = snprintf(buf, sizeof(buf) - 1, "[%d-%02d-%02d %02d:%02d:%02d" BLACK_BOLD(".%03d") "] ",
+                            stime.tm_year + 1900,
+                            stime.tm_mon + 1,
+                            stime.tm_mday,
+                            stime.tm_hour,
+                            stime.tm_min,
+                            stime.tm_sec,
+                            static_cast<int>(ms % 1000)
+                            );
+
+    if (rc > 0) {
+        size = offset = static_cast<size_t>(rc);
+    }
+
+    return ms;
+}
+
+
+#ifdef XMRIG_FEATURE_EVENTS
+static void log_print(Log::Level level, const char *fmt, va_list args)
+{
+    size_t size   = 0;
+    size_t offset = 0;
+
+    std::lock_guard<std::mutex> lock(mutex);
+
+    const uint64_t ts = log_timestamp(level, size, offset);
+    log_color(level, size);
+
+    const int rc = vsnprintf(buf + size, sizeof(buf) - offset - 32, fmt, args);
+    if (rc < 0) {
+        return;
+    }
+
+    size += std::min(static_cast<size_t>(rc), sizeof(buf) - offset - 32);
+    log_endl(size);
+
+    Process::events().post<LogEvent>(ts, level, buf, offset, size);
+}
+#else
 class LogPrivate
 {
 public:
@@ -70,46 +186,43 @@ public:
 
     inline ~LogPrivate()
     {
-        for (auto backend : m_backends) {
+        for (auto backend : backends) {
             delete backend;
         }
     }
 
 
-    inline void add(ILogBackend *backend) { m_backends.push_back(backend); }
-
-
     void print(Log::Level level, const char *fmt, va_list args)
     {
         size_t size   = 0;
         size_t offset = 0;
 
-        std::lock_guard<std::mutex> lock(m_mutex);
+        std::lock_guard<std::mutex> lock(mutex);
 
-        if (Log::isBackground() && m_backends.empty()) {
+        if (Log::isBackground() && backends.empty()) {
             return;
         }
 
-        const uint64_t ts = timestamp(level, size, offset);
-        color(level, size);
+        const uint64_t ts = log_timestamp(level, size, offset);
+        log_color(level, size);
 
-        const int rc = vsnprintf(m_buf + size, sizeof (m_buf) - offset - 32, fmt, args);
+        const int rc = vsnprintf(buf + size, sizeof (buf) - offset - 32, fmt, args);
         if (rc < 0) {
             return;
         }
 
-        size += std::min(static_cast<size_t>(rc), sizeof (m_buf) - offset - 32);
-        endl(size);
+        size += std::min(static_cast<size_t>(rc), sizeof (buf) - offset - 32);
+        log_endl(size);
 
-        std::string txt(m_buf);
+        std::string txt(buf);
         size_t i = 0;
         while ((i = txt.find(CSI)) != std::string::npos) {
             txt.erase(i, txt.find('m', i) - i + 1);
         }
 
-        if (!m_backends.empty()) {
-            for (auto backend : m_backends) {
-                backend->print(ts, level, m_buf, offset, size, true);
+        if (!backends.empty()) {
+            for (auto backend : backends) {
+                backend->print(ts, level, buf, offset, size, true);
                 backend->print(ts, level, txt.c_str(), offset ? (offset - 11) : 0, txt.size(), false);
             }
         }
@@ -120,94 +233,21 @@ public:
     }
 
 
-private:
-    inline uint64_t timestamp(Log::Level level, size_t &size, size_t &offset)
-    {
-        const uint64_t ms = Chrono::currentMSecsSinceEpoch();
-
-        if (level == Log::NONE) {
-            return ms;
-        }
-
-        time_t now = ms / 1000;
-        tm stime{};
-
-#       ifdef _WIN32
-        localtime_s(&stime, &now);
-#       else
-        localtime_r(&now, &stime);
-#       endif
-
-        const int rc = snprintf(m_buf, sizeof(m_buf) - 1, "[%d-%02d-%02d %02d:%02d:%02d" BLACK_BOLD(".%03d") "] ",
-                                stime.tm_year + 1900,
-                                stime.tm_mon + 1,
-                                stime.tm_mday,
-                                stime.tm_hour,
-                                stime.tm_min,
-                                stime.tm_sec,
-                                static_cast<int>(ms % 1000)
-                                );
-
-        if (rc > 0) {
-            size = offset = static_cast<size_t>(rc);
-        }
-
-        return ms;
-    }
-
-
-    inline void color(Log::Level level, size_t &size)
-    {
-        if (level == Log::NONE) {
-            return;
-        }
-
-        const char *color = colors_map[level];
-        if (color == nullptr) {
-            return;
-        }
-
-        const size_t s = strlen(color);
-        memcpy(m_buf + size, color, s);
-
-        size += s;
-    }
-
-
-    inline void endl(size_t &size)
-    {
-#       ifdef _WIN32
-        memcpy(m_buf + size, CLEAR "\r\n", 7);
-        size += 6;
-#       else
-        memcpy(m_buf + size, CLEAR "\n", 6);
-        size += 5;
-#       endif
-    }
-
-
-    char m_buf[Log::kMaxBufferSize]{};
-    std::mutex m_mutex;
-    std::vector<ILogBackend*> m_backends;
+    std::vector<ILogBackend*> backends;
 };
+#endif
 
 
-bool Log::m_background      = false;
-bool Log::m_colors          = true;
-LogPrivate *Log::d          = nullptr;
-uint32_t Log::m_verbose     = 0;
-
-
-} /* namespace xmrig */
-
+} // namespace xmrig
 
 
+#ifndef XMRIG_FEATURE_EVENTS
 void xmrig::Log::add(ILogBackend *backend)
 {
     assert(d != nullptr);
 
     if (d) {
-        d->add(backend);
+        d->backends.push_back(backend);
     }
 }
 
@@ -223,18 +263,25 @@ void xmrig::Log::init()
 {
     d = new LogPrivate();
 }
+#endif
 
 
 void xmrig::Log::print(const char *fmt, ...)
 {
+#   ifndef XMRIG_FEATURE_EVENTS
     if (!d) {
         return;
     }
+#   endif
 
     va_list args{};
     va_start(args, fmt);
 
+#   ifdef XMRIG_FEATURE_EVENTS
+    log_print(NONE, fmt, args);
+#   else
     d->print(NONE, fmt, args);
+#   endif
 
     va_end(args);
 }
@@ -242,14 +289,33 @@ void xmrig::Log::print(const char *fmt, ...)
 
 void xmrig::Log::print(Level level, const char *fmt, ...)
 {
+#   ifndef XMRIG_FEATURE_EVENTS
     if (!d) {
         return;
     }
+#   endif
 
     va_list args{};
     va_start(args, fmt);
 
+#   ifdef XMRIG_FEATURE_EVENTS
+    log_print(level, fmt, args);
+#   else
     d->print(level, fmt, args);
+#   endif
 
     va_end(args);
 }
+
+
+void xmrig::Log::setVerbose(uint32_t verbose)
+{
+    static constexpr uint32_t kMaxVerbose =
+#   ifdef XMRIG_FEATURE_EVENTS
+    LogConfig::kMaxVerbose;
+#   else
+    5U;
+#   endif
+
+    m_verbose = std::min(verbose, kMaxVerbose);
+}

src/base/io/log/Log.h

@@ -1,7 +1,7 @@
 /* XMRig
  * Copyright (c) 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -15,6 +15,13 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+  * Additional permission under GNU GPL version 3 section 7
+  *
+  * If you modify this Program, or any covered work, by linking or combining
+  * it with OpenSSL (or a modified version of that library), containing parts
+  * covered by the terms of OpenSSL License and SSLeay License, the licensors
+  * of this Program grant you additional permission to convey the resulting work.
  */
 
 #ifndef XMRIG_LOG_H
@@ -44,16 +51,25 @@ public:
         WARNING, // warning conditions
         NOTICE,  // normal but significant condition
         INFO,    // informational
+        V1,      // Verbose
+        V2,      // Verbose
+        V3,      // Verbose
+        V4,      // Verbose
+        V5,      // Verbose
         DEBUG,   // debug-level messages
     };
 
     constexpr static size_t kMaxBufferSize = 16384;
 
+#   ifndef XMRIG_FEATURE_EVENTS
     static void add(ILogBackend *backend);
     static void destroy();
     static void init();
+#   endif
+
     static void print(const char *fmt, ...);
     static void print(Level level, const char *fmt, ...);
+    static void setVerbose(uint32_t verbose);
 
     static inline bool isBackground()                   { return m_background; }
     static inline bool isColors()                       { return m_colors; }
@@ -61,7 +77,6 @@ public:
     static inline uint32_t verbose()                    { return m_verbose; }
     static inline void setBackground(bool background)   { m_background = background; }
     static inline void setColors(bool colors)           { m_colors = colors; }
-    static inline void setVerbose(uint32_t verbose)     { m_verbose = verbose; }
 
 private:
     static bool m_background;
@@ -143,12 +158,12 @@ private:
 #define LOG_WARN(x, ...)    xmrig::Log::print(xmrig::Log::WARNING, x, ##__VA_ARGS__)
 #define LOG_NOTICE(x, ...)  xmrig::Log::print(xmrig::Log::NOTICE,  x, ##__VA_ARGS__)
 #define LOG_INFO(x, ...)    xmrig::Log::print(xmrig::Log::INFO,    x, ##__VA_ARGS__)
-#define LOG_VERBOSE(x, ...) if (xmrig::Log::verbose() > 0) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
-#define LOG_V1(x, ...)      if (xmrig::Log::verbose() > 0) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
-#define LOG_V2(x, ...)      if (xmrig::Log::verbose() > 1) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
-#define LOG_V3(x, ...)      if (xmrig::Log::verbose() > 2) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
-#define LOG_V4(x, ...)      if (xmrig::Log::verbose() > 3) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
-#define LOG_V5(x, ...)      if (xmrig::Log::verbose() > 4) { xmrig::Log::print(xmrig::Log::INFO, x, ##__VA_ARGS__); }
+#define LOG_VERBOSE(x, ...) if (xmrig::Log::verbose() > 0) { xmrig::Log::print(xmrig::Log::V1, x, ##__VA_ARGS__); }
+#define LOG_V1(x, ...)      if (xmrig::Log::verbose() > 0) { xmrig::Log::print(xmrig::Log::V1, x, ##__VA_ARGS__); }
+#define LOG_V2(x, ...)      if (xmrig::Log::verbose() > 1) { xmrig::Log::print(xmrig::Log::V2, x, ##__VA_ARGS__); }
+#define LOG_V3(x, ...)      if (xmrig::Log::verbose() > 2) { xmrig::Log::print(xmrig::Log::V3, x, ##__VA_ARGS__); }
+#define LOG_V4(x, ...)      if (xmrig::Log::verbose() > 3) { xmrig::Log::print(xmrig::Log::V4, x, ##__VA_ARGS__); }
+#define LOG_V5(x, ...)      if (xmrig::Log::verbose() > 4) { xmrig::Log::print(xmrig::Log::V5, x, ##__VA_ARGS__); }
 
 #ifdef APP_DEBUG
 #   define LOG_DEBUG(x, ...) xmrig::Log::print(xmrig::Log::DEBUG, x, ##__VA_ARGS__)
@@ -165,7 +180,7 @@ private:
 #endif
 
 
-} /* namespace xmrig */
+} // namespace xmrig
 
 
-#endif /* XMRIG_LOG_H */
+#endif // XMRIG_LOG_H

src/base/io/log/Tags.cpp

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -16,11 +16,27 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "base/io/log/Tags.h"
 #include "base/io/log/Log.h"
 
 
+#ifndef XMRIG_FEATURE_EVENTS
+namespace xmrig {
+
+
+const char *tls_tag()
+{
+    static const char *tag = GREEN_BG_BOLD(WHITE_BOLD_S " tls     ");
+
+    return tag;
+}
+
+
+} // namespace xmrig
+#endif
+
+
+#ifdef XMRIG_LEGACY
 const char *xmrig::Tags::config()
 {
     static const char *tag = CYAN_BG_BOLD(WHITE_BOLD_S " config  ");
@@ -29,6 +45,15 @@ const char *xmrig::Tags::config()
 }
 
 
+const char *xmrig::Tags::signal()
+{
+    static const char *tag = YELLOW_BG_BOLD(WHITE_BOLD_S " signal  ");
+
+    return tag;
+}
+#endif
+
+
 const char *xmrig::Tags::network()
 {
     static const char *tag = BLUE_BG_BOLD(WHITE_BOLD_S " net     ");
@@ -45,14 +70,6 @@ const char* xmrig::Tags::origin()
 }
 
 
-const char *xmrig::Tags::signal()
-{
-    static const char *tag = YELLOW_BG_BOLD(WHITE_BOLD_S " signal  ");
-
-    return tag;
-}
-
-
 #ifdef XMRIG_MINER_PROJECT
 const char *xmrig::Tags::cpu()
 {

src/base/io/log/Tags.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -30,10 +30,13 @@ namespace xmrig {
 class Tags
 {
 public:
+#   ifdef XMRIG_LEGACY
     static const char *config();
+    static const char *signal();
+#   endif
+
     static const char *network();
     static const char *origin();
-    static const char *signal();
 
 #   ifdef XMRIG_MINER_PROJECT
     static const char *cpu();

src/base/io/log/backends/ConsoleLog.cpp

@@ -1,7 +1,7 @@
 /* XMRig
  * Copyright (c) 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -15,47 +15,46 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+  * Additional permission under GNU GPL version 3 section 7
+  *
+  * If you modify this Program, or any covered work, by linking or combining
+  * it with OpenSSL (or a modified version of that library), containing parts
+  * covered by the terms of OpenSSL License and SSLeay License, the licensors
+  * of this Program grant you additional permission to convey the resulting work.
  */
 
 #include "base/io/log/backends/ConsoleLog.h"
 #include "base/io/log/Log.h"
-#include "base/kernel/config/Title.h"
+#include "base/kernel/private/Title.h"
+#include "base/tools/Cvt.h"
 #include "base/tools/Handle.h"
 
 
 #include <cstdio>
 
 
-xmrig::ConsoleLog::ConsoleLog(const Title &title)
+xmrig::ConsoleLog::ConsoleLog()
 {
-    if (!isSupported()) {
-        Log::setColors(false);
+    if (!init()) {
         return;
     }
 
-    m_tty = new uv_tty_t;
-
-    if (uv_tty_init(uv_default_loop(), m_tty, 1, 0) < 0) {
-        Log::setColors(false);
-        return;
-    }
-
-    uv_tty_set_mode(m_tty, UV_TTY_MODE_NORMAL);
-
 #   ifdef XMRIG_OS_WIN
-    m_stream = reinterpret_cast<uv_stream_t*>(m_tty);
+    SetConsoleOutputCP(65001);
+#   endif
+}
 
-    HANDLE handle = GetStdHandle(STD_INPUT_HANDLE);
-    if (handle != INVALID_HANDLE_VALUE) { // NOLINT(cppcoreguidelines-pro-type-cstyle-cast, performance-no-int-to-ptr)
-        DWORD mode = 0;
-        if (GetConsoleMode(handle, &mode)) {
-           mode &= ~ENABLE_QUICK_EDIT_MODE;
-           SetConsoleMode(handle, mode | ENABLE_EXTENDED_FLAGS);
-        }
+
+xmrig::ConsoleLog::ConsoleLog(const Title &title)
+{
+    if (!init()) {
+        return;
     }
 
+#   ifdef XMRIG_OS_WIN
     if (title.isEnabled()) {
-        SetConsoleTitleA(title.value());
+        SetConsoleTitleW(Cvt::toUtf16(title.value().data()).c_str());
     }
 #   endif
 }
@@ -97,6 +96,37 @@ bool xmrig::ConsoleLog::isSupported()
 }
 
 
+bool xmrig::ConsoleLog::init()
+{
+    if (!isSupported()) {
+        return false;
+    }
+
+    m_tty = new uv_tty_t;
+
+    if (uv_tty_init(uv_default_loop(), m_tty, 1, 0) < 0) {
+        return false;
+    }
+
+    uv_tty_set_mode(m_tty, UV_TTY_MODE_NORMAL);
+
+#   ifdef XMRIG_OS_WIN
+    m_stream = reinterpret_cast<uv_stream_t*>(m_tty);
+
+    HANDLE handle = GetStdHandle(STD_INPUT_HANDLE);
+    if (handle != INVALID_HANDLE_VALUE) { // NOLINT(cppcoreguidelines-pro-type-cstyle-cast, performance-no-int-to-ptr)
+        DWORD mode = 0;
+        if (GetConsoleMode(handle, &mode)) {
+           mode &= ~ENABLE_QUICK_EDIT_MODE;
+           SetConsoleMode(handle, mode | ENABLE_EXTENDED_FLAGS);
+        }
+    }
+#   endif
+
+    return true;
+}
+
+
 #ifdef XMRIG_OS_WIN
 bool xmrig::ConsoleLog::isWritable() const
 {

src/base/io/log/backends/ConsoleLog.h

@@ -1,7 +1,7 @@
 /* XMRig
  * Copyright (c) 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2022 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2022 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -15,6 +15,13 @@
  *
  *   You should have received a copy of the GNU General Public License
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+  * Additional permission under GNU GPL version 3 section 7
+  *
+  * If you modify this Program, or any covered work, by linking or combining
+  * it with OpenSSL (or a modified version of that library), containing parts
+  * covered by the terms of OpenSSL License and SSLeay License, the licensors
+  * of this Program grant you additional permission to convey the resulting work.
  */
 
 #ifndef XMRIG_CONSOLELOG_H
@@ -40,6 +47,7 @@ class ConsoleLog : public ILogBackend
 public:
     XMRIG_DISABLE_COPY_MOVE(ConsoleLog)
 
+    ConsoleLog();
     ConsoleLog(const Title &title);
     ~ConsoleLog() override;
 
@@ -49,6 +57,8 @@ protected:
 private:
     static bool isSupported();
 
+    bool init();
+
     uv_tty_t *m_tty = nullptr;
 
 #   ifdef XMRIG_OS_WIN
@@ -59,7 +69,7 @@ private:
 };
 
 
-} /* namespace xmrig */
+} // namespace xmrig
 
 
-#endif /* XMRIG_CONSOLELOG_H */
+#endif // XMRIG_CONSOLELOG_H

src/base/io/log/backends/FileLog.cpp

@@ -1,7 +1,7 @@
 /* XMRig
  * Copyright (c) 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include "base/io/log/backends/FileLog.h"
 
 

src/base/io/log/backends/FileLog.h

@@ -1,7 +1,7 @@
 /* XMRig
  * Copyright (c) 2019      Spudz76     <https://github.com/Spudz76>
- * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by