mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-25 05:40:39 -05:00
Code Issues Projects Releases Wiki Activity

Merge 14128cbdb4 into c5d8b8265b

Browse Source
This commit is contained in:
Tony Butler
2024-10-26 12:33:27 +07:00
committed by GitHub
parent c5d8b8265b 14128cbdb4
commit df44ca7133
5 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/crypto/common/VirtualMemory_hwloc.cpp
View File

@@ -34,8 +34,13 @@ uint32_t xmrig::VirtualMemory::bindToNUMANode(int64_t affinity)
auto pu = hwloc_get_pu_obj_by_os_index(Cpu::info()->topology(), static_cast<unsigned>(affinity));
if (pu == nullptr || !Cpu::info()->membind(pu->nodeset)) {
LOG_WARN("CPU #%02" PRId64 " warning: \"can't bind memory\"", affinity);
if (pu == nullptr) {
LOG_WARN("CPU #%02" PRId64 " warning: \"can't bind memory: hwloc_get_pu_obj_by_os_index() failed\"", affinity);
return 0;
}
if (Cpu::info()->membind(pu->nodeset) < 0) {
LOG_WARN("CPU #%02" PRId64 " warning: \"can't bind memory: Cpu::info()->membind() failed\"", affinity);
return 0;
}

26
src/crypto/rx/RxNUMAStorage.cpp
View File

@@ -42,20 +42,20 @@ constexpr size_t oneMiB = 1024 * 1024;
static std::mutex mutex;
static bool bindToNUMANode(uint32_t nodeId)
static int8_t bindToNUMANode(uint32_t nodeId)
{
auto node = hwloc_get_numanode_obj_by_os_index(Cpu::info()->topology(), nodeId);
if (!node) {
return false;
return MEMBIND_FAIL_NODE;
}
if (Cpu::info()->membind(node->nodeset)) {
if (Cpu::info()->membind(node->nodeset) > 0) {
Platform::setThreadAffinity(static_cast<uint64_t>(hwloc_bitmap_first(node->cpuset)));
return true;
return MEMBIND_SUCCESS;
}
return false;
return MEMBIND_FAIL_BIND;
}
@@ -210,10 +210,20 @@ private:
static void allocate(RxNUMAStoragePrivate *d_ptr, uint32_t nodeId, bool hugePages, bool oneGbPages)
{
const uint64_t ts = Chrono::steadyMSecs();
const int8_t br = bindToNUMANode(nodeId);
if (!bindToNUMANode(nodeId)) {
printSkipped(nodeId, "can't bind memory");
if (br < 0) {
switch (br) {
case MEMBIND_FAIL_SUPP:
printSkipped(nodeId, "can't bind memory: hwloc_topology_get_support() failed");
break;
case MEMBIND_FAIL_NODE:
printSkipped(nodeId, "can't bind memory: hwloc_get_numanode_obj_by_os_index() failed");
break;
case MEMBIND_FAIL_BIND:
printSkipped(nodeId, "can't bind memory: Cpu::info()->membind() failed");
break;
}
return;
}