github-jwinterm/xmr-stak
1
0
Fork 0
mirror of https://github.com/jwinterm/xmr-stak.git synced 2026-10-17 05:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix broken nicehash support

Browse Source 
- add nicehash flag back to `miner_work`
This commit is contained in:
psychocrypt
2017-10-04 23:03:45 +02:00
parent 8ee452eefa
commit e34ce368b5
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xmrstak/backend/miner_work.hpp
+2 -2
View File
@@ -26,8 +26,8 @@ namespace xmrstak
miner_work() : iWorkSize(0), bNiceHash(false), bStall(true), iPoolId(0) { }
miner_work(const char* sJobID, const uint8_t* bWork, uint32_t iWorkSize, uint32_t iResumeCnt,
uint64_t iTarget, size_t iPoolId) : iWorkSize(iWorkSize), iResumeCnt(iResumeCnt),
iTarget(iTarget), bNiceHash(false), bStall(false), iPoolId(iPoolId)
uint64_t iTarget, bool bNiceHash, size_t iPoolId) : iWorkSize(iWorkSize), iResumeCnt(iResumeCnt),
iTarget(iTarget), bNiceHash(bNiceHash), bStall(false), iPoolId(iPoolId)
{
assert(iWorkSize <= sizeof(bWorkBlob));
memcpy(this->sJobID, sJobID, sizeof(miner_work::sJobID));
xmrstak/cli/cli-miner.cpp
+1 -1
View File
@@ -346,7 +346,7 @@ void do_benchmark()
printer::inst()->print_msg(L0, "Running a 60 second benchmark...");
uint8_t work[76] = {0};
xmrstak::miner_work oWork = xmrstak::miner_work("", work, sizeof(work), 0, 0, 0);
xmrstak::miner_work oWork = xmrstak::miner_work("", work, sizeof(work), 0, 0, false, 0);
pvThreads = xmrstak::BackendConnector::thread_starter(oWork);
uint64_t iStartStamp = time_point_cast<milliseconds>(high_resolution_clock::now()).time_since_epoch().count();
xmrstak/misc/executor.cpp
+2 -1
View File
@@ -235,6 +235,7 @@ void executor::on_pool_have_job(size_t pool_id, pool_job& oPoolJob)
xmrstak::miner_work oWork(oPoolJob.sJobID, oPoolJob.bWorkBlob,
oPoolJob.iWorkLen, oPoolJob.iResumeCnt, oPoolJob.iTarget,
pool_id != dev_pool_id && ::jconf::inst()->NiceHashMode(),
pool_id);
oWork.iTarget32 = oPoolJob.iTarget32;
@@ -357,7 +358,7 @@ void executor::on_switch_pool(size_t pool_id)
xmrstak::miner_work oWork(oPoolJob.sJobID, oPoolJob.bWorkBlob,
oPoolJob.iWorkLen, oPoolJob.iResumeCnt, oPoolJob.iTarget,
pool_id);
::jconf::inst()->NiceHashMode(), pool_id);
oWork.iTarget32 = oPoolJob.iTarget32;