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

Fixed duplicated shares after donation round.

Browse source
This commit is contained in:
XMRig 2019-07-18 23:48:16 +07:00
parent 0ab26a1619
commit 88edde804f
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/core/Miner.cpp
View file

@ -88,7 +88,7 @@ public:
} }
inline void handleJobChange() inline void handleJobChange(bool reset)
{ {
active = true; active = true;
@ -96,12 +96,17 @@ public:
backend->setJob(job); backend->setJob(job);
} }
if (reset) {
Nonce::reset(job.index());
}
else {
Nonce::touch();
}
if (enabled) { if (enabled) {
Nonce::pause(false);; Nonce::pause(false);;
} }
Nonce::reset(job.index());
if (ticks == 0) { if (ticks == 0) {
ticks++; ticks++;
timer->start(500, 500); timer->start(500, 500);
@ -116,6 +121,7 @@ public:
double maxHashrate = 0.0; double maxHashrate = 0.0;
Job job; Job job;
std::vector<IBackend *> backends; std::vector<IBackend *> backends;
String userJobId;
Timer *timer = nullptr; Timer *timer = nullptr;
uint64_t ticks = 0; uint64_t ticks = 0;
uv_rwlock_t rwlock; uv_rwlock_t rwlock;
@ -236,13 +242,18 @@ void xmrig::Miner::setJob(const Job &job, bool donate)
uv_rwlock_wrlock(&d_ptr->rwlock); uv_rwlock_wrlock(&d_ptr->rwlock);
const uint8_t index = donate ? 1 : 0; const uint8_t index = donate ? 1 : 0;
const bool reset = !(d_ptr->job.index() == 1 && index == 0 && d_ptr->userJobId == job.id());
d_ptr->job = job; d_ptr->job = job;
d_ptr->job.setIndex(index); d_ptr->job.setIndex(index);
if (index == 0) {
d_ptr->userJobId = job.id();
}
uv_rwlock_wrunlock(&d_ptr->rwlock); uv_rwlock_wrunlock(&d_ptr->rwlock);
d_ptr->handleJobChange(); d_ptr->handleJobChange(reset);
} }