Merge branch 'dev' into evo

This commit is contained in:
XMRig 2019-10-01 07:26:18 +07:00
commit 34468782cd
5 changed files with 35 additions and 25 deletions

View file

@ -177,7 +177,7 @@ xmrig::HwlocCpuInfo::HwlocCpuInfo()
m_threads = countByType(m_topology, HWLOC_OBJ_PU);
m_cores = countByType(m_topology, HWLOC_OBJ_CORE);
m_nodes = std::max<size_t>(countByType(m_topology, HWLOC_OBJ_NUMANODE), 1);
m_nodes = std::max(hwloc_bitmap_weight(hwloc_topology_get_complete_nodeset(m_topology)), 1);
m_packages = countByType(m_topology, HWLOC_OBJ_PACKAGE);
if (m_nodes > 1) {

View file

@ -311,7 +311,7 @@ xmrig::RxDataset *xmrig::Rx::dataset(const Job &job, uint32_t nodeId)
return nullptr;
}
return d_ptr->datasets.at(d_ptr->isNUMA() ? nodeId : 0);
return d_ptr->datasets.at(d_ptr->isNUMA() ? (d_ptr->datasets.count(nodeId) ? nodeId : HwlocCpuInfo::nodeIndexes().front()) : 0);
}