fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge xmrig v6.10.0 into master

Browse source
This commit is contained in:
MoneroOcean 2021-03-08 03:34:30 +00:00
commit 5d35f324fc
64 changed files with 20043 additions and 3984 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/Miner.cpp
View file

@ -354,6 +354,7 @@ public:
bool battery_power = false;
bool user_active = false;
bool enabled = true;
int32_t auto_pause = 0;
bool reset = true;
Controller *controller;
Job job;
@ -635,7 +636,8 @@ void xmrig::Miner::onTimer(const Timer *)
LOG_INFO("%s %s", Tags::miner(), pause ? pauseMessage : activeMessage);
state = pause;
setEnabled(!pause);
d_ptr->auto_pause += pause ? 1 : -1;
setEnabled(d_ptr->auto_pause == 0);
}
};

4
src/core/config/usage.h
View file

@ -75,9 +75,9 @@ static inline const std::string &usage()
u += "\nCPU backend:\n";
u += " --no-cpu disable CPU mining backend\n";
u += " -t, --threads=N number of CPU threads\n";
u += " -v, --av=N algorithm variation, 0 auto select\n";
u += " -t, --threads=N number of CPU threads, proper CPU affinity required for some optimizations.\n";
u += " --cpu-affinity set process affinity to CPU core(s), mask 0x3 for cores 0 and 1\n";
u += " -v, --av=N algorithm variation, 0 auto select\n";
u += " --cpu-priority set process priority (0 idle, 2 normal to 5 highest)\n";
u += " --cpu-max-threads-hint=N maximum CPU threads count (in percentage) hint for autoconfig\n";
u += " --cpu-memory-pool=N number of 2 MB pages for persistent memory pool, -1 (auto), 0 (disable)\n";