Revert "Rewrite the convoluted get_work() function to be much simpler and roll work as much as possible with each new work item." This reverts commit dec99ab739d16f2dd4f48482e713a25ebaef8e66. This seems to cause a race on work in free_work(). Presumably other threads are still accessing the structure.
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 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246
diff --git a/cgminer.c b/cgminer.c
index cdc6a47..cd79a19 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -1525,30 +1525,19 @@ out:
return rc;
}
-static int inc_totalwork(void)
-{
- int ret;
-
- mutex_lock(&control_lock);
- ret = total_work++;
- mutex_unlock(&control_lock);
- return ret;
-}
-
static struct work *make_work(void)
{
struct work *work = calloc(1, sizeof(struct work));
if (unlikely(!work))
quit(1, "Failed to calloc work in make_work");
- work->id = inc_totalwork();
+ work->id = total_work++;
return work;
}
static void free_work(struct work *work)
{
free(work);
- work = NULL;
}
static void workio_cmd_free(struct workio_cmd *wc)
@@ -3001,7 +2990,7 @@ static void roll_work(struct work *work)
/* This is now a different work item so it needs a different ID for the
* hashtable */
- work->id = inc_totalwork();
+ work->id = total_work++;
}
static bool reuse_work(struct work *work)
@@ -3013,83 +3002,103 @@ static bool reuse_work(struct work *work)
return false;
}
-static void roll_cloned(struct work *work)
+static bool get_work(struct work *work, bool requested, struct thr_info *thr,
+ const int thr_id)
{
- struct work *work_clone = make_work();
-
- memcpy(work_clone, work, sizeof(struct work));
- while (reuse_work(work)) {
- work_clone->clone = true;
- if (opt_debug)
- applog(LOG_DEBUG, "Pushing rolled cloned work to stage thread");
- if (unlikely(!stage_work(work_clone)))
- break;
- work_clone = make_work();
- memcpy(work_clone, work, sizeof(struct work));
- }
- free_work(work_clone);
-}
-
-static struct work *get_work(bool requested, struct thr_info *thr, const int thr_id)
-{
- struct timespec abstime = {0, 0};
- struct work *work = NULL;
- bool newreq = false;
+ bool newreq = false, ret = false;
+ struct timespec abstime = {};
struct timeval now;
+ struct work *work_heap;
struct pool *pool;
+ int failures = 0;
/* Tell the watchdog thread this thread is waiting on getwork and
* should not be restarted */
thread_reportout(thr);
-
- while (!work) {
- pool = current_pool();
- if (!requested || requests_queued() < opt_queue) {
- if (unlikely(!queue_request(thr, true)))
- quit(1, "Failed to queue_request in get_work");
- newreq = true;
+retry:
+ pool = current_pool();
+ if (!requested || requests_queued() < opt_queue) {
+ if (unlikely(!queue_request(thr, true))) {
+ applog(LOG_WARNING, "Failed to queue_request in get_work");
+ goto out;
}
+ newreq = true;
+ }
- if (requested && !newreq && !requests_staged() && requests_queued() >= mining_threads &&
- !pool_tset(pool, &pool->lagging)) {
- applog(LOG_WARNING, "Pool %d not providing work fast enough", pool->pool_no);
- pool->getfail_occasions++;
- total_go++;
- }
+ if (reuse_work(work)) {
+ ret = true;
+ goto out;
+ }
- newreq = requested = false;
- gettimeofday(&now, NULL);
- abstime.tv_sec = now.tv_sec + 60;
+ if (requested && !newreq && !requests_staged() && requests_queued() >= mining_threads &&
+ !pool_tset(pool, &pool->lagging)) {
+ applog(LOG_WARNING, "Pool %d not providing work fast enough", pool->pool_no);
+ pool->getfail_occasions++;
+ total_go++;
+ }
- if (opt_debug)
- applog(LOG_DEBUG, "Popping work from get queue to get work");
+ newreq = requested = false;
+ gettimeofday(&now, NULL);
+ abstime.tv_sec = now.tv_sec + 60;
- /* wait for 1st response, or get cached response */
- work = hash_pop(&abstime);
- if (unlikely(!work)) {
- /* Attempt to switch pools if this one times out */
- pool_died(pool);
- } else if (stale_work(work, false)) {
- dec_queued();
- discard_work(work);
- }
+ if (opt_debug)
+ applog(LOG_DEBUG, "Popping work from get queue to get work");
+
+ /* wait for 1st response, or get cached response */
+ work_heap = hash_pop(&abstime);
+ if (unlikely(!work_heap)) {
+ /* Attempt to switch pools if this one times out */
+ pool_died(pool);
+ goto retry;
+ }
+
+ if (stale_work(work_heap, false)) {
+ dec_queued();
+ discard_work(work_heap);
+ goto retry;
}
- pool = work->pool;
+ pool = work_heap->pool;
/* If we make it here we have succeeded in getting fresh work */
- if (likely(pool)) {
+ if (!work_heap->mined) {
pool_tclear(pool, &pool->lagging);
if (pool_tclear(pool, &pool->idle))
pool_resus(pool);
}
- roll_cloned(work);
- dec_queued();
+ memcpy(work, work_heap, sizeof(*work));
+
+ /* Hand out a clone if we can roll this work item */
+ if (reuse_work(work_heap)) {
+ if (opt_debug)
+ applog(LOG_DEBUG, "Pushing divided work to get queue head");
+
+ stage_work(work_heap);
+ work->clone = true;
+ } else {
+ dec_queued();
+ free_work(work_heap);
+ }
+
+ ret = true;
+out:
+ if (unlikely(ret == false)) {
+ if ((opt_retries >= 0) && (++failures > opt_retries)) {
+ applog(LOG_ERR, "Failed %d times to get_work");
+ return ret;
+ }
+ applog(LOG_DEBUG, "Retrying after %d seconds", fail_pause);
+ sleep(fail_pause);
+ fail_pause += opt_fail_pause;
+ goto retry;
+ }
+ fail_pause = opt_fail_pause;
work->thr_id = thr_id;
- work->mined = true;
thread_reportin(thr);
- return work;
+ if (ret)
+ work->mined = true;
+ return ret;
}
bool submit_work_sync(struct thr_info *thr, const struct work *work_in)
@@ -3208,8 +3217,11 @@ void *miner_thread(void *userdata)
work_restart[thr_id].restart = 0;
if (api->free_work && likely(work->pool))
api->free_work(mythr, work);
- free_work(work);
- work = get_work(requested, mythr, thr_id);
+ if (unlikely(!get_work(work, requested, mythr, thr_id))) {
+ applog(LOG_ERR, "work retrieval failed, exiting "
+ "mining thread %d", thr_id);
+ break;
+ }
requested = false;
cycle = (can_roll(work) && should_roll(work)) ? 1 : def_cycle;
gettimeofday(&tv_workstart, NULL);
@@ -3326,7 +3338,7 @@ enum {
/* Stage another work item from the work returned in a longpoll */
static void convert_to_work(json_t *val, bool rolltime, struct pool *pool)
{
- struct work *work;
+ struct work *work, *work_clone;
bool rc;
work = make_work();
@@ -3344,7 +3356,18 @@ static void convert_to_work(json_t *val, bool rolltime, struct pool *pool)
* allows testwork to know whether LP discovered the block or not. */
test_work_current(work, true);
- roll_cloned(work);
+ work_clone = make_work();
+ memcpy(work_clone, work, sizeof(struct work));
+ while (reuse_work(work)) {
+ work_clone->clone = true;
+ if (opt_debug)
+ applog(LOG_DEBUG, "Pushing rolled converted work to stage thread");
+ if (unlikely(!stage_work(work_clone)))
+ break;
+ work_clone = make_work();
+ memcpy(work_clone, work, sizeof(struct work));
+ }
+ free_work(work_clone);
if (opt_debug)
applog(LOG_DEBUG, "Pushing converted work to stage thread");