diff options
| author | fireice-uk <fireice-uk@users.noreply.github.com> | 2018-01-03 07:48:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 07:48:39 +0000 |
| commit | e275b4cb9802096d1e1c172a69b8ba57727ef08d (patch) | |
| tree | 5ba07952b23a80c62890dae905ac18103b32c8c9 /xmrstak/net/msgstruct.hpp | |
| parent | 7198505da323a4340b3a75ff914504c7b9a69430 (diff) | |
| parent | 16759bc35357e9e981544273c42125de443c18f3 (diff) | |
| download | xmr-stak-e275b4cb9802096d1e1c172a69b8ba57727ef08d.zip xmr-stak-e275b4cb9802096d1e1c172a69b8ba57727ef08d.tar.gz | |
Merge pull request #754 from dougvj/gpu_id_show
Modify invalid result report to show GPU id
Diffstat (limited to 'xmrstak/net/msgstruct.hpp')
| -rw-r--r-- | xmrstak/net/msgstruct.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xmrstak/net/msgstruct.hpp b/xmrstak/net/msgstruct.hpp index a5affc8..8c4bdbe 100644 --- a/xmrstak/net/msgstruct.hpp +++ b/xmrstak/net/msgstruct.hpp @@ -66,8 +66,9 @@ struct sock_err // Unlike socket errors, GPU errors are read-only strings struct gpu_res_err { + size_t idx; // GPU index const char* error_str; - gpu_res_err(const char* error_str) : error_str(error_str) {} + gpu_res_err(const char* error_str, size_t idx) : error_str(error_str), idx(idx) {} }; enum ex_event_name { EV_INVALID_VAL, EV_SOCK_READY, EV_SOCK_ERROR, EV_GPU_RES_ERROR, @@ -99,7 +100,7 @@ struct ex_event }; ex_event() { iName = EV_INVALID_VAL; iPoolId = 0;} - ex_event(const char* gpu_err, size_t id) : iName(EV_GPU_RES_ERROR), iPoolId(id), oGpuError(gpu_err) {} + ex_event(const char* gpu_err, size_t gpu_idx, size_t id) : iName(EV_GPU_RES_ERROR), iPoolId(id), oGpuError(gpu_err, gpu_idx) {} ex_event(std::string&& err, bool silent, size_t id) : iName(EV_SOCK_ERROR), iPoolId(id), oSocketError(std::move(err), silent) { } ex_event(job_result dat, size_t id) : iName(EV_MINER_HAVE_RESULT), iPoolId(id), oJobResult(dat) {} ex_event(pool_job dat, size_t id) : iName(EV_POOL_HAVE_JOB), iPoolId(id), oPoolJob(dat) {} |
