Commit dafc2f775a0c455714cbdae7f78b819d1b083ac4
2013-02-09T21:12:03
Abstract out the main hashing loop to allow us to use a separate loop for devices that are fast enough to require queued work.
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 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
diff --git a/cgminer.c b/cgminer.c
index 2d45323..5714639 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -5356,49 +5356,33 @@ static void mt_disable(struct thr_info *mythr, const int thr_id,
drv->thread_enable(mythr);
}
-void *miner_thread(void *userdata)
+/* The main hashing loop for devices that are slow enough to work on one work
+ * item at a time, without a queue, aborting work before the entire nonce
+ * range has been hashed if needed. */
+void hash_sole_work(struct thr_info *mythr)
{
- struct thr_info *mythr = userdata;
const int thr_id = mythr->id;
struct cgpu_info *cgpu = mythr->cgpu;
struct device_drv *drv = cgpu->drv;
+ struct timeval getwork_start, tv_start, tv_end, tv_workstart, tv_lastupdate;
struct cgminer_stats *dev_stats = &(cgpu->cgminer_stats);
struct cgminer_stats *pool_stats;
- struct timeval getwork_start;
-
/* Try to cycle approximately 5 times before each log update */
const long cycle = opt_log_interval / 5 ? : 1;
- struct timeval tv_start, tv_end, tv_workstart, tv_lastupdate;
+ const bool primary = (!mythr->device_thread) || mythr->primary_thread;
struct timeval diff, sdiff, wdiff = {0, 0};
uint32_t max_nonce = drv->can_limit_work(mythr);
int64_t hashes_done = 0;
- int64_t hashes;
- struct work *work;
- const bool primary = (!mythr->device_thread) || mythr->primary_thread;
-
- pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
-
- char threadname[20];
- snprintf(threadname,20,"miner %d",thr_id);
- RenameThread(threadname);
gettimeofday(&getwork_start, NULL);
-
- if (!drv->thread_init(mythr)) {
- dev_error(cgpu, REASON_THREAD_FAIL_INIT);
- goto out;
- }
-
- thread_reportout(mythr);
- applog(LOG_DEBUG, "Popping ping in miner thread");
- tq_pop(mythr->q, NULL); /* Wait for a ping to start */
-
sdiff.tv_sec = sdiff.tv_usec = 0;
gettimeofday(&tv_lastupdate, NULL);
- while (1) {
+ while (42) {
+ struct work *work = get_work(mythr, thr_id);
+ int64_t hashes;
+
mythr->work_restart = false;
- work = get_work(mythr, thr_id);
cgpu->new_work = true;
gettimeofday(&tv_workstart, NULL);
@@ -5519,7 +5503,31 @@ void *miner_thread(void *userdata)
} while (!abandon_work(work, &wdiff, cgpu->max_hashes));
free_work(work);
}
+}
+
+void *miner_thread(void *userdata)
+{
+ struct thr_info *mythr = userdata;
+ const int thr_id = mythr->id;
+ struct cgpu_info *cgpu = mythr->cgpu;
+ struct device_drv *drv = cgpu->drv;
+ char threadname[20];
+
+ pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+
+ snprintf(threadname,20,"miner %d",thr_id);
+ RenameThread(threadname);
+
+ if (!drv->thread_init(mythr)) {
+ dev_error(cgpu, REASON_THREAD_FAIL_INIT);
+ goto out;
+ }
+
+ thread_reportout(mythr);
+ applog(LOG_DEBUG, "Popping ping in miner thread");
+ tq_pop(mythr->q, NULL); /* Wait for a ping to start */
+ hash_sole_work(mythr);
out:
drv->thread_shutdown(mythr);