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

Merge pull request from cohcho/nonce_iteration_without_tests

Browse source 
reserve at most 1 bit for wrapping detection
This commit is contained in:
xmrig 2020-09-14 02:12:49 +07:00 committed by GitHub
commit 852fe14604
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
src
backend/common
WorkerJob.h
base/net/stratum
Job.h
crypto/common
Nonce.cpp

4
src/backend/common/WorkerJob.h
View file

@ -96,7 +96,7 @@ private:
const size_t size = job.size(); const size_t size = job.size();
m_jobs[index()] = job; m_jobs[index()] = job;
m_rounds[index()] = 0; m_rounds[index()] = 0;
m_nonce_mask[index()] = job.isNicehash() ? 0xFFFFFFULL : (nonceSize() == sizeof(uint64_t) ? (-1ull >> (job.extraNonce().size() * 4 + 1)): 0xFFFFFFFFULL); m_nonce_mask[index()] = job.nonceMask();
m_jobs[index()].setBackend(backend); m_jobs[index()].setBackend(backend);
@ -152,7 +152,7 @@ inline void xmrig::WorkerJob<1>::save(const Job &job, uint32_t reserveCount, Non
m_index = job.index(); m_index = job.index();
m_jobs[index()] = job; m_jobs[index()] = job;
m_rounds[index()] = 0; m_rounds[index()] = 0;
m_nonce_mask[index()] = job.isNicehash() ? 0xFFFFFFULL : (nonceSize() == sizeof(uint64_t) ? (-1ull >> (job.extraNonce().size() * 4 + 1)): 0xFFFFFFFFULL); m_nonce_mask[index()] = job.nonceMask();
m_jobs[index()].setBackend(backend); m_jobs[index()].setBackend(backend);

1
src/base/net/stratum/Job.h
View file

@ -82,6 +82,7 @@ public:
inline uint32_t backend() const { return m_backend; } inline uint32_t backend() const { return m_backend; }
inline uint64_t diff() const { return m_diff; } inline uint64_t diff() const { return m_diff; }
inline uint64_t height() const { return m_height; } inline uint64_t height() const { return m_height; }
inline uint64_t nonceMask() const { return isNicehash() ? 0xFFFFFFULL : (nonceSize() == sizeof(uint64_t) ? (-1ull >> (extraNonce().size() * 4)): 0xFFFFFFFFULL); }
inline uint64_t target() const { return m_target; } inline uint64_t target() const { return m_target; }
inline uint8_t *blob() { return m_blob; } inline uint8_t *blob() { return m_blob; }
inline uint8_t fixedByte() const { return *(m_blob + 42); } inline uint8_t fixedByte() const { return *(m_blob + 42); }

6
src/crypto/common/Nonce.cpp
View file

@ -52,6 +52,7 @@ xmrig::Nonce::Nonce()
bool xmrig::Nonce::next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, uint64_t mask) bool xmrig::Nonce::next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, uint64_t mask)
{ {
mask &= 0x7FFFFFFFFFFFFFFFULL;
if (reserveCount == 0 || mask < reserveCount - 1) { if (reserveCount == 0 || mask < reserveCount - 1) {
return false; return false;
} }
@ -60,7 +61,8 @@ bool xmrig::Nonce::next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, u
while (true) { while (true) {
if (mask < counter) { if (mask < counter) {
return false; return false;
} else if (mask - counter <= reserveCount - 1) { }
else if (mask - counter <= reserveCount - 1) {
pause(true); pause(true);
if (mask - counter < reserveCount - 1) { if (mask - counter < reserveCount - 1) {
return false; return false;
@ -72,7 +74,7 @@ bool xmrig::Nonce::next(uint8_t index, uint32_t *nonce, uint32_t reserveCount, u
} }
*nonce = (nonce[0] & ~mask) | counter; *nonce = (nonce[0] & ~mask) | counter;
if (mask > 0xFFFFFFFFULL) { if (mask > 0xFFFFFFFFULL) {
nonce[1] = (nonce[1] & (~mask >> 32)) | (counter >> 32); nonce[1] = (nonce[1] & (~mask >> 32)) | (counter >> 32);
} }
return true; return true;
} }