GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 07:17:58 +00:00
Code Issues Releases Wiki Activity

Move avalon read thread start till after conditional wait, store idle status in avalon_info and use it to determine whether an error is appropriate or not.

Browse Source
This commit is contained in:
Con Kolivas 2013-05-26 14:37:45 +10:00
parent 0763070cb0
commit 66e27a10c5
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
driver-avalon.c
View File

@ -546,6 +546,9 @@ static void avalon_update_temps(struct cgpu_info *avalon, struct avalon_info *in
static void avalon_inc_nvw(struct avalon_info *info, struct thr_info *thr) static void avalon_inc_nvw(struct avalon_info *info, struct thr_info *thr)
{ {
if (unlikely(info->idle))
return;
applog(LOG_WARNING, "%s%d: No valid work - HW error", applog(LOG_WARNING, "%s%d: No valid work - HW error",
thr->cgpu->drv->name, thr->cgpu->device_id); thr->cgpu->drv->name, thr->cgpu->device_id);
@ -681,7 +684,6 @@ static void *avalon_send_tasks(void *userdata)
const int avalon_get_work_count = info->miner_count; const int avalon_get_work_count = info->miner_count;
int fd = avalon->device_fd; int fd = avalon->device_fd;
char threadname[24]; char threadname[24];
bool idle = false;
pthread_detach(pthread_self()); pthread_detach(pthread_self());
@ -709,7 +711,7 @@ static void *avalon_send_tasks(void *userdata)
} }
if (likely(j < avalon->queued)) { if (likely(j < avalon->queued)) {
idle = false; info->idle = false;
avalon_init_task(&at, 0, 0, info->fan_pwm, avalon_init_task(&at, 0, 0, info->fan_pwm,
info->timeout, info->asic_count, info->timeout, info->asic_count,
info->miner_count, 1, 0, info->frequency); info->miner_count, 1, 0, info->frequency);
@ -731,8 +733,8 @@ static void *avalon_send_tasks(void *userdata)
pthread_cond_signal(&info->qcond); pthread_cond_signal(&info->qcond);
mutex_unlock(&info->qlock); mutex_unlock(&info->qlock);
if (unlikely(idled && !idle)) { if (unlikely(idled && !info->idle)) {
idle = true; info->idle = true;
applog(LOG_WARNING, "AVA%i: Idled %d miners", applog(LOG_WARNING, "AVA%i: Idled %d miners",
avalon->device_id, idled); avalon->device_id, idled);
} }
@ -753,6 +755,7 @@ static bool avalon_prepare(struct thr_info *thr)
if (!avalon->works) if (!avalon->works)
quit(1, "Failed to calloc avalon works in avalon_prepare"); quit(1, "Failed to calloc avalon works in avalon_prepare");
info->idle = true;
info->thr = thr; info->thr = thr;
mutex_init(&info->lock); mutex_init(&info->lock);
mutex_init(&info->qlock); mutex_init(&info->qlock);
@ -762,13 +765,13 @@ static bool avalon_prepare(struct thr_info *thr)
if (pthread_create(&info->write_thr, NULL, avalon_send_tasks, (void *)avalon)) if (pthread_create(&info->write_thr, NULL, avalon_send_tasks, (void *)avalon))
quit(1, "Failed to create avalon write_thr"); quit(1, "Failed to create avalon write_thr");
if (pthread_create(&info->read_thr, NULL, avalon_get_results, (void *)avalon))
quit(1, "Failed to create avalon read_thr");
mutex_lock(&info->qlock); mutex_lock(&info->qlock);
pthread_cond_wait(&info->qcond, &info->qlock); pthread_cond_wait(&info->qcond, &info->qlock);
mutex_unlock(&info->qlock); mutex_unlock(&info->qlock);
if (pthread_create(&info->read_thr, NULL, avalon_get_results, (void *)avalon))
quit(1, "Failed to create avalon read_thr");
avalon_init(avalon); avalon_init(avalon);
cgtime(&now); cgtime(&now);

2
driver-avalon.h
View File

@ -107,6 +107,8 @@ struct avalon_info {
pthread_mutex_t qlock; pthread_mutex_t qlock;
pthread_cond_t qcond; pthread_cond_t qcond;
int nonces; int nonces;
bool idle;
}; };
#define AVALON_WRITE_SIZE (sizeof(struct avalon_task)) #define AVALON_WRITE_SIZE (sizeof(struct avalon_task))