Merge commit '0fbd60a' into bfgminer

miner.c

@@ -201,7 +201,7 @@ int hw_errors;
 int total_accepted, total_rejected;
 float total_accepted_weighed;
 int total_getworks, total_stale, total_discarded;
-static int total_queued;
+static int total_queued, staged_rollable;
 unsigned int new_blocks;
 unsigned int found_blocks;
 
@@ -2475,18 +2475,16 @@ static bool stale_work3(struct work *work, bool share, bool failoveronly);
 static inline bool should_roll(struct work *work)
 {
 	struct timeval now;
-	double share_time;
 	time_t expiry;
 
 	if (work->pool != current_pool() && pool_strategy != POOL_LOADBALANCE)
 		return false;
 
-	share_time = total_secs * mining_threads / (total_accepted + 1);
 	if (work->rolltime > opt_scantime)
 		expiry = work->rolltime;
 	else
 		expiry = opt_scantime;
-	expiry -= share_time;
+	expiry = expiry * 2 / 3;
 
 	/* We shouldn't roll if we're unlikely to get one shares' duration
 	 * work out of doing so */
@@ -2546,6 +2544,9 @@ static bool clone_available(void)
 	struct work *work, *tmp;
 	bool cloned = false;
 
+	if (!staged_rollable)
+		goto out;
+
 	mutex_lock(stgd_lock);
 	HASH_ITER(hh, staged_work, work, tmp) {
 		if (can_roll(work) && should_roll(work)) {
@@ -2565,6 +2566,7 @@ static bool clone_available(void)
 	}
 	mutex_unlock(stgd_lock);
 
+out:
 	return cloned;
 }
 
@@ -3238,6 +3240,11 @@ static int tv_sort(struct work *worka, struct work *workb)
 	return worka->tv_staged.tv_sec - workb->tv_staged.tv_sec;
 }
 
+static bool work_rollable(struct work *work)
+{
+	return (!work->clone && work->rolltime);
+}
+
 static bool hash_push(struct work *work)
 {
 	bool rc = true, dec = false;
@@ -3248,6 +3255,8 @@ static bool hash_push(struct work *work)
 	}
 
 	mutex_lock(stgd_lock);
+	if (work_rollable(work))
+		staged_rollable++;
 	if (likely(!getq->frozen)) {
 		HASH_ADD_INT(staged_work, id, work);
 		work->pool->staged++;
@@ -4367,6 +4376,8 @@ static struct work *hash_pop(const struct timespec *abstime)
 		work = staged_work;
 		HASH_DEL(staged_work, work);
 		work->pool->staged--;
+		if (work_rollable(work))
+			staged_rollable--;
 	}
 	mutex_unlock(stgd_lock);