Commit fc454e888bca533e14417210383e675bb9a442e6
2011-09-05T13:43:50
Update the status window only from the watchdog thread, do not rewrite the top status messages and only refresh once all the status window is complete, clearing the window each time to avoid corruption.
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
diff --git a/main.c b/main.c
index 8deab82..af0cd51 100644
--- a/main.c
+++ b/main.c
@@ -1688,7 +1688,7 @@ static void text_print_status(int thr_id)
}
/* Must be called with curses mutex lock held and curses_active */
-static void curses_print_status(int thr_id)
+static void curses_print_status(void)
{
struct pool *pool = current_pool();
@@ -1716,7 +1716,12 @@ static void curses_print_status(int thr_id)
mvwhline(statuswin, logstart - 1, 0, '-', 80);
mvwprintw(statuswin, gpucursor - 1, 1, "[P]ool management %s[S]ettings [D]isplay options [Q]uit",
opt_g_threads ? "[G]PU management " : "");
+ /* The window will be updated once we're done with all the devices */
+ wnoutrefresh(statuswin);
+}
+static void curses_print_devstatus(int thr_id)
+{
if (thr_id >= 0 && thr_id < gpu_threads) {
int gpu = dev_from_id(thr_id);
struct cgpu_info *cgpu = &gpus[gpu];
@@ -1755,15 +1760,12 @@ static void curses_print_status(int thr_id)
cgpu->efficiency, cgpu->utility);
wclrtoeol(statuswin);
}
- wrefresh(statuswin);
+ wnoutrefresh(statuswin);
}
static void print_status(int thr_id)
{
- if (curses_active_locked()) {
- curses_print_status(thr_id);
- unlock_curses();
- } else
+ if (!curses_active)
text_print_status(thr_id);
}
@@ -4484,12 +4486,12 @@ static void *watchdog_thread(void *userdata)
hashmeter(-1, &zero_tv, 0);
if (curses_active_locked()) {
+ change_logwinsize();
+ curses_print_status();
for (i = 0; i < mining_threads; i++)
- curses_print_status(i);
- if (!change_logwinsize()) {
- redrawwin(statuswin);
- redrawwin(logwin);
- }
+ curses_print_devstatus(i);
+ clearok(statuswin, true);
+ doupdate();
unlock_curses();
}