Commit 62c8a8c1e1d47f8ebccfa252fe213c3c2dcde171
2011-07-22T16:32:38
Allow scan settings to be modified at runtime.
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
diff --git a/main.c b/main.c
index 6ff7f65..48a902e 100644
--- a/main.c
+++ b/main.c
@@ -765,7 +765,7 @@ static void curses_print_status(int thr_id)
whline(statuswin, '-', 80);
wmove(statuswin, logstart - 1, 0);
whline(statuswin, '-', 80);
- mvwprintw(statuswin, gpucursor - 1, 1, "Options: [P]ool management [D]isplay options [Q]uit");
+ mvwprintw(statuswin, gpucursor - 1, 1, "[P]ool management [S]ettings [D]isplay options [Q]uit");
if (thr_id >= 0 && thr_id < gpu_threads) {
int gpu = dev_from_id(thr_id);
@@ -1587,6 +1587,70 @@ retry:
}
opt_log_interval = selected;
}
+ wclear(logwin);
+ immedok(logwin, false);
+ opt_loginput = false;
+}
+
+static void set_options(void)
+{
+ int selected;
+ char input;
+
+ opt_loginput = true;
+ immedok(logwin, true);
+retry:
+ wprintw(logwin, "\nToggle [D]ynamic mode\n");
+ if (opt_dynamic)
+ wprintw(logwin, "[I]ntensity: Dynamic\n");
+ else
+ wprintw(logwin, "[I]ntensity: %d\n", scan_intensity);
+ wprintw(logwin, "[Q]ueue: %d\n[S]cantime: %d\n[R]etries: %d\n[P]ause: %d\n",
+ opt_queue, opt_scantime, opt_retries, opt_fail_pause);
+ wprintw(logwin, "Select an option or any other key to return\n");
+ input = getch();
+
+ if (!strncasecmp(&input, "q", 1)) {
+ selected = curses_int("Extra work items to queue");
+ if (selected < 0 || selected > 9999) {
+ wprintw(logwin, "Invalid selection\n");
+ goto retry;
+ }
+ opt_queue = selected;
+ } else if (!strncasecmp(&input, "d", 1)) {
+ opt_dynamic ^= true;
+ applog(LOG_WARNING, "Dynamic mode %s", opt_dynamic ? "enabled" : "disabled");
+ } else if (!strncasecmp(&input, "i", 1)) {
+ selected = curses_int("Set GPU scan intensity (0-10)");
+ if (selected < 0 || selected > 10) {
+ wprintw(logwin, "Invalid selection\n");
+ goto retry;
+ }
+ opt_dynamic = false;
+ scan_intensity = selected;
+ } else if (!strncasecmp(&input, "s", 1)) {
+ selected = curses_int("Set scantime in seconds");
+ if (selected < 0 || selected > 9999) {
+ wprintw(logwin, "Invalid selection\n");
+ goto retry;
+ }
+ opt_scantime = selected;
+ } else if (!strncasecmp(&input, "r", 1)) {
+ selected = curses_int("Retries before failing (-1 infinite)");
+ if (selected < -1 || selected > 9999) {
+ wprintw(logwin, "Invalid selection\n");
+ goto retry;
+ }
+ opt_retries = selected;
+ } else if (!strncasecmp(&input, "p", 1)) {
+ selected = curses_int("Seconds to pause before network retries");
+ if (selected < 1 || selected > 9999) {
+ wprintw(logwin, "Invalid selection\n");
+ goto retry;
+ }
+ opt_fail_pause = selected;
+ }
+ wclear(logwin);
immedok(logwin, false);
opt_loginput = false;
}
@@ -1609,6 +1673,8 @@ static void *input_thread(void *userdata)
display_options();
else if (!strncasecmp(&input, "p", 1))
display_pools();
+ else if (!strncasecmp(&input, "s", 1))
+ set_options();
}
return NULL;