GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-02 10:04:33 +00:00
Code Issues Releases Wiki Activity

get_work always returns true so turn it into a void function.

Browse Source
This commit is contained in:
Con Kolivas 2012-08-20 10:58:12 +10:00
parent 260b1c87c0
commit 34b8dcb7bc
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cgminer.c
View File

@ -4002,13 +4002,12 @@ static struct work *clone_work(struct work *work)
return work; return work;
} }
static bool get_work(struct work *work, struct thr_info *thr, const int thr_id) static void get_work(struct work *work, struct thr_info *thr, const int thr_id)
{ {
struct timespec abstime = {0, 0}; struct timespec abstime = {0, 0};
struct work *work_heap; struct work *work_heap;
struct timeval now; struct timeval now;
struct pool *pool; struct pool *pool;
bool ret = false;
/* Tell the watchdog thread this thread is waiting on getwork and /* Tell the watchdog thread this thread is waiting on getwork and
* should not be restarted */ * should not be restarted */
@ -4016,17 +4015,14 @@ static bool get_work(struct work *work, struct thr_info *thr, const int thr_id)
if (opt_benchmark) { if (opt_benchmark) {
get_benchmark_work(work); get_benchmark_work(work);
thread_reportin(thr); goto out;
return true;
} }
retry: retry:
pool = current_pool(); pool = current_pool();
if (reuse_work(work)) { if (reuse_work(work))
ret = true;
goto out; goto out;
}
if (!pool->lagging && !total_staged() && global_queued() >= mining_threads + opt_queue) { if (!pool->lagging && !total_staged() && global_queued() >= mining_threads + opt_queue) {
struct cgpu_info *cgpu = thr->cgpu; struct cgpu_info *cgpu = thr->cgpu;
@ -4080,14 +4076,10 @@ retry:
memcpy(work, work_heap, sizeof(struct work)); memcpy(work, work_heap, sizeof(struct work));
free_work(work_heap); free_work(work_heap);
ret = true;
out: out:
work->thr_id = thr_id; work->thr_id = thr_id;
thread_reportin(thr); thread_reportin(thr);
if (ret) work->mined = true;
work->mined = true;
return ret;
} }
bool submit_work_sync(struct thr_info *thr, const struct work *work_in) bool submit_work_sync(struct thr_info *thr, const struct work *work_in)
@ -4244,11 +4236,8 @@ void *miner_thread(void *userdata)
mythr->work_restart = false; mythr->work_restart = false;
if (api->free_work && likely(work->pool)) if (api->free_work && likely(work->pool))
api->free_work(mythr, work); api->free_work(mythr, work);
if (unlikely(!get_work(work, mythr, thr_id))) { get_work(work, mythr, thr_id);
applog(LOG_ERR, "work retrieval failed, exiting "
"mining thread %d", thr_id);
break;
}
gettimeofday(&tv_workstart, NULL); gettimeofday(&tv_workstart, NULL);
work->blk.nonce = 0; work->blk.nonce = 0;
cgpu->max_hashes = 0; cgpu->max_hashes = 0;