mirror of
https://github.com/xmrig/xmrig.git
synced 2025-12-10 09:02:45 -05:00
Compare commits
3 Commits
v6.20.0
...
8f507b7d09
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8f507b7d09 | ||
|
|
e7de104d88 | ||
|
|
3b5e04b1b7 |
@@ -20,7 +20,7 @@ set(SOURCES_BACKEND_COMMON
|
|||||||
src/backend/common/Workers.cpp
|
src/backend/common/Workers.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
if (WITH_RANDOMX AND WITH_BENCHMARK)
|
if (WITH_BENCHMARK AND (WITH_RANDOMX OR WITH_GHOSTRIDER))
|
||||||
list(APPEND HEADERS_BACKEND_COMMON
|
list(APPEND HEADERS_BACKEND_COMMON
|
||||||
src/backend/common/benchmark/Benchmark.h
|
src/backend/common/benchmark/Benchmark.h
|
||||||
src/backend/common/benchmark/BenchState_test.h
|
src/backend/common/benchmark/BenchState_test.h
|
||||||
|
|||||||
@@ -259,7 +259,7 @@ if (WITH_KAWPOW OR WITH_GHOSTRIDER)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
if (WITH_RANDOMX AND WITH_BENCHMARK)
|
if (WITH_BENCHMARK AND (WITH_RANDOMX OR WITH_GHOSTRIDER))
|
||||||
add_definitions(/DXMRIG_FEATURE_BENCHMARK)
|
add_definitions(/DXMRIG_FEATURE_BENCHMARK)
|
||||||
|
|
||||||
list(APPEND HEADERS_BASE
|
list(APPEND HEADERS_BASE
|
||||||
|
|||||||
@@ -333,8 +333,8 @@ void benchmark()
|
|||||||
|
|
||||||
const CnHash::AlgoVariant* av = Cpu::info()->hasAES() ? av_hw_aes : av_soft_aes;
|
const CnHash::AlgoVariant* av = Cpu::info()->hasAES() ? av_hw_aes : av_soft_aes;
|
||||||
|
|
||||||
uint8_t buf[80];
|
uint8_t buf[80] = { 0 };
|
||||||
uint8_t hash[32 * 8];
|
uint8_t hash[32 * 8] = { 0 };
|
||||||
|
|
||||||
LOG_VERBOSE("%24s | N | Hashrate", "Algorithm");
|
LOG_VERBOSE("%24s | N | Hashrate", "Algorithm");
|
||||||
LOG_VERBOSE("-------------------------|-----|-------------");
|
LOG_VERBOSE("-------------------------|-----|-------------");
|
||||||
@@ -540,10 +540,13 @@ HelperThread* create_helper_thread(int64_t cpu_index, int priority, const std::v
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (hwloc_bitmap_weight(helper_cpu_set) > 0) {
|
if (hwloc_bitmap_weight(helper_cpu_set) > 0) {
|
||||||
|
hwloc_bitmap_free(main_threads_set);
|
||||||
return new HelperThread(helper_cpu_set, priority, is8MB);
|
return new HelperThread(helper_cpu_set, priority, is8MB);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
hwloc_bitmap_free(helper_cpu_set);
|
||||||
|
hwloc_bitmap_free(main_threads_set);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
#define APP_ID "xmrig"
|
#define APP_ID "xmrig"
|
||||||
#define APP_NAME "XMRig"
|
#define APP_NAME "XMRig"
|
||||||
#define APP_DESC "XMRig miner"
|
#define APP_DESC "XMRig miner"
|
||||||
#define APP_VERSION "6.20.0"
|
#define APP_VERSION "6.20.1-dev"
|
||||||
#define APP_DOMAIN "xmrig.com"
|
#define APP_DOMAIN "xmrig.com"
|
||||||
#define APP_SITE "www.xmrig.com"
|
#define APP_SITE "www.xmrig.com"
|
||||||
#define APP_COPYRIGHT "Copyright (C) 2016-2023 xmrig.com"
|
#define APP_COPYRIGHT "Copyright (C) 2016-2023 xmrig.com"
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
#define APP_VER_MAJOR 6
|
#define APP_VER_MAJOR 6
|
||||||
#define APP_VER_MINOR 20
|
#define APP_VER_MINOR 20
|
||||||
#define APP_VER_PATCH 0
|
#define APP_VER_PATCH 1
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
# if (_MSC_VER >= 1930)
|
# if (_MSC_VER >= 1930)
|
||||||
|
|||||||
Reference in New Issue
Block a user