1
0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 15:27:53 +00:00

Merge pull request #78 from luke-jr/bugfix_adl

Bugfix: Iterate over devices rather than threads for watchdog (and ADL)
This commit is contained in:
Con Kolivas 2012-01-20 22:02:07 -08:00
commit 1b0b7e4a7c
2 changed files with 6 additions and 5 deletions

10
main.c
View File

@ -5014,14 +5014,12 @@ static void *watchdog_thread(void *userdata)
} }
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
for (i = 0; i < mining_threads; i++) { for (i = 0; i < total_devices; ++i) {
struct thr_info *thr; struct cgpu_info *cgpu = devices[i];
struct thr_info *thr = cgpu->thread;
bool *enable; bool *enable;
struct cgpu_info *cgpu;
int gpu; int gpu;
thr = &thr_info[i];
cgpu = thr->cgpu;
if (cgpu->api != &opencl_api) if (cgpu->api != &opencl_api)
continue; continue;
/* Use only one thread per device to determine if the GPU is healthy */ /* Use only one thread per device to determine if the GPU is healthy */
@ -6225,6 +6223,8 @@ retry_pools:
if (unlikely(thr_info_create(thr, NULL, miner_thread, thr))) if (unlikely(thr_info_create(thr, NULL, miner_thread, thr)))
quit(1, "thread %d create failed", thr->id); quit(1, "thread %d create failed", thr->id);
cgpu->thread = thr;
} }
} }

View File

@ -252,6 +252,7 @@ struct cgpu_info {
struct timeval last_message_tv; struct timeval last_message_tv;
int threads; int threads;
struct thr_info *thread;
bool dynamic; bool dynamic;
int intensity; int intensity;