Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2025-02-04 04:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Quick fix, temporary use old style affinity.

Browse source
This commit is contained in:
XMRig 2018-04-03 17:06:03 +07:00
parent dd6bc339bf
commit d4123b8fa6
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/workers/Handle.cpp
View file

@ -25,7 +25,8 @@
#include "workers/Handle.h" #include "workers/Handle.h"
Handle::Handle(xmrig::IThread *config, size_t totalThreads, size_t totalWays) : Handle::Handle(xmrig::IThread *config, size_t totalThreads, size_t totalWays, int64_t affinity) :
m_affinity(affinity),
m_worker(nullptr), m_worker(nullptr),
m_totalThreads(totalThreads), m_totalThreads(totalThreads),
m_totalWays(totalWays), m_totalWays(totalWays),

4
src/workers/Handle.h
View file

@ -38,10 +38,11 @@ class IWorker;
class Handle class Handle
{ {
public: public:
Handle(xmrig::IThread *config, size_t totalThreads, size_t totalWays); Handle(xmrig::IThread *config, size_t totalThreads, size_t totalWays, int64_t affinity);
void join(); void join();
void start(void (*callback) (void *)); void start(void (*callback) (void *));
inline int64_t affinity() const { return m_affinity; }
inline IWorker *worker() const { return m_worker; } inline IWorker *worker() const { return m_worker; }
inline size_t threadId() const { return m_config->index(); } inline size_t threadId() const { return m_config->index(); }
inline size_t totalThreads() const { return m_totalThreads; } inline size_t totalThreads() const { return m_totalThreads; }
@ -50,6 +51,7 @@ public:
inline xmrig::IThread *config() const { return m_config; } inline xmrig::IThread *config() const { return m_config; }
private: private:
int64_t m_affinity;
IWorker *m_worker; IWorker *m_worker;
size_t m_totalThreads; size_t m_totalThreads;
size_t m_totalWays; size_t m_totalWays;

6
src/workers/Worker.cpp
View file

@ -42,9 +42,9 @@ Worker::Worker(Handle *handle) :
m_sequence(0), m_sequence(0),
m_thread(static_cast<xmrig::CpuThread *>(handle->config())) m_thread(static_cast<xmrig::CpuThread *>(handle->config()))
{ {
// if (Cpu::threads() > 1 && handle->affinity() != -1L) { if (Cpu::threads() > 1 && handle->affinity() != -1L) {
// Cpu::setAffinity(m_id, handle->affinity()); Cpu::setAffinity(m_id, handle->affinity());
// } }
Platform::setThreadPriority(handle->config()->priority()); Platform::setThreadPriority(handle->config()->priority());
m_ctx = Mem::create(m_id); m_ctx = Mem::create(m_id);

2
src/workers/Workers.cpp
View file

@ -130,7 +130,7 @@ void Workers::start(xmrig::Controller *controller)
uv_timer_start(&m_timer, Workers::onTick, 500, 500); uv_timer_start(&m_timer, Workers::onTick, 500, 500);
for (xmrig::IThread *thread : threads) { for (xmrig::IThread *thread : threads) {
Handle *handle = new Handle(thread, threads.size(), totalWays); Handle *handle = new Handle(thread, threads.size(), totalWays, controller->config()->affinity());
m_workers.push_back(handle); m_workers.push_back(handle);
handle->start(Workers::onReady); handle->start(Workers::onReady);
} }