Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2025-03-23 23:58:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code cleanup.

Browse source
This commit is contained in:
XMRig 2021-01-24 15:02:22 +07:00
parent 5999dccd57
commit 0fa5db8fa3
No known key found for this signature in database
GPG key ID: 446A53638BE94409
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/backend/cpu/platform/HwlocCpuInfo.cpp
View file

@ -400,6 +400,10 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith
void xmrig::HwlocCpuInfo::setThreads(size_t threads) void xmrig::HwlocCpuInfo::setThreads(size_t threads)
{ {
if (!threads) {
return;
}
m_threads = threads; m_threads = threads;
if (m_units.size() != m_threads) { if (m_units.size() != m_threads) {

14
src/hw/msr/Msr_linux.cpp
View file

@ -37,6 +37,14 @@
namespace xmrig { namespace xmrig {
static int msr_open(int32_t cpu, int flags)
{
const auto name = fmt::format("/dev/cpu/{}/msr", cpu < 0 ? Cpu::info()->units().front() : cpu);
return open(name.c_str(), flags);
}
class MsrPrivate class MsrPrivate
{ {
public: public:
@ -85,8 +93,7 @@ bool xmrig::Msr::write(Callback &&callback)
bool xmrig::Msr::rdmsr(uint32_t reg, int32_t cpu, uint64_t &value) const bool xmrig::Msr::rdmsr(uint32_t reg, int32_t cpu, uint64_t &value) const
{ {
const auto name = fmt::format("/dev/cpu/{}/msr", cpu < 0 ? 0 : cpu); const int fd = msr_open(cpu, O_RDONLY);
const int fd = open(name.c_str(), O_RDONLY);
if (fd < 0) { if (fd < 0) {
return false; return false;
@ -101,8 +108,7 @@ bool xmrig::Msr::rdmsr(uint32_t reg, int32_t cpu, uint64_t &value) const
bool xmrig::Msr::wrmsr(uint32_t reg, uint64_t value, int32_t cpu) bool xmrig::Msr::wrmsr(uint32_t reg, uint64_t value, int32_t cpu)
{ {
const auto name = fmt::format("/dev/cpu/{}/msr", cpu < 0 ? 0 : cpu); const int fd = msr_open(cpu, O_WRONLY);
int fd = open(name.c_str(), O_WRONLY);
if (fd < 0) { if (fd < 0) {
return false; return false;