diff options
| author | fireice-uk <fireice-uk@users.noreply.github.com> | 2017-11-15 15:34:21 +0000 |
|---|---|---|
| committer | psychocrypt <psychocrypt@users.noreply.github.com> | 2017-11-15 16:34:21 +0100 |
| commit | 117493dc5359572a171c7ffb9b55da6740593089 (patch) | |
| tree | eae5efff99a00138043680408edacd2397c1e86d /xmrstak/misc | |
| parent | 288363814fb091ccfc452f0408bfa53727fc30c0 (diff) | |
| download | xmr-stak-117493dc5359572a171c7ffb9b55da6740593089.zip xmr-stak-117493dc5359572a171c7ffb9b55da6740593089.tar.gz | |
Fix misc bugs (#117)
* CONF_NO_TLS fix
* gpu error fix + always return to sched after pin
Diffstat (limited to 'xmrstak/misc')
| -rw-r--r-- | xmrstak/misc/executor.cpp | 11 | ||||
| -rw-r--r-- | xmrstak/misc/executor.hpp | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp index 454d1cf..4a3a77b 100644 --- a/xmrstak/misc/executor.cpp +++ b/xmrstak/misc/executor.cpp @@ -494,6 +494,13 @@ void executor::ex_main() { jconf::pool_cfg cfg; jconf::inst()->GetPoolConfig(i, cfg); +#ifdef CONF_NO_TLS + if(cfg.tls) + { + printer::inst()->print_msg(L1, "ERROR: No miner was compiled without TLS support."); + win_exit(); + } +#endif if(!cfg.tls) tls = false; pools.emplace_back(i+1, cfg.sPoolAddr, cfg.sWalletAddr, cfg.sPasswd, cfg.weight, false, cfg.tls, cfg.tls_fingerprint, cfg.nicehash); } @@ -552,6 +559,10 @@ void executor::ex_main() eval_pool_choice(); break; + case EV_GPU_RES_ERROR: + log_result_error(ev.oGpuError.error_str); + break; + case EV_PERF_TICK: for (i = 0; i < pvThreads->size(); i++) telem->push_perf_value(i, pvThreads->at(i)->iHashCount.load(std::memory_order_relaxed), diff --git a/xmrstak/misc/executor.hpp b/xmrstak/misc/executor.hpp index 11c8206..9ff0323 100644 --- a/xmrstak/misc/executor.hpp +++ b/xmrstak/misc/executor.hpp @@ -42,7 +42,6 @@ public: inline void push_event(ex_event&& ev) { oEventQ.push(std::move(ev)); } void push_timed_event(ex_event&& ev, size_t sec); - void log_result_error(std::string&& sError); private: struct timed_event @@ -180,6 +179,7 @@ private: double fHighestHps = 0.0; void log_socket_error(jpsock* pool, std::string&& sError); + void log_result_error(std::string&& sError); void log_result_ok(uint64_t iActualDiff); void on_sock_ready(size_t pool_id); |
