mirror of
https://github.com/GOSTSec/sgminer
synced 2025-02-02 10:04:33 +00:00
Use pool_unworkable in select_balanced as well.
This commit is contained in:
parent
90a1114a46
commit
d932a36c46
26
cgminer.c
26
cgminer.c
@ -2593,6 +2593,18 @@ out:
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Specifies whether we can use this pool for work or not. */
|
||||||
|
static bool pool_unworkable(struct pool *pool)
|
||||||
|
{
|
||||||
|
if (pool->idle)
|
||||||
|
return true;
|
||||||
|
if (pool->enabled != POOL_ENABLED)
|
||||||
|
return true;
|
||||||
|
if (pool->has_stratum && !pool->stratum_active)
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/* In balanced mode, the amount of diff1 solutions per pool is monitored as a
|
/* In balanced mode, the amount of diff1 solutions per pool is monitored as a
|
||||||
* rolling average per 10 minutes and if pools start getting more, it biases
|
* rolling average per 10 minutes and if pools start getting more, it biases
|
||||||
* away from them to distribute work evenly. The share count is reset to the
|
* away from them to distribute work evenly. The share count is reset to the
|
||||||
@ -2606,7 +2618,7 @@ static struct pool *select_balanced(struct pool *cp)
|
|||||||
for (i = 0; i < total_pools; i++) {
|
for (i = 0; i < total_pools; i++) {
|
||||||
struct pool *pool = pools[i];
|
struct pool *pool = pools[i];
|
||||||
|
|
||||||
if (pool->idle || pool->enabled != POOL_ENABLED)
|
if (pool_unworkable(pool))
|
||||||
continue;
|
continue;
|
||||||
if (pool->shares < lowest) {
|
if (pool->shares < lowest) {
|
||||||
lowest = pool->shares;
|
lowest = pool->shares;
|
||||||
@ -2618,18 +2630,6 @@ static struct pool *select_balanced(struct pool *cp)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Specifies whether we can use this pool for work or not. */
|
|
||||||
static bool pool_unworkable(struct pool *pool)
|
|
||||||
{
|
|
||||||
if (pool->idle)
|
|
||||||
return true;
|
|
||||||
if (pool->enabled != POOL_ENABLED)
|
|
||||||
return true;
|
|
||||||
if (pool->has_stratum && !pool->stratum_active)
|
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Select any active pool in a rotating fashion when loadbalance is chosen */
|
/* Select any active pool in a rotating fashion when loadbalance is chosen */
|
||||||
static inline struct pool *select_pool(bool lagging)
|
static inline struct pool *select_pool(bool lagging)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user