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

Count the number of miners idled in avalon to account more accurately for when its result return rate is too low.

Browse Source
This commit is contained in:
Con Kolivas 2013-07-03 21:22:27 +10:00
parent e13c580cac
commit 4b4a13549e
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
driver-avalon.c
View File

@ -496,7 +496,6 @@ static void avalon_idle(struct cgpu_info *avalon, struct avalon_info *info)
{ {
int i; int i;
info->idle = true;
wait_avalon_ready(avalon); wait_avalon_ready(avalon);
/* Send idle to all miners */ /* Send idle to all miners */
for (i = 0; i < info->miner_count; i++) { for (i = 0; i < info->miner_count; i++) {
@ -504,6 +503,7 @@ static void avalon_idle(struct cgpu_info *avalon, struct avalon_info *info)
if (unlikely(avalon_buffer_full(avalon))) if (unlikely(avalon_buffer_full(avalon)))
break; break;
info->idle++;
avalon_init_task(&at, 0, 0, info->fan_pwm, info->timeout, avalon_init_task(&at, 0, 0, info->fan_pwm, info->timeout,
info->asic_count, info->miner_count, 1, 1, info->asic_count, info->miner_count, 1, 1,
info->frequency); info->frequency);
@ -709,9 +709,6 @@ 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_INFO, "%s%d: No matching work - HW error", applog(LOG_INFO, "%s%d: No matching work - HW error",
thr->cgpu->drv->name, thr->cgpu->device_id); thr->cgpu->drv->name, thr->cgpu->device_id);
@ -901,7 +898,7 @@ static void *avalon_send_tasks(void *userdata)
while (likely(!avalon->shutdown)) { while (likely(!avalon->shutdown)) {
int start_count, end_count, i, j, ret; int start_count, end_count, i, j, ret;
struct avalon_task at; struct avalon_task at;
int idled = 0; bool idled = false;
while (avalon_buffer_full(avalon)) while (avalon_buffer_full(avalon))
cgsem_wait(&info->write_sem); cgsem_wait(&info->write_sem);
@ -941,7 +938,6 @@ static void *avalon_send_tasks(void *userdata)
} }
if (likely(j < avalon->queued && !info->overheat && avalon->works[i])) { if (likely(j < avalon->queued && !info->overheat && avalon->works[i])) {
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);
@ -950,7 +946,8 @@ static void *avalon_send_tasks(void *userdata)
} else { } else {
int idle_freq = info->frequency; int idle_freq = info->frequency;
idled++; if (!info->idle++)
idled = true;
if (unlikely(info->overheat && opt_avalon_auto)) if (unlikely(info->overheat && opt_avalon_auto))
idle_freq = AVALON_MIN_FREQUENCY; idle_freq = AVALON_MIN_FREQUENCY;
avalon_init_task(&at, 0, 0, info->fan_pwm, avalon_init_task(&at, 0, 0, info->fan_pwm,
@ -976,8 +973,7 @@ 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 && !info->idle)) { if (unlikely(idled)) {
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);
} }
@ -1222,14 +1218,12 @@ static int64_t avalon_scanhash(struct thr_info *thr)
mutex_lock(&info->lock); mutex_lock(&info->lock);
hash_count = 0xffffffffull * (uint64_t)info->nonces; hash_count = 0xffffffffull * (uint64_t)info->nonces;
avalon->results += info->nonces; avalon->results += info->nonces + info->idle;
if (avalon->results > miner_count) if (avalon->results > miner_count)
avalon->results = miner_count; avalon->results = miner_count;
if (!info->idle && !info->reset) if (!info->reset)
avalon->results -= miner_count / 3; avalon->results -= miner_count / 3;
else info->nonces = info->idle = 0;
avalon->results = miner_count;
info->nonces = 0;
mutex_unlock(&info->lock); mutex_unlock(&info->lock);
/* Check for nothing but consecutive bad results or consistently less /* Check for nothing but consecutive bad results or consistently less

2
driver-avalon.h
View File

@ -131,7 +131,7 @@ struct avalon_info {
int auto_nonces; int auto_nonces;
int auto_hw; int auto_hw;
bool idle; int idle;
bool reset; bool reset;
bool overheat; bool overheat;
bool optimal; bool optimal;