Commit 03dff61e54af1e1c8c721cc46273afba2a9005e1
2013-02-05T22:00:23
Merge branch 'master' into usb-dev
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
diff --git a/README b/README
index 21f1296..78293ca 100644
--- a/README
+++ b/README
@@ -145,6 +145,7 @@ Options for both config file and command line:
--benchmark Run cgminer in benchmark mode - produces no shares
--compact Use compact display without per device statistics
--debug|-D Enable debug output
+--disable-rejecting Automatically disable pools that continually reject shares
--expiry|-E <arg> Upper bound on how many seconds after getting work we consider a share from it stale (default: 120)
--failover-only Don't leak work to backup pools when primary pool is lagging
--fix-protocol Do not redirect to a different getwork protocol (eg. stratum)
@@ -153,7 +154,6 @@ Options for both config file and command line:
--log|-l <arg> Interval in seconds between log output (default: 5)
--monitor|-m <arg> Use custom pipe cmd for output messages
--net-delay Impose small delays in networking to not overload slow routers
---no-pool-disable Do not automatically disable pools that continually reject shares
--no-submit-stale Don't submit shares if they are detected as stale
--pass|-p <arg> Password for bitcoin JSON-RPC server
--per-device-stats Force verbose mode and output per-device statistics
diff --git a/cgminer.c b/cgminer.c
index ccfb9a6..6085b2a 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -130,7 +130,7 @@ int opt_api_port = 4028;
bool opt_api_listen;
bool opt_api_network;
bool opt_delaynet;
-bool opt_disable_pool = true;
+bool opt_disable_pool;
char *opt_icarus_options = NULL;
char *opt_icarus_timing = NULL;
bool opt_worktime;
@@ -897,6 +897,9 @@ static struct opt_table opt_config_table[] = {
opt_hidden
#endif
),
+ OPT_WITHOUT_ARG("--disable-rejecting",
+ opt_set_bool, &opt_disable_pool,
+ "Automatically disable pools that continually reject shares"),
#if defined(WANT_CPUMINE) && (defined(HAVE_OPENCL) || defined(USE_FPGA))
OPT_WITHOUT_ARG("--enable-cpu|-C",
opt_set_bool, &opt_usecpu,
@@ -995,10 +998,10 @@ static struct opt_table opt_config_table[] = {
#else
opt_hidden
#endif
- ),
+ ),
OPT_WITHOUT_ARG("--no-pool-disable",
opt_set_invbool, &opt_disable_pool,
- "Do not automatically disable pools that continually reject shares"),
+ opt_hidden),
OPT_WITHOUT_ARG("--no-restart",
opt_set_invbool, &opt_restart,
#ifdef HAVE_OPENCL