Commit aeaeac088975dc409d396600060c916376fed13b
2011-07-15T10:42:06
Allow queue of zero again and make it default since we can track queued vs staged now and see if the queue needs to be bigger.
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
diff --git a/NEWS b/NEWS
index f37757a..f9807e8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+- Allow queue of zero and make that default again now that we can track how
+work is being queued versus staged. This can decrease reject rates.
+- Queue precisely the number of mining threads as longpoll_staged after a
+new block to not generate local work.
+
+
Version 1.2.6 - July 15, 2011
- Put a current system status line beneath the total work status line
diff --git a/main.c b/main.c
index d440341..2058a7d 100644
--- a/main.c
+++ b/main.c
@@ -126,7 +126,7 @@ static int opt_fail_pause = 5;
static int opt_log_interval = 5;
bool opt_log_output = false;
static bool opt_dynamic = true;
-static int opt_queue = 1;
+static int opt_queue;
int opt_vectors;
int opt_worksize;
int opt_scantime = 60;
@@ -248,11 +248,6 @@ static char *set_int_0_to_10(const char *arg, int *i)
return set_int_range(arg, i, 0, 10);
}
-static char *set_int_1_to_10(const char *arg, int *i)
-{
- return set_int_range(arg, i, 1, 10);
-}
-
static char *set_devices(const char *arg, int *i)
{
char *err = opt_set_intval(arg, i);
@@ -347,8 +342,8 @@ static struct opt_table opt_config_table[] = {
opt_set_bool, &opt_protocol,
"Verbose dump of protocol-level activities"),
OPT_WITH_ARG("--queue|-Q",
- set_int_1_to_10, opt_show_intval, &opt_queue,
- "Number of extra work items to queue (1 - 10)"),
+ set_int_0_to_10, opt_show_intval, &opt_queue,
+ "Number of extra work items to queue (0 - 10)"),
OPT_WITHOUT_ARG("--quiet|-q",
opt_set_bool, &opt_quiet,
"Disable per-thread hashmeter output"),