Browse Source

Start mining as soon as any pool is found active and rely on the watchpool thread to bring up other pools.

nfactor-troky
Con Kolivas 13 years ago
parent
commit
8e682a2c32
  1. 24
      cgminer.c

24
cgminer.c

@ -4056,12 +4056,12 @@ void enable_device(struct cgpu_info *cgpu)
int main (int argc, char *argv[]) int main (int argc, char *argv[])
{ {
unsigned int i, pools_active = 0;
unsigned int j, k;
struct block *block, *tmpblock; struct block *block, *tmpblock;
struct work *work, *tmpwork; struct work *work, *tmpwork;
bool pools_active = false;
struct sigaction handler; struct sigaction handler;
struct thr_info *thr; struct thr_info *thr;
unsigned int i, j, k;
/* This dangerous functions tramples random dynamically allocated /* This dangerous functions tramples random dynamically allocated
* variables so do it before anything at all */ * variables so do it before anything at all */
@ -4318,24 +4318,28 @@ int main (int argc, char *argv[])
/* We use the getq mutex as the staged lock */ /* We use the getq mutex as the staged lock */
stgd_lock = &getq->mutex; stgd_lock = &getq->mutex;
retry_pools:
/* Test each pool to see if we can retrieve and use work and for what
* it supports */
for (i = 0; i < total_pools; i++) { for (i = 0; i < total_pools; i++) {
struct pool *pool; struct pool *pool = pools[i];
pool = pools[i];
pool->enabled = true; pool->enabled = true;
pool->idle = true;
}
applog(LOG_NOTICE, "Probing for an alive pool");
do {
/* Look for at least one active pool before starting */
for (i = 0; i < total_pools; i++) {
struct pool *pool = pools[i];
if (pool_active(pool, false)) { if (pool_active(pool, false)) {
if (!currentpool) if (!currentpool)
currentpool = pool; currentpool = pool;
applog(LOG_INFO, "Pool %d %s active", pool->pool_no, pool->rpc_url); applog(LOG_INFO, "Pool %d %s active", pool->pool_no, pool->rpc_url);
pools_active++; pools_active = true;
break;
} else { } else {
if (pool == currentpool) if (pool == currentpool)
currentpool = NULL; currentpool = NULL;
applog(LOG_WARNING, "Unable to get work from pool %d %s", pool->pool_no, pool->rpc_url); applog(LOG_WARNING, "Unable to get work from pool %d %s", pool->pool_no, pool->rpc_url);
pool->idle = true;
} }
} }
@ -4360,8 +4364,8 @@ retry_pools:
nocbreak(); nocbreak();
} else } else
quit(0, "No servers could be used! Exiting."); quit(0, "No servers could be used! Exiting.");
goto retry_pools;
} }
} while (!pools_active);
if (want_longpoll) if (want_longpoll)
start_longpoll(); start_longpoll();

Loading…
Cancel
Save