From 117493dc5359572a171c7ffb9b55da6740593089 Mon Sep 17 00:00:00 2001 From: fireice-uk Date: Wed, 15 Nov 2017 15:34:21 +0000 Subject: Fix misc bugs (#117) * CONF_NO_TLS fix * gpu error fix + always return to sched after pin --- xmrstak/backend/nvidia/minethd.cpp | 6 +++++- xmrstak/backend/nvidia/minethd.hpp | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'xmrstak/backend/nvidia') diff --git a/xmrstak/backend/nvidia/minethd.cpp b/xmrstak/backend/nvidia/minethd.cpp index a1cafa7..5170305 100644 --- a/xmrstak/backend/nvidia/minethd.cpp +++ b/xmrstak/backend/nvidia/minethd.cpp @@ -79,6 +79,7 @@ minethd::minethd(miner_work& pWork, size_t iNo, const jconf::thd_cfg& cfg) ctx.device_bsleep = (int)cfg.bsleep; this->affinity = cfg.cpu_aff; + std::unique_lock lck(thd_aff_set); std::future order_guard = order_fix.get_future(); oWorkThd = std::thread(&minethd::work_main, this); @@ -207,6 +208,9 @@ void minethd::work_main() bindMemoryToNUMANode(affinity); order_fix.set_value(); + std::unique_lock lck(thd_aff_set); + lck.release(); + std::this_thread::yield(); uint64_t iCount = 0; cryptonight_ctx* cpu_ctx; @@ -281,7 +285,7 @@ void minethd::work_main() if ( (*((uint64_t*)(bResult + 24))) < oWork.iTarget) executor::inst()->push_event(ex_event(job_result(oWork.sJobID, foundNonce[i], bResult), oWork.iPoolId)); else - executor::inst()->log_result_error("NVIDIA Invalid Result"); + executor::inst()->push_event(ex_event("NVIDIA Invalid Result", oWork.iPoolId)); } iCount += h_per_round; diff --git a/xmrstak/backend/nvidia/minethd.hpp b/xmrstak/backend/nvidia/minethd.hpp index f6d989c..ffcdab1 100644 --- a/xmrstak/backend/nvidia/minethd.hpp +++ b/xmrstak/backend/nvidia/minethd.hpp @@ -45,6 +45,7 @@ private: miner_work oWork; std::promise order_fix; + std::mutex thd_aff_set; std::thread oWorkThd; int64_t affinity; -- cgit v1.1