Commit 7841486f83d1991fc7a3cf7eb21d4e83a5fccb13
2011-07-21T14:41:12
Add a bool for explicit enabling/disabling of pools.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
diff --git a/main.c b/main.c
index 4b89207..a9261ea 100644
--- a/main.c
+++ b/main.c
@@ -912,10 +912,13 @@ static int rotating_pool;
static inline struct pool *select_pool(void)
{
if (pool_strategy == POOL_LOADBALANCE) {
+ struct pool *pool;
+
rotating_pool++;
if (rotating_pool >= total_pools)
rotating_pool = 0;
- if (!pools[rotating_pool].idle)
+ pool = &pools[rotating_pool];
+ if (!pool->idle && pool->enabled)
return &pools[rotating_pool];
}
return current_pool();
@@ -1207,7 +1210,7 @@ static void switch_pools(void)
for (i = 0; i < total_pools; i++) {
pool = &pools[i];
- if (!pool->idle)
+ if (!pool->idle && pool->enabled)
pools_active++;
}
@@ -1223,7 +1226,7 @@ static void switch_pools(void)
case POOL_FAILOVER:
case POOL_LOADBALANCE:
for (i = 0; i < total_pools; i++) {
- if (!pools[i].idle) {
+ if (!pools[i].idle && pools[i].enabled) {
pool_no = i;
break;
}
@@ -1339,7 +1342,8 @@ static void display_pools(void)
if (i == cp)
wattron(logwin, A_BOLD);
- wprintw(logwin, "Pool %d: %s User:%s\n", pool->pool_no, pool->rpc_url, pool->rpc_user);
+ wprintw(logwin, "%s Pool %d: %s User:%s\n", pool->enabled? "Enabled" : "Disabled",
+ pool->pool_no, pool->rpc_url, pool->rpc_user);
wattroff(logwin, A_BOLD);
}
//wprintw(logwin, "[A]dd pool [S]witch pool [D]isable pool [E]nable pool");
@@ -2512,6 +2516,9 @@ static void *watchdog_thread(void *userdata)
for (i = 0; i < total_pools; i++) {
struct pool *pool = &pools[i];
+ if (!pool->enabled)
+ continue;
+
/* Test pool is idle once every minute */
if (pool->idle && now.tv_sec - pool->tv_idle.tv_sec > 60) {
gettimeofday(&pool->tv_idle, NULL);
@@ -2902,10 +2909,9 @@ int main (int argc, char *argv[])
if (pool_active(pool)) {
applog(LOG_INFO, "Pool %d %s active", pool->pool_no, pool->rpc_url);
pools_active++;
- } else {
+ pool->enabled = true;
+ } else
applog(LOG_WARNING, "Unable to get work from pool %d %s", pool->pool_no, pool->rpc_url);
- pool->idle = true;
- }
}
if (!pools_active)
diff --git a/miner.h b/miner.h
index 4396f14..bf79097 100644
--- a/miner.h
+++ b/miner.h
@@ -272,6 +272,7 @@ struct pool {
bool idle;
bool has_rolltime;
bool probed;
+ bool enabled;
unsigned int getwork_requested;
unsigned int stale_shares;
unsigned int discarded_work;