Commit e87ff7c177ca1fb327c96acf09da0c77238d6a12
2012-07-29T13:15:39
Keep a counter of enabled pools and use that instead of iterating over the pool list. Use that value to ensure we don't set the last remaining active pool to the rejecting state.
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 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180
diff --git a/api.c b/api.c
index 943c0d5..342c371 100644
--- a/api.c
+++ b/api.c
@@ -2155,7 +2155,7 @@ static void disablepool(__maybe_unused SOCKETTYPE c, char *param, bool isjson, _
return;
}
- if (active_pools() <= 1) {
+ if (enabled_pools <= 1) {
strcpy(io_buffer, message(MSG_DISLASTP, id, NULL, isjson));
return;
}
diff --git a/cgminer.c b/cgminer.c
index 3d8be56..28a1b10 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -200,7 +200,7 @@ unsigned int total_go, total_ro;
struct pool **pools;
static struct pool *currentpool = NULL;
-int total_pools;
+int total_pools, enabled_pools;
enum pool_strategy pool_strategy = POOL_FAILOVER;
int opt_rotate_period;
static int total_urls, total_users, total_passes, total_userpasses;
@@ -1671,6 +1671,28 @@ bool regeneratehash(const struct work *work)
return false;
}
+static void enable_pool(struct pool *pool)
+{
+ if (pool->enabled != POOL_ENABLED) {
+ enabled_pools++;
+ pool->enabled = POOL_ENABLED;
+ }
+}
+
+static void disable_pool(struct pool *pool)
+{
+ if (pool->enabled == POOL_ENABLED)
+ enabled_pools--;
+ pool->enabled = POOL_DISABLED;
+}
+
+static void reject_pool(struct pool *pool)
+{
+ if (pool->enabled == POOL_ENABLED)
+ enabled_pools--;
+ pool->enabled = POOL_REJECTING;
+}
+
static bool submit_upstream_work(const struct work *work, CURL *curl)
{
char *hexstr = NULL;
@@ -1766,7 +1788,7 @@ static bool submit_upstream_work(const struct work *work, CURL *curl)
* longpoll */
if (unlikely(pool->enabled == POOL_REJECTING)) {
applog(LOG_WARNING, "Rejecting pool %d now accepting shares, re-enabling!", pool->pool_no);
- pool->enabled = POOL_ENABLED;
+ enable_pool(pool);
switch_pools(NULL);
}
} else {
@@ -1811,13 +1833,13 @@ static bool submit_upstream_work(const struct work *work, CURL *curl)
* ensued. Do not do this if we know the share just happened to
* be stale due to networking delays.
*/
- if (pool->seq_rejects > 10 && !work->stale && opt_disable_pool && total_pools > 1) {
+ if (pool->seq_rejects > 10 && !work->stale && opt_disable_pool && enabled_pools > 1) {
double utility = total_accepted / ( total_secs ? total_secs : 1 ) * 60;
if (pool->seq_rejects > utility * 3) {
applog(LOG_WARNING, "Pool %d rejected %d sequential shares, disabling!",
pool->pool_no, pool->seq_rejects);
- pool->enabled = POOL_REJECTING;
+ reject_pool(pool);
if (pool == current_pool())
switch_pools(NULL);
pool->seq_rejects = 0;
@@ -2759,18 +2781,6 @@ int curses_int(const char *query)
static bool input_pool(bool live);
#endif
-int active_pools(void)
-{
- int ret = 0;
- int i;
-
- for (i = 0; i < total_pools; i++) {
- if ((pools[i])->enabled == POOL_ENABLED)
- ret++;
- }
- return ret;
-}
-
#ifdef HAVE_CURSES
static void display_pool_summary(struct pool *pool)
{
@@ -3047,7 +3057,7 @@ retry:
wlogprint("Unable to remove pool due to activity\n");
goto retry;
}
- pool->enabled = POOL_DISABLED;
+ disable_pool(pool);
remove_pool(pool);
goto updated;
} else if (!strncasecmp(&input, "s", 1)) {
@@ -3057,11 +3067,11 @@ retry:
goto retry;
}
pool = pools[selected];
- pool->enabled = POOL_ENABLED;
+ enable_pool(pool);
switch_pools(pool);
goto updated;
} else if (!strncasecmp(&input, "d", 1)) {
- if (active_pools() <= 1) {
+ if (enabled_pools <= 1) {
wlogprint("Cannot disable last pool");
goto retry;
}
@@ -3071,7 +3081,7 @@ retry:
goto retry;
}
pool = pools[selected];
- pool->enabled = POOL_DISABLED;
+ disable_pool(pool);
if (pool == current_pool())
switch_pools(NULL);
goto updated;
@@ -3082,7 +3092,7 @@ retry:
goto retry;
}
pool = pools[selected];
- pool->enabled = POOL_ENABLED;
+ enable_pool(pool);
if (pool->prio < current_pool()->prio)
switch_pools(pool);
goto updated;
@@ -4869,7 +4879,7 @@ void add_pool_details(bool live, char *url, char *user, char *pass)
/* Test the pool is not idle if we're live running, otherwise
* it will be tested separately */
- pool->enabled = POOL_ENABLED;
+ enable_pool(pool);
if (live && !pool_active(pool, false))
pool->idle = true;
}
@@ -5197,7 +5207,7 @@ int main(int argc, char *argv[])
strcpy(pool->rpc_url, "Benchmark");
pool->rpc_user = pool->rpc_url;
pool->rpc_pass = pool->rpc_url;
- pool->enabled = POOL_ENABLED;
+ enable_pool(pool);
pool->idle = false;
successful_connect = true;
}
@@ -5440,7 +5450,7 @@ int main(int argc, char *argv[])
for (i = 0; i < total_pools; i++) {
struct pool *pool = pools[i];
- pool->enabled = POOL_ENABLED;
+ enable_pool(pool);
pool->idle = true;
}
diff --git a/miner.h b/miner.h
index 68c6e15..11dcb5f 100644
--- a/miner.h
+++ b/miner.h
@@ -606,7 +606,7 @@ extern int set_memoryclock(int gpu, int iMemoryClock);
extern void api(int thr_id);
extern struct pool *current_pool(void);
-extern int active_pools(void);
+extern int enabled_pools;
extern void add_pool_details(bool live, char *url, char *user, char *pass);
#define MAX_GPUDEVICES 16