Browse Source

Bugfix: Avoid unnecessary locks inside curses_print_status, which is called with the console lock held

Conflicts:
	miner.c
Luke Dashjr 13 years ago
parent
commit
db2e13d293
1 changed files with 2 additions and 2 deletions
  1. 2 2
      miner.c

+ 2 - 2
miner.c

@@ -2227,7 +2227,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(void)
 {
-	struct pool *pool = current_pool();
+	struct pool *pool = currentpool;
 	struct timeval now, tv;
 	float efficiency;
 
@@ -2259,7 +2259,7 @@ static void curses_print_status(void)
 	mvwprintw(statuswin, 2, 0, " %s", statusline);
 	wclrtoeol(statuswin);
 	mvwprintw(statuswin, 3, 0, " ST: %d  DW: %d  GW: %d  LW: %d  GF: %d  NB: %d  AS: %d  RF: %d  E: %.2f",
-		total_staged(), total_discarded,
+		__total_staged(), total_discarded,
 		total_getworks,
 		local_work,
 		total_go,