Commit e47dc87355c2411c88aef8bc195625108d9041cd
2012-08-10T21:44:15
Clone work at the time of requesting it if an existing work item can be rolled.
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 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160
diff --git a/cgminer.c b/cgminer.c
index 1ab0649..b4bb53e 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -3731,6 +3731,82 @@ static void pool_resus(struct pool *pool)
switch_pools(NULL);
}
+static struct work *make_clone(struct work *work)
+{
+ struct work *work_clone = make_work();
+
+ memcpy(work_clone, work, sizeof(struct work));
+ work_clone->clone = true;
+ work_clone->longpoll = false;
+ work_clone->mandatory = false;
+ /* Make cloned work appear slightly older to bias towards keeping the
+ * master work item which can be further rolled */
+ work_clone->tv_staged.tv_sec -= 1;
+
+ return work_clone;
+}
+
+static inline bool should_roll(struct work *work)
+{
+ if (work->pool == current_pool() || pool_strategy == POOL_LOADBALANCE)
+ return true;
+ return false;
+}
+
+/* Limit rolls to 7000 to not beyond 2 hours in the future where bitcoind will
+ * reject blocks as invalid. */
+static inline bool can_roll(struct work *work)
+{
+ return (work->pool && work->rolltime && !work->clone &&
+ work->rolls < 7000 && !stale_work(work, false));
+}
+
+static void roll_work(struct work *work)
+{
+ uint32_t *work_ntime;
+ uint32_t ntime;
+
+ work_ntime = (uint32_t *)(work->data + 68);
+ ntime = be32toh(*work_ntime);
+ ntime++;
+ *work_ntime = htobe32(ntime);
+ local_work++;
+ work->rolls++;
+ work->blk.nonce = 0;
+ applog(LOG_DEBUG, "Successfully rolled work");
+
+ /* This is now a different work item so it needs a different ID for the
+ * hashtable */
+ work->id = total_work++;
+}
+
+static bool clone_available(void)
+{
+ struct work *work, *tmp;
+ bool cloned = false;
+
+ mutex_lock(stgd_lock);
+ HASH_ITER(hh, staged_work, work, tmp) {
+ if (can_roll(work) && should_roll(work)) {
+ struct work *work_clone;
+
+ roll_work(work);
+ work_clone = make_clone(work);
+ roll_work(work);
+ applog(LOG_DEBUG, "Pushing cloned available work to stage thread");
+ if (unlikely(!stage_work(work_clone))) {
+ free(work_clone);
+ break;
+ }
+ cloned = true;
+ break;
+ }
+ }
+ mutex_unlock(stgd_lock);
+
+ return cloned;
+}
+
bool queue_request(struct thr_info *thr, bool needed)
{
int cq, cs, ts, tq, maxq = opt_queue + mining_threads;
@@ -3755,6 +3831,9 @@ bool queue_request(struct thr_info *thr, bool needed)
return true;
}
+ if (clone_available())
+ return true;
+
/* fill out work request message */
wc = calloc(1, sizeof(*wc));
if (unlikely(!wc)) {
@@ -3799,40 +3878,6 @@ static struct work *hash_pop(const struct timespec *abstime)
return work;
}
-static inline bool should_roll(struct work *work)
-{
- if (work->pool == current_pool() || pool_strategy == POOL_LOADBALANCE)
- return true;
- return false;
-}
-
-/* Limit rolls to 7000 to not beyond 2 hours in the future where bitcoind will
- * reject blocks as invalid. */
-static inline bool can_roll(struct work *work)
-{
- return (work->pool && work->rolltime && !work->clone &&
- work->rolls < 7000 && !stale_work(work, false));
-}
-
-static void roll_work(struct work *work)
-{
- uint32_t *work_ntime;
- uint32_t ntime;
-
- work_ntime = (uint32_t *)(work->data + 68);
- ntime = be32toh(*work_ntime);
- ntime++;
- *work_ntime = htobe32(ntime);
- local_work++;
- work->rolls++;
- work->blk.nonce = 0;
- applog(LOG_DEBUG, "Successfully rolled work");
-
- /* This is now a different work item so it needs a different ID for the
- * hashtable */
- work->id = total_work++;
-}
-
static bool reuse_work(struct work *work)
{
if (can_roll(work) && should_roll(work)) {
@@ -3842,21 +3887,6 @@ static bool reuse_work(struct work *work)
return false;
}
-static struct work *make_clone(struct work *work)
-{
- struct work *work_clone = make_work();
-
- memcpy(work_clone, work, sizeof(struct work));
- work_clone->clone = true;
- work_clone->longpoll = false;
- work_clone->mandatory = false;
- /* Make cloned work appear slightly older to bias towards keeping the
- * master work item which can be further rolled */
- work_clone->tv_staged.tv_sec -= 1;
-
- return work_clone;
-}
-
/* Clones work by rolling it if possible, and returning a clone instead of the
* original work item which gets staged again to possibly be rolled again in
* the future */