diff options
| author | Unknown <fireice2@o2.pl> | 2017-11-14 16:42:12 +0000 |
|---|---|---|
| committer | Unknown <fireice2@o2.pl> | 2017-11-14 16:42:12 +0000 |
| commit | 608139ccde751eb053b54e8d41899aec9208017d (patch) | |
| tree | 7e0cbccce341c24016aee17e5d4fcf2e872dfb17 /xmrstak/backend | |
| parent | 8f9eb8ef2e10872344ecf4281c9a0a0946b00e4c (diff) | |
| download | xmr-stak-608139ccde751eb053b54e8d41899aec9208017d.zip xmr-stak-608139ccde751eb053b54e8d41899aec9208017d.tar.gz | |
Pass threadno up the food chain
Diffstat (limited to 'xmrstak/backend')
| -rw-r--r-- | xmrstak/backend/amd/minethd.cpp | 2 | ||||
| -rw-r--r-- | xmrstak/backend/cpu/minethd.cpp | 8 | ||||
| -rw-r--r-- | xmrstak/backend/nvidia/minethd.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/xmrstak/backend/amd/minethd.cpp b/xmrstak/backend/amd/minethd.cpp index 912587b..ce62565 100644 --- a/xmrstak/backend/amd/minethd.cpp +++ b/xmrstak/backend/amd/minethd.cpp @@ -237,7 +237,7 @@ void minethd::work_main() hash_fun(bWorkBlob, oWork.iWorkSize, bResult, cpu_ctx); if ( (*((uint64_t*)(bResult + 24))) < oWork.iTarget) - executor::inst()->push_event(ex_event(job_result(oWork.sJobID, results[i], bResult), oWork.iPoolId)); + executor::inst()->push_event(ex_event(job_result(oWork.sJobID, results[i], bResult, iThreadNo), oWork.iPoolId)); else executor::inst()->log_result_error("AMD Invalid Result"); } diff --git a/xmrstak/backend/cpu/minethd.cpp b/xmrstak/backend/cpu/minethd.cpp index 8b913cf..8b0eec1 100644 --- a/xmrstak/backend/cpu/minethd.cpp +++ b/xmrstak/backend/cpu/minethd.cpp @@ -354,7 +354,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) @@ -535,17 +536,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(); } diff --git a/xmrstak/backend/nvidia/minethd.cpp b/xmrstak/backend/nvidia/minethd.cpp index a1cafa7..e15fc56 100644 --- a/xmrstak/backend/nvidia/minethd.cpp +++ b/xmrstak/backend/nvidia/minethd.cpp @@ -279,7 +279,7 @@ void minethd::work_main() hash_fun(bWorkBlob, oWork.iWorkSize, bResult, cpu_ctx); if ( (*((uint64_t*)(bResult + 24))) < oWork.iTarget) - executor::inst()->push_event(ex_event(job_result(oWork.sJobID, foundNonce[i], bResult), oWork.iPoolId)); + executor::inst()->push_event(ex_event(job_result(oWork.sJobID, foundNonce[i], bResult, iThreadNo), oWork.iPoolId)); else executor::inst()->log_result_error("NVIDIA Invalid Result"); } |
