Commit a48895829eda84ae754e50d4640cb737e4cafee5
2011-07-27T09:41:52
Update both windows separately, but not at the same time to prevent the double refresh crash that old libncurses has. Do the window resize check only when about to redraw the log window to minimise ncurses cpu usage.
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
diff --git a/main.c b/main.c
index a84550b..d37d90d 100644
--- a/main.c
+++ b/main.c
@@ -832,7 +832,7 @@ static void print_status(int thr_id)
}
/* Check for window resize. Called with curses mutex locked */
-static void check_logwinsize(void)
+static inline void check_logwinsize(void)
{
int x, y, logx, logy;
@@ -849,7 +849,6 @@ static void wlog(const char *f, ...)
{
va_list ap;
- check_logwinsize();
va_start(ap, f);
vw_printw(logwin, f, ap);
va_end(ap);
@@ -862,8 +861,6 @@ static void wlogprint(const char *f, ...)
pthread_mutex_lock(&curses_lock);
- check_logwinsize();
-
va_start(ap, f);
vw_printw(logwin, f, ap);
va_end(ap);
@@ -877,7 +874,6 @@ void log_curses(const char *f, va_list ap)
if (curses_active) {
if (!opt_loginput) {
pthread_mutex_lock(&curses_lock);
- check_logwinsize();
vw_printw(logwin, f, ap);
wrefresh(logwin);
pthread_mutex_unlock(&curses_lock);
@@ -3222,6 +3218,7 @@ static void *watchdog_thread(void *userdata)
const unsigned int interval = opt_log_interval / 2 ? : 1;
static struct timeval rotate_tv;
struct timeval zero_tv;
+ bool statwin = false;
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
@@ -3239,10 +3236,16 @@ static void *watchdog_thread(void *userdata)
hashmeter(-1, &zero_tv, 0);
if (curses_active) {
+ statwin ^= true;
pthread_mutex_lock(&curses_lock);
for (i = 0; i < mining_threads; i++)
curses_print_status(i);
- redrawwin(mainwin);
+ if (statwin)
+ redrawwin(statuswin);
+ else {
+ check_logwinsize();
+ redrawwin(logwin);
+ }
pthread_mutex_unlock(&curses_lock);
}