From a8be6851a9869acef3fd66a074638aa56ef38632 Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Fri, 8 Jul 2011 11:53:40 +1000
Subject: [PATCH] Formalise the extra work item that the wakeup thread acts as
 a watchdog for.

---
 main.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index 60ece4c6..d109b7a2 100644
--- a/main.c
+++ b/main.c
@@ -122,7 +122,7 @@ static int opt_retries = -1;
 static int opt_fail_pause = 5;
 static int opt_log_interval = 5;
 bool opt_log_output = false;
-static int opt_queue = 0;
+static int opt_queue = 1;
 int opt_vectors;
 int opt_worksize;
 int opt_scantime = 60;
@@ -222,6 +222,11 @@ 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_url(const char *arg, char **p)
 {
 	opt_set_charp(arg, p);
@@ -299,8 +304,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_0_to_9999, opt_show_intval, &opt_queue,
-		     "Number of extra work items to queue"),
+		     set_int_1_to_10, opt_show_intval, &opt_queue,
+		     "Number of extra work items to queue (1 - 10)"),
 	OPT_WITHOUT_ARG("--quiet|-q",
 			opt_set_bool, &opt_quiet,
 			"Disable per-thread hashmeter output"),
@@ -1537,7 +1542,7 @@ static void *wakeup_thread(void *userdata)
 
 	while (1) {
 		sleep(interval);
-		if (!requests_queued())
+		if (requests_queued() < opt_queue)
 			queue_request();
 		hashmeter(-1, &zero_tv, 0);
 		if (unlikely(work_restart[stage_thr_id].restart)) {