Commit a61e41a0700f42eefe428f4354861871840ff6c4
2013-08-19T15:58:22
Check for thr->work_restart in restart_wait.
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
diff --git a/cgminer.c b/cgminer.c
index cab0672..30c51cb 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -3590,7 +3590,7 @@ static void discard_stale(void)
* work restart is required. Returns the value of pthread_cond_timedwait
* which is zero if the condition was met or ETIMEDOUT if not.
*/
-int restart_wait(unsigned int mstime)
+int restart_wait(struct thr_info *thr, unsigned int mstime)
{
struct timeval now, then, tdiff;
struct timespec abstime;
@@ -3604,7 +3604,10 @@ int restart_wait(unsigned int mstime)
abstime.tv_nsec = then.tv_usec * 1000;
mutex_lock(&restart_lock);
- rc = pthread_cond_timedwait(&restart_cond, &restart_lock, &abstime);
+ if (thr->work_restart)
+ rc = ETIMEDOUT;
+ else
+ rc = pthread_cond_timedwait(&restart_cond, &restart_lock, &abstime);
mutex_unlock(&restart_lock);
return rc;
diff --git a/driver-bflsc.c b/driver-bflsc.c
index dac33f7..55dc827 100644
--- a/driver-bflsc.c
+++ b/driver-bflsc.c
@@ -1740,7 +1740,7 @@ static int64_t bflsc_scanwork(struct thr_info *thr)
}
}
- waited = restart_wait(sc_info->scan_sleep_time);
+ waited = restart_wait(thr, sc_info->scan_sleep_time);
if (waited == ETIMEDOUT) {
unsigned int old_sleep_time, new_sleep_time = 0;
int min_queued = sc_info->que_size;
diff --git a/driver-bitforce.c b/driver-bitforce.c
index 07a2683..9afa36d 100644
--- a/driver-bitforce.c
+++ b/driver-bitforce.c
@@ -678,7 +678,7 @@ static int64_t bitforce_scanhash(struct thr_info *thr, struct work *work, int64_
send_ret = bitforce_send_work(thr, work);
- if (!restart_wait(bitforce->sleep_ms))
+ if (!restart_wait(thr, bitforce->sleep_ms))
return 0;
bitforce->wait_ms = bitforce->sleep_ms;
diff --git a/miner.h b/miner.h
index 36ed526..a87d1a5 100644
--- a/miner.h
+++ b/miner.h
@@ -945,7 +945,7 @@ extern pthread_cond_t restart_cond;
extern void thread_reportin(struct thr_info *thr);
extern void clear_stratum_shares(struct pool *pool);
extern void set_target(unsigned char *dest_target, double diff);
-extern int restart_wait(unsigned int mstime);
+extern int restart_wait(struct thr_info *thr, unsigned int mstime);
extern void kill_work(void);