Commit 74a07eb461547bea0b32490ba79dc462e353fd7b
2011-07-30T13:14:59
Revert "Send threads message to stop and then send cancel message but don't pthread_join them if they're stuck nor reinit the opencl code to not hang everything." This reverts commit 62521f3e53f06920cd101c47c8645f026d9b90b1. Not enough to restart a GPU.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/main.c b/main.c
index f119508..0605457 100644
--- a/main.c
+++ b/main.c
@@ -3357,12 +3357,11 @@ static void *reinit_gpu(void *userdata)
struct cgpu_info *cgpu = (struct cgpu_info *)userdata;
int gpu = cgpu->cpu_gpu;
struct thr_info *thr;
+ char name[256];
int thr_id;
_clState *clState;
- /* Send threads message to stop */
- gpu_devices[gpu] = false;
- sleep(5);
+ gpus[gpu].status = LIFE_DEAD;
for (thr_id = 0; thr_id < gpu_threads; thr_id ++) {
if (dev_from_id(thr_id) != gpu)
@@ -3371,32 +3370,44 @@ static void *reinit_gpu(void *userdata)
clState = clStates[thr_id];
thr = &thr_info[thr_id];
thr->rolling = thr->cgpu->rolling = 0;
+ tq_freeze(thr->q);
if (!pthread_cancel(*thr->pth)) {
- applog(LOG_WARNING, "Thread still exists, killing it off");
+ pthread_join(*thr->pth, NULL);
free(thr->q);
- } else
- applog(LOG_WARNING, "Thread no longer exists");
+ }
thr->q = tq_new();
if (!thr->q)
quit(1, "Failed to tq_new in reinit_gpu");
- applog(LOG_WARNING, "Attempting to create new worker thread %d", thr_id);
+ /* Send it a command. If it responds we can restart */
+ applog(LOG_WARNING, "Attempting to send GPU command");
+ clFlush(clState->commandQueue);
+ free(clState);
+ applog(LOG_WARNING, "Command successful, attempting to reinit device");
+
+ applog(LOG_INFO, "Reinit GPU thread %d", thr_id);
+ clState = initCl(gpu, name, sizeof(name));
+ if (!clState) {
+ applog(LOG_ERR, "Failed to reinit GPU thread %d", thr_id);
+ return NULL;
+ }
+ applog(LOG_INFO, "initCl() finished. Found %s", name);
+
if (unlikely(thr_info_create(thr, NULL, gpuminer_thread, thr))) {
applog(LOG_ERR, "thread %d create failed", thr_id);
return NULL;
}
+ /* Try to re-enable it */
+ gpu_devices[gpu] = true;
if (opt_debug)
applog(LOG_DEBUG, "Pushing ping to thread %d", thr_id);
tq_push(thr->q, &ping);
- applog(LOG_WARNING, "Thread %d restarted successfully", thr_id);
+ applog(LOG_WARNING, "Thread %d restarted", thr_id);
}
- /* Try to re-enable it */
- gpu_devices[gpu] = true;
-
return NULL;
}
#endif