Commit 7ef11e2b3dd50eb1d049d849adc6a77964057277
2013-05-27T21:02:32
Set the read and write threads for avalon to not cancel within libusb functions and wait for the threads to pthread_join on shutdown.
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
diff --git a/driver-avalon.c b/driver-avalon.c
index 9408676..1fc907d 100644
--- a/driver-avalon.c
+++ b/driver-avalon.c
@@ -751,8 +751,6 @@ static void *avalon_get_results(void *userdata)
char threadname[24];
int offset = 0;
- pthread_detach(pthread_self());
-
snprintf(threadname, 24, "ava_recv/%d", avalon->device_id);
RenameThread(threadname);
@@ -771,7 +769,11 @@ static void *avalon_get_results(void *userdata)
}
cgtime(&tv_start);
+ /* Threads don't like being cancelled while being inside
+ * libusb functions */
+ pthread_setcanceltype(PTHREAD_CANCEL_DISABLE, NULL);
ret = avalon_read(avalon, buf, rsize, AVALON_READ_TIMEOUT);
+ pthread_setcanceltype(PTHREAD_CANCEL_ENABLE, NULL);
if (ret < 1) {
int ms_delay;
@@ -815,8 +817,6 @@ static void *avalon_send_tasks(void *userdata)
const int avalon_get_work_count = info->miner_count;
char threadname[24];
- pthread_detach(pthread_self());
-
snprintf(threadname, 24, "ava_send/%d", avalon->device_id);
RenameThread(threadname);
@@ -850,7 +850,11 @@ static void *avalon_send_tasks(void *userdata)
info->timeout, info->asic_count,
info->miner_count, 1, 1, info->frequency);
}
+
+ pthread_setcanceltype(PTHREAD_CANCEL_DISABLE, NULL);
ret = avalon_send_task(&at, avalon);
+ pthread_setcanceltype(PTHREAD_CANCEL_ENABLE, NULL);
+
if (unlikely(ret == AVA_SEND_ERROR)) {
applog(LOG_ERR, "AVA%i: Comms error(buffer)",
avalon->device_id);
@@ -939,11 +943,12 @@ static void do_avalon_close(struct thr_info *thr)
struct avalon_info *info = avalon->device_data;
pthread_cancel(info->read_thr);
+ pthread_join(info->read_thr, NULL);
pthread_cancel(info->write_thr);
+ pthread_join(info->write_thr, NULL);
__avalon_running_reset(avalon, info);
avalon_idle(avalon, info);
avalon_free_work(thr);
- //avalon_close();
info->no_matching_work = 0;
}