Browse Source

Merge commit '11c1b67' into bfgminer-3.10.x

Luke Dashjr 11 years ago
parent
commit
a45a48cc8e
1 changed files with 7 additions and 10 deletions
  1. 7 10
      miner.c

+ 7 - 10
miner.c

@@ -1012,6 +1012,8 @@ void adjust_quota_gcd(void)
 	applog(LOG_DEBUG, "Global quota greatest common denominator set to %lu", gcd);
 }
 
+static void enable_pool(struct pool *);
+
 /* Return value is ignored if not called from add_pool_details */
 struct pool *add_pool(void)
 {
@@ -1029,10 +1031,13 @@ struct pool *add_pool(void)
 	mutex_init(&pool->stratum_lock);
 	timer_unset(&pool->swork.tv_transparency);
 
+	pool->idle = true;
 	/* Make sure the pool doesn't think we've been idle since time 0 */
 	pool->tv_idle.tv_sec = ~0UL;
 	
 	cgtime(&pool->cgminer_stats.start_tv);
+	pool->cgminer_stats.getwork_wait_min.tv_sec = MIN_SEC_UNSET;
+	pool->cgminer_pool_stats.getwork_wait_min.tv_sec = MIN_SEC_UNSET;
 
 	pool->rpc_proxy = NULL;
 	pool->quota = 1;
@@ -1044,6 +1049,8 @@ struct pool *add_pool(void)
 	pools[total_pools++] = pool;
 	
 	adjust_quota_gcd();
+	
+	enable_pool(pool);
 
 	return pool;
 }
@@ -11512,9 +11519,6 @@ int main(int argc, char *argv[])
 		struct pool *pool = pools[i];
 		size_t siz;
 
-		pool->cgminer_stats.getwork_wait_min.tv_sec = MIN_SEC_UNSET;
-		pool->cgminer_pool_stats.getwork_wait_min.tv_sec = MIN_SEC_UNSET;
-
 		if (!pool->rpc_url)
 			quit(1, "No URI supplied for pool %u", i);
 		
@@ -11564,13 +11568,6 @@ int main(int argc, char *argv[])
 	if (opt_benchmark)
 		goto begin_bench;
 
-	for (i = 0; i < total_pools; i++) {
-		struct pool *pool  = pools[i];
-
-		enable_pool(pool);
-		pool->idle = true;
-	}
-
 	applog(LOG_NOTICE, "Probing for an alive pool");
 	do {
 		bool still_testing;