diff options
| author | psychocrypt <psychocrypt@users.noreply.github.com> | 2017-11-16 12:12:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 12:12:40 +0100 |
| commit | 1dc874c542a23c36dd65ea0f5b9cb65e3c3a572a (patch) | |
| tree | bbebd1f9969dbd09283fba5cb3ef9fc170dc0400 /xmrstak/backend/cpu | |
| parent | 2c3a3484757f242cf20b8e2ca2d89cfe01f64888 (diff) | |
| parent | 41eb0ad64e6d003368ccf8f3212f190a829aae10 (diff) | |
| download | xmr-stak-1dc874c542a23c36dd65ea0f5b9cb65e3c3a572a.zip xmr-stak-1dc874c542a23c36dd65ea0f5b9cb65e3c3a572a.tar.gz | |
Merge pull request #115 from fireice-uk/topic-net-ext
Network extensions
Diffstat (limited to 'xmrstak/backend/cpu')
| -rw-r--r-- | xmrstak/backend/cpu/minethd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xmrstak/backend/cpu/minethd.cpp b/xmrstak/backend/cpu/minethd.cpp index 8183adf..03071c4 100644 --- a/xmrstak/backend/cpu/minethd.cpp +++ b/xmrstak/backend/cpu/minethd.cpp @@ -358,7 +358,8 @@ void minethd::work_main() piHashVal = (uint64_t*)(result.bResult + 24); piNonce = (uint32_t*)(oWork.bWorkBlob + 39); globalStates::inst().inst().iConsumeCnt++; - + result.iThreadId = iThreadNo; + while (bQuit == 0) { if (oWork.bStall) @@ -542,17 +543,16 @@ void minethd::double_work_main() globalStates::inst().calc_start_nonce(iNonce, oWork.bNiceHash, nonce_chunk); } - *piNonce0 = ++iNonce; *piNonce1 = ++iNonce; hash_fun(bDoubleWorkBlob, oWork.iWorkSize, bDoubleHashOut, ctx0, ctx1); if (*piHashVal0 < oWork.iTarget) - executor::inst()->push_event(ex_event(job_result(oWork.sJobID, iNonce-1, bDoubleHashOut), oWork.iPoolId)); + executor::inst()->push_event(ex_event(job_result(oWork.sJobID, iNonce-1, bDoubleHashOut, iThreadNo), oWork.iPoolId)); if (*piHashVal1 < oWork.iTarget) - executor::inst()->push_event(ex_event(job_result(oWork.sJobID, iNonce, bDoubleHashOut + 32), oWork.iPoolId)); + executor::inst()->push_event(ex_event(job_result(oWork.sJobID, iNonce, bDoubleHashOut + 32, iThreadNo), oWork.iPoolId)); std::this_thread::yield(); } |
