GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-23 04:54:26 +00:00
Code Issues Releases Wiki Activity

Move the flushing of old work into restart threads so it's done before any worker threads grab more work.

Browse Source
This commit is contained in:
Con Kolivas 2011-07-03 19:39:47 +10:00
parent 5007805d1f
commit ad787e1c2a
1 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
cpu-miner.c
View File

@ -713,6 +713,34 @@ static bool queue_request(void)
return true; return true;
} }
static void flush_requests(void)
{
struct thr_info *thr = &thr_info[0];
struct work *work_heap;
unsigned int i;
/* Queue a whole batch of new requests */
for (i = 0; i < opt_queue; i++) {
if (unlikely(!queue_request())) {
applog(LOG_ERR, "Failed to queue requests in flush_requests");
kill_work();
return;
}
}
/* Pop off the old requests. Cancelling the requests would be better
* but is tricky */
for (i = 0; i < opt_queue; i++) {
work_heap = tq_pop(thr->q, NULL);
if (unlikely(!work_heap)) {
applog(LOG_ERR, "Failed to pop requests in flush_requests");
kill_work();
return;
}
free(work_heap);
}
}
static bool get_work(struct work *work) static bool get_work(struct work *work)
{ {
struct thr_info *thr = &thr_info[0]; struct thr_info *thr = &thr_info[0];
@ -739,22 +767,6 @@ static bool get_work(struct work *work)
} }
} }
if (unlikely(work_restart[opt_n_threads + gpu_threads].restart)) {
work_restart[opt_n_threads + gpu_threads].restart = 0;
if (opt_debug)
applog(LOG_DEBUG, "New block detected, discarding old work");
for (i = 1; i < opt_queue; i++) {
free(work_heap);
if (unlikely(!queue_request()))
goto out;
/* Pop off all the work. Cancelling the requests would
* be better but tricky. */
work_heap = tq_pop(thr->q, NULL);
if (unlikely(!work_heap))
goto out;
}
}
memcpy(work, work_heap, sizeof(*work)); memcpy(work, work_heap, sizeof(*work));
memcpy(current_block, work->data, 36); memcpy(current_block, work->data, 36);
ret = true; ret = true;
@ -1135,7 +1147,9 @@ static void restart_threads(void)
{ {
int i; int i;
for (i = 0; i < opt_n_threads + gpu_threads + 1; i++) /* Discard old queued requests and get new ones */
flush_requests();
for (i = 0; i < opt_n_threads + gpu_threads; i++)
work_restart[i].restart = 1; work_restart[i].restart = 1;
} }
@ -1473,7 +1487,7 @@ int main (int argc, char *argv[])
openlog("cpuminer", LOG_PID, LOG_USER); openlog("cpuminer", LOG_PID, LOG_USER);
#endif #endif
work_restart = calloc(opt_n_threads + gpu_threads + 1, sizeof(*work_restart)); work_restart = calloc(opt_n_threads + gpu_threads, sizeof(*work_restart));
if (!work_restart) if (!work_restart)
return 1; return 1;