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

Change get_work to use a timeout when trying to tq_pop as a sanity failsafe in case of unusual circumstances.

Browse Source
This commit is contained in:
Con Kolivas 2011-07-12 19:19:00 +10:00
parent 222d4ee6bf
commit 7b9b078114
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main.c
View File

@ -1149,6 +1149,8 @@ static void flush_requests(bool longpoll)
static bool get_work(struct work *work, bool queued) static bool get_work(struct work *work, bool queued)
{ {
struct timeval now;
struct timespec abstime = {};
struct thr_info *thr = &thr_info[0]; struct thr_info *thr = &thr_info[0];
struct work *work_heap; struct work *work_heap;
bool ret = false; bool ret = false;
@ -1157,6 +1159,9 @@ static bool get_work(struct work *work, bool queued)
getwork_requested++; getwork_requested++;
retry: retry:
gettimeofday(&now, NULL);
abstime.tv_sec = now.tv_sec + 60;
if (unlikely(!queued && !queue_request())) { if (unlikely(!queued && !queue_request())) {
applog(LOG_WARNING, "Failed to queue_request in get_work"); applog(LOG_WARNING, "Failed to queue_request in get_work");
goto out; goto out;
@ -1181,10 +1186,12 @@ retry:
applog(LOG_WARNING, "Resumed retrieving work from server"); applog(LOG_WARNING, "Resumed retrieving work from server");
} }
/* wait for 1st response, or get cached response */ /* Wait for 1st response, or get cached response. We really should
work_heap = tq_pop(thr->q, NULL); * never time out on the pop request but something might go amiss :/
*/
work_heap = tq_pop(thr->q, &abstime);
if (unlikely(!work_heap)) { if (unlikely(!work_heap)) {
applog(LOG_WARNING, "Failed to tq_pop in get_work"); applog(LOG_INFO, "Failed to tq_pop in get_work");
goto out; goto out;
} }
dec_queued(); dec_queued();

6
util.c
View File

@ -21,6 +21,7 @@
#include <curl/curl.h> #include <curl/curl.h>
#include <time.h> #include <time.h>
#include <curses.h> #include <curses.h>
#include <errno.h>
#include "miner.h" #include "miner.h"
#include "elist.h" #include "elist.h"
@ -559,8 +560,11 @@ void *tq_pop(struct thread_q *tq, const struct timespec *abstime)
rc = pthread_cond_timedwait(&tq->cond, &tq->mutex, abstime); rc = pthread_cond_timedwait(&tq->cond, &tq->mutex, abstime);
else else
rc = pthread_cond_wait(&tq->cond, &tq->mutex); rc = pthread_cond_wait(&tq->cond, &tq->mutex);
if (rc) if (unlikely(rc)) {
if (rc == ETIMEDOUT)
applog(LOG_WARNING, "Timed out waiting in tq_pop");
goto out; goto out;
}
if (list_empty(&tq->q)) if (list_empty(&tq->q))
goto out; goto out;