Commit 3c39d75fc9a8ed8956da42372533dd118c1387d5
2013-05-26T16:26:42
Shut down avalon read and write threads and idle the miners on closing it.
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
diff --git a/driver-avalon.c b/driver-avalon.c
index b731721..b7e660e 100644
--- a/driver-avalon.c
+++ b/driver-avalon.c
@@ -677,6 +677,13 @@ static void avalon_rotate_array(struct cgpu_info *avalon)
avalon->work_array = 0;
}
+static void wait_avalon_ready(int fd)
+{
+ while (avalon_buffer_full(fd) == AVA_BUFFER_FULL) {
+ nmsleep(40);
+ }
+}
+
static void *avalon_send_tasks(void *userdata)
{
struct cgpu_info *avalon = (struct cgpu_info *)userdata;
@@ -695,9 +702,7 @@ static void *avalon_send_tasks(void *userdata)
struct avalon_task at;
int idled = 0;
- while (avalon_buffer_full(fd) == AVA_BUFFER_FULL) {
- nmsleep(40);
- }
+ wait_avalon_ready(fd);
mutex_lock(&info->qlock);
start_count = avalon->work_array * avalon_get_work_count;
@@ -805,10 +810,25 @@ static void do_avalon_close(struct thr_info *thr)
{
struct cgpu_info *avalon = thr->cgpu;
struct avalon_info *info = avalon->device_data;
+ int i, fd = avalon->device_fd;
+
+ pthread_cancel(info->read_thr);
+ pthread_cancel(info->write_thr);
+ avalon_reset(avalon, fd);
+ wait_avalon_ready(fd);
+ applog(LOG_WARNING, "AVA%i: Idling %d miners", avalon->device_id,
+ info->miner_count);
+ /* Send idle to all miners */
+ for (i = 0; i < info->miner_count; i++) {
+ struct avalon_task at;
+ avalon_init_task(&at, 0, 0, info->fan_pwm, info->timeout,
+ info->asic_count, info->miner_count, 1, 1,
+ info->frequency);
+ avalon_send_task(fd, &at, avalon);
+ }
avalon_free_work(thr);
- avalon_reset(avalon, avalon->device_fd);
- avalon_close(avalon->device_fd);
+ avalon_close(fd);
avalon->device_fd = -1;
info->no_matching_work = 0;