GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-08-26 13:52:02 +00:00
Code Issues Releases Wiki Activity

Added a 'disable-pool' option to the json configuration, to allow pools to be started up disabled

Browse Source
This commit is contained in:
Joe4782 2014-01-25 20:33:45 +00:00
parent 712385160b
commit 1d81196238
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
miner.h
View File

@ -1177,6 +1177,7 @@ struct pool {
bool idle; bool idle;
bool lagging; bool lagging;
bool probed; bool probed;
bool start_disabled;
enum pool_enable enabled; enum pool_enable enabled;
bool submit_old; bool submit_old;
bool removed; bool removed;

45
sgminer.c
View File

@ -211,6 +211,7 @@ int total_pools, enabled_pools;
enum pool_strategy pool_strategy = POOL_FAILOVER; enum pool_strategy pool_strategy = POOL_FAILOVER;
int opt_rotate_period; int opt_rotate_period;
static int total_urls, total_users, total_passes, total_userpasses, total_poolnames; static int total_urls, total_users, total_passes, total_userpasses, total_poolnames;
static int json_array_index;
static static
#ifndef HAVE_CURSES #ifndef HAVE_CURSES
@ -741,6 +742,29 @@ static char *set_poolname(char *arg)
return NULL; return NULL;
} }
static char *set_disable_pool(char *arg)
{
struct pool *pool;
int len, disabled;
while ((json_array_index + 1) > total_pools)
add_pool();
pool = pools[json_array_index];
len = strlen(arg);
if (len < 0)
{
disabled = 1;
}
else
{
disabled = atoi(arg);
}
pool->start_disabled = (disabled > 0);
return NULL;
}
static char *set_quota(char *arg) static char *set_quota(char *arg)
{ {
char *semicolon = strchr(arg, ';'), *url; char *semicolon = strchr(arg, ';'), *url;
@ -1024,6 +1048,9 @@ static struct opt_table opt_config_table[] = {
OPT_WITH_ARG("--device|-d", OPT_WITH_ARG("--device|-d",
set_devices, NULL, NULL, set_devices, NULL, NULL,
"Select device to use, one value, range and/or comma separated (e.g. 0-2,4) default: all"), "Select device to use, one value, range and/or comma separated (e.g. 0-2,4) default: all"),
OPT_WITH_ARG("--disable-pool",
set_disable_pool, NULL, NULL,
"Start the pool in a disabled state, so that it is not automatically chosen for mining"),
OPT_WITHOUT_ARG("--disable-rejecting", OPT_WITHOUT_ARG("--disable-rejecting",
opt_set_bool, &opt_disable_pool, opt_set_bool, &opt_disable_pool,
"Automatically disable pools that continually reject shares"), "Automatically disable pools that continually reject shares"),
@ -1254,12 +1281,14 @@ static char *load_config(const char *arg, void __maybe_unused *unused);
static int fileconf_load; static int fileconf_load;
static char *parse_config(json_t *config, bool fileconf) static char *parse_config(json_t *config, bool fileconf, int parent_iteration)
{ {
static char err_buf[200]; static char err_buf[200];
struct opt_table *opt; struct opt_table *opt;
json_t *val; json_t *val;
json_array_index = parent_iteration;
if (fileconf && !fileconf_load) if (fileconf && !fileconf_load)
fileconf_load = 1; fileconf_load = 1;
@ -1295,7 +1324,10 @@ static char *parse_config(json_t *config, bool fileconf)
if (json_is_string(json_array_get(val, n))) if (json_is_string(json_array_get(val, n)))
err = opt->cb_arg(json_string_value(json_array_get(val, n)), opt->u.arg); err = opt->cb_arg(json_string_value(json_array_get(val, n)), opt->u.arg);
else if (json_is_object(json_array_get(val, n))) else if (json_is_object(json_array_get(val, n)))
err = parse_config(json_array_get(val, n), false); {
err = parse_config(json_array_get(val, n), false, n);
json_array_index = parent_iteration;
}
} }
} else if ((opt->type & OPT_NOARG) && json_is_true(val)) } else if ((opt->type & OPT_NOARG) && json_is_true(val))
err = opt->cb(opt->u.arg); err = opt->cb(opt->u.arg);
@ -1360,7 +1392,7 @@ static char *load_config(const char *arg, void __maybe_unused *unused)
/* Parse the config now, so we can override it. That can keep pointers /* Parse the config now, so we can override it. That can keep pointers
* so don't free config object. */ * so don't free config object. */
return parse_config(config, true); return parse_config(config, true, 0);
} }
static char *set_default_config(const char *arg) static char *set_default_config(const char *arg)
@ -7843,7 +7875,14 @@ int main(int argc, char *argv[])
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->start_disabled)
{
disable_pool(pool);
}
else
{
enable_pool(pool); enable_pool(pool);
}
pool->idle = true; pool->idle = true;
} }