Browse Source

Merge commit '51fbcfe' into cg_mrges_20130524b

Conflicts:
	miner.c
Luke Dashjr 12 years ago
parent
commit
fec4e9003b
1 changed files with 3 additions and 4 deletions
  1. 3 4
      miner.c

+ 3 - 4
miner.c

@@ -2487,10 +2487,8 @@ static void curses_print_status(void)
 			pool->sockaddr_url, pool->diff, have_longpoll ? "": "out", pool->rpc_user);
 			pool->sockaddr_url, pool->diff, have_longpoll ? "": "out", pool->rpc_user);
 	}
 	}
 	wclrtoeol(statuswin);
 	wclrtoeol(statuswin);
-	cg_rlock(&ch_lock);
 	mvwprintw(statuswin, 5, 0, " Block: %s  Diff:%s (%s)  Started: %s",
 	mvwprintw(statuswin, 5, 0, " Block: %s  Diff:%s (%s)  Started: %s",
 		  current_hash, block_diff, net_hashrate, blocktime);
 		  current_hash, block_diff, net_hashrate, blocktime);
-	cg_runlock(&ch_lock);
 	mvwhline(statuswin, 6, 0, '-', 80);
 	mvwhline(statuswin, 6, 0, '-', 80);
 	mvwhline(statuswin, statusy - 1, 0, '-', 80);
 	mvwhline(statuswin, statusy - 1, 0, '-', 80);
 	mvwprintw(statuswin, devcursor - 1, 1, "[P]ool management %s[S]ettings [D]isplay options [Q]uit",
 	mvwprintw(statuswin, devcursor - 1, 1, "[P]ool management %s[S]ettings [D]isplay options [Q]uit",
@@ -3736,7 +3734,6 @@ static bool clone_available(void)
 			roll_work(work);
 			roll_work(work);
 			work_clone = make_clone(work);
 			work_clone = make_clone(work);
 			roll_work(work);
 			roll_work(work);
-			applog(LOG_DEBUG, "Pushing cloned available work to stage thread");
 			cloned = true;
 			cloned = true;
 			break;
 			break;
 		}
 		}
@@ -3745,8 +3742,10 @@ static bool clone_available(void)
 out_unlock:
 out_unlock:
 	mutex_unlock(stgd_lock);
 	mutex_unlock(stgd_lock);
 
 
-	if (cloned)
+	if (cloned) {
+		applog(LOG_DEBUG, "Pushing cloned available work to stage thread");
 		stage_work(work_clone);
 		stage_work(work_clone);
+	}
 	return cloned;
 	return cloned;
 }
 }