Commit 222d4ee6bf961f0a694bf74f2684b7caa539e171
2011-07-12T17:29:59
Make curses completely inactivated in quiet mode and do not update curses code in wakeup thread when curses is inactive.
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
diff --git a/main.c b/main.c
index eb12afe..8d59f6c 100644
--- a/main.c
+++ b/main.c
@@ -1706,16 +1706,18 @@ static void *wakeup_thread(void *userdata)
hashmeter(-1, &zero_tv, 0);
- pthread_mutex_lock(&curses_lock);
- getmaxyx(mainwin, y, x);
- getmaxyx(logwin, logy, logx);
- y -= logcursor;
- /* Detect screen size change */
- if (x != logx || y != logy)
- wresize(logwin, y, x);
- redrawwin(logwin);
- redrawwin(statuswin);
- pthread_mutex_unlock(&curses_lock);
+ if (curses_active) {
+ pthread_mutex_lock(&curses_lock);
+ getmaxyx(mainwin, y, x);
+ getmaxyx(logwin, logy, logx);
+ y -= logcursor;
+ /* Detect screen size change */
+ if (x != logx || y != logy)
+ wresize(logwin, y, x);
+ redrawwin(logwin);
+ redrawwin(statuswin);
+ pthread_mutex_unlock(&curses_lock);
+ }
if (unlikely(work_restart[stage_thr_id].restart)) {
restart_threads(false);
@@ -1976,17 +1978,19 @@ int main (int argc, char *argv[])
pthread_mutex_unlock(&hash_lock);
/* Set up the ncurses interface */
- mainwin = initscr();
- statuswin = newwin(logstart, 80, 0, 0);
- getmaxyx(mainwin, y, x);
- logwin = newwin(y - logcursor, 0, logcursor, 0);
- idlok(logwin, true);
- scrollok(logwin, true);
- leaveok(logwin, true);
- leaveok(statuswin, true);
- curses_active = true;
- for (i = 0; i < mining_threads; i++)
- print_status(i);
+ if (!opt_quiet) {
+ mainwin = initscr();
+ statuswin = newwin(logstart, 80, 0, 0);
+ getmaxyx(mainwin, y, x);
+ logwin = newwin(y - logcursor, 0, logcursor, 0);
+ idlok(logwin, true);
+ scrollok(logwin, true);
+ leaveok(logwin, true);
+ leaveok(statuswin, true);
+ curses_active = true;
+ for (i = 0; i < mining_threads; i++)
+ print_status(i);
+ }
/* Now that everything's ready put enough work in the queue */
for (i = 0; i < opt_queue + mining_threads; i++) {
@@ -2006,10 +2010,12 @@ int main (int argc, char *argv[])
applog(LOG_INFO, "workio thread dead, exiting.");
- delwin(logwin);
- delwin(statuswin);
- endwin();
- refresh();
+ if (curses_active) {
+ delwin(logwin);
+ delwin(statuswin);
+ endwin();
+ refresh();
+ }
return 0;
}