Commit 58008a37420f5baa97ddc50493858c32c6036865
2013-10-12T09:05:58
Add a hash_driver_work function to allow for drivers that wish to do their own work queueing and management.
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
diff --git a/cgminer.c b/cgminer.c
index 1de5e08..da4eaad 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -6532,6 +6532,53 @@ void hash_queued_work(struct thr_info *mythr)
cgpu->deven = DEV_DISABLED;
}
+/* This version of hash_work is for devices drivers that want to do their own
+ * work management entirely, usually by using get_work(). Note that get_work
+ * is a blocking function and will wait indefinitely if no work is available
+ * so this must be taken into consideration in the driver. */
+void hash_driver_work(struct thr_info *mythr)
+{
+ struct timeval tv_start = {0, 0}, tv_end;
+ struct cgpu_info *cgpu = mythr->cgpu;
+ struct device_drv *drv = cgpu->drv;
+ const int thr_id = mythr->id;
+ int64_t hashes_done = 0;
+
+ while (likely(!cgpu->shutdown)) {
+ struct timeval diff;
+ int64_t hashes;
+
+ mythr->work_restart = false;
+
+ hashes = drv->scanwork(mythr);
+
+ if (unlikely(hashes == -1 )) {
+ applog(LOG_ERR, "%s %d failure, disabling!", drv->name, cgpu->device_id);
+ cgpu->deven = DEV_DISABLED;
+ dev_error(cgpu, REASON_THREAD_ZERO_HASH);
+ mt_disable(mythr, thr_id, drv);
+ }
+
+ hashes_done += hashes;
+ cgtime(&tv_end);
+ timersub(&tv_end, &tv_start, &diff);
+ /* Update the hashmeter at most 5 times per second */
+ if ((hashes_done && (diff.tv_sec > 0 || diff.tv_usec > 200000)) ||
+ diff.tv_sec >= opt_log_interval) {
+ hashmeter(thr_id, &diff, hashes_done);
+ hashes_done = 0;
+ copy_time(&tv_start, &tv_end);
+ }
+
+ if (unlikely(mythr->pause || cgpu->deven != DEV_ENABLED))
+ mt_disable(mythr, thr_id, drv);
+
+ if (unlikely(mythr->work_restart))
+ drv->flush_work(cgpu);
+ }
+ cgpu->deven = DEV_DISABLED;
+}
+
void *miner_thread(void *userdata)
{
struct thr_info *mythr = userdata;
diff --git a/miner.h b/miner.h
index ce39db5..a32103a 100644
--- a/miner.h
+++ b/miner.h
@@ -1390,6 +1390,7 @@ extern struct work *find_queued_work_bymidstate(struct cgpu_info *cgpu, char *mi
extern struct work *clone_queued_work_bymidstate(struct cgpu_info *cgpu, char *midstate, size_t midstatelen, char *data, int offset, size_t datalen);
extern void work_completed(struct cgpu_info *cgpu, struct work *work);
extern struct work *take_queued_work_bymidstate(struct cgpu_info *cgpu, char *midstate, size_t midstatelen, char *data, int offset, size_t datalen);
+extern void hash_driver_work(struct thr_info *mythr);
extern void hash_queued_work(struct thr_info *mythr);
extern void _wlog(const char *str);
extern void _wlogprint(const char *str);