Commit 0fbd60ae37bdaf98827087b32d9d64c73ec8e641
2012-08-16T10:24:52
Keep track of staged rollable work item counts to speed up clone_available.
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
diff --git a/cgminer.c b/cgminer.c
index 24dc144..9ae2389 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -188,7 +188,7 @@ pthread_mutex_t control_lock;
int hw_errors;
int total_accepted, total_rejected;
int total_getworks, total_stale, total_discarded;
-static int total_queued;
+static int total_queued, staged_rollable;
unsigned int new_blocks;
static unsigned int work_block;
unsigned int found_blocks;
@@ -2359,6 +2359,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)) {
@@ -2378,6 +2381,7 @@ static bool clone_available(void)
}
mutex_unlock(stgd_lock);
+out:
return cloned;
}
@@ -2896,6 +2900,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;
@@ -2906,6 +2915,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++;
@@ -3959,6 +3970,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);