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

Differentiate pool_unusable from pool_unworkable.

Browse Source
This commit is contained in:
Con Kolivas 2013-03-09 09:31:40 +11:00
parent 3b84131f10
commit 90a1114a46
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cgminer.c
View File

@ -2618,7 +2618,8 @@ static struct pool *select_balanced(struct pool *cp)
return ret; return ret;
} }
static bool pool_unusable(struct pool *pool) /* Specifies whether we can use this pool for work or not. */
static bool pool_unworkable(struct pool *pool)
{ {
if (pool->idle) if (pool->idle)
return true; return true;
@ -2652,7 +2653,7 @@ static inline struct pool *select_pool(bool lagging)
if (++rotating_pool >= total_pools) if (++rotating_pool >= total_pools)
rotating_pool = 0; rotating_pool = 0;
pool = pools[rotating_pool]; pool = pools[rotating_pool];
if (!pool_unusable(pool)) if (!pool_unworkable(pool))
break; break;
pool = NULL; pool = NULL;
} }
@ -3375,6 +3376,16 @@ static struct pool *priority_pool(int choice)
static void clear_pool_work(struct pool *pool); static void clear_pool_work(struct pool *pool);
/* Specifies whether we can switch to this pool or not. */
static bool pool_unusable(struct pool *pool)
{
if (pool->idle)
return true;
if (pool->enabled != POOL_ENABLED)
return true;
return false;
}
void switch_pools(struct pool *selected) void switch_pools(struct pool *selected)
{ {
struct pool *pool, *last_pool; struct pool *pool, *last_pool;
@ -3403,7 +3414,7 @@ void switch_pools(struct pool *selected)
case POOL_LOADBALANCE: case POOL_LOADBALANCE:
for (i = 0; i < total_pools; i++) { for (i = 0; i < total_pools; i++) {
pool = priority_pool(i); pool = priority_pool(i);
if (pool_unusable(pool) && pool != selected) if (pool_unusable(pool))
continue; continue;
pool_no = pool->pool_no; pool_no = pool->pool_no;
break; break;
@ -3423,7 +3434,7 @@ void switch_pools(struct pool *selected)
if (next_pool >= total_pools) if (next_pool >= total_pools)
next_pool = 0; next_pool = 0;
pool = pools[next_pool]; pool = pools[next_pool];
if (pool_unusable(pool) && pool != selected) if (pool_unusable(pool))
continue; continue;
pool_no = next_pool; pool_no = next_pool;
break; break;
@ -6130,7 +6141,6 @@ static void *watchpool_thread(void __maybe_unused *userdata)
if (pool_active(pool, true) && pool_tclear(pool, &pool->idle)) if (pool_active(pool, true) && pool_tclear(pool, &pool->idle))
pool_resus(pool); pool_resus(pool);
} }
} }
if (pool_strategy == POOL_ROTATE && now.tv_sec - rotate_tv.tv_sec > 60 * opt_rotate_period) { if (pool_strategy == POOL_ROTATE && now.tv_sec - rotate_tv.tv_sec > 60 * opt_rotate_period) {