Commit 7783ab56318f7f5b0c6c695e4664c0ddcd4ff3ae
2013-04-06T13:01:42
Only get extra work in fill_queue if we don't have any unqueued work in the list.
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
diff --git a/cgminer.c b/cgminer.c
index 8d5eaf7..821d164 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -5754,11 +5754,14 @@ static void fill_queue(struct thr_info *mythr, struct cgpu_info *cgpu, struct de
{
thread_reportout(mythr);
do {
- struct work *work = get_work(mythr, thr_id);
+ struct work *work;
- work->device_diff = MIN(drv->max_diff, work->work_difficulty);
wr_lock(&cgpu->qlock);
- HASH_ADD_INT(cgpu->queued_work, id, work);
+ if (HASH_COUNT(cgpu->queued_work) == cgpu->queued_count) {
+ work = get_work(mythr, thr_id);
+ work->device_diff = MIN(drv->max_diff, work->work_difficulty);
+ HASH_ADD_INT(cgpu->queued_work, id, work);
+ }
wr_unlock(&cgpu->qlock);
/* The queue_full function should be used by the driver to
* actually place work items on the physical device if it
@@ -5778,6 +5781,7 @@ struct work *get_queued(struct cgpu_info *cgpu)
HASH_ITER(hh, cgpu->queued_work, work, tmp) {
if (!work->queued) {
work->queued = true;
+ cgpu->queued_count++;
ret = work;
break;
}
@@ -5828,6 +5832,8 @@ struct work *find_queued_work_bymidstate(struct cgpu_info *cgpu, char *midstate,
void work_completed(struct cgpu_info *cgpu, struct work *work)
{
wr_lock(&cgpu->qlock);
+ if (work->queued)
+ cgpu->queued_count--;
HASH_DEL(cgpu->queued_work, work);
wr_unlock(&cgpu->qlock);
free_work(work);
diff --git a/miner.h b/miner.h
index 68f17c7..3e420fb 100644
--- a/miner.h
+++ b/miner.h
@@ -527,6 +527,7 @@ struct cgpu_info {
pthread_rwlock_t qlock;
struct work *queued_work;
+ unsigned int queued_count;
};
extern bool add_cgpu(struct cgpu_info*);