Commit c699e1281a71040c9b7ef7c1079d28ce54393f88
2014-03-06T00:13:31
Ant - device roll work if possible
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 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
diff --git a/driver-bitmain.c b/driver-bitmain.c
index 3a5d3ae..e1a1d99 100644
--- a/driver-bitmain.c
+++ b/driver-bitmain.c
@@ -1386,9 +1386,10 @@ static bool bitmain_fill(struct cgpu_info *bitmain)
{
struct bitmain_info *info = bitmain->device_data;
int subid, slot;
- struct work *work;
+ struct work *work, *usework;
bool ret = true;
int sendret = 0, sendcount = 0, neednum = 0, queuednum = 0, sendnum = 0, sendlen = 0;
+ int roll, roll_limit;
uint8_t sendbuf[BITMAIN_SENDBUF_SIZE];
cgtimer_t ts_start;
int senderror = 0;
@@ -1402,26 +1403,38 @@ static bool bitmain_fill(struct cgpu_info *bitmain)
ret = true;
goto out_unlock;
}
- if (bitmain->queued >= BITMAIN_MAX_WORK_QUEUE_NUM) {
+
+ if (bitmain->queued >= BITMAIN_MAX_WORK_QUEUE_NUM)
ret = true;
- } else {
+ else
ret = false;
- }
+
while (info->fifo_space > 0) {
neednum = info->fifo_space<8?info->fifo_space:8;
queuednum = bitmain->queued;
applog(LOG_DEBUG, "BTM: Work task queued(%d) fifo space(%d) needsend(%d)",
queuednum, info->fifo_space, neednum);
if (queuednum < neednum) {
- while (true) {
- work = get_queued(bitmain);
- if (unlikely(!work)) {
- break;
- } else {
- applog(LOG_DEBUG, "BTM get work queued number:%d neednum:%d",
+ work = get_queued(bitmain);
+ if (work) {
+ roll_limit = work->drv_rolllimit;
+ roll = 0;
+ while (queuednum < neednum && roll <= roll_limit) {
+ applog(LOG_DEBUG, "BTM get work queued number:%d"
+ " neednum:%d",
queuednum, neednum);
+
+ // Using devflag to say if it was rolled
+ if (roll == 0) {
+ usework = work;
+ usework->devflag = false;
+ } else {
+ usework = copy_work_noffset(work, roll);
+ usework->devflag = true;
+ }
+
subid = bitmain->queued++;
- work->subid = subid;
+ usework->subid = subid;
slot = bitmain->work_array + subid;
if (slot > BITMAIN_ARRAY_SIZE) {
applog(LOG_DEBUG, "bitmain_fill array cyc %d",
@@ -1431,13 +1444,15 @@ static bool bitmain_fill(struct cgpu_info *bitmain)
if (likely(bitmain->works[slot])) {
applog(LOG_DEBUG, "bitmain_fill work_completed %d",
slot);
- work_completed(bitmain, bitmain->works[slot]);
+ // Was it rolled?
+ if (bitmain->works[slot]->devflag)
+ free_work(bitmain->works[slot]);
+ else
+ work_completed(bitmain, bitmain->works[slot]);
}
- bitmain->works[slot] = work;
+ bitmain->works[slot] = usework;
queuednum++;
- if (queuednum >= neednum) {
- break;
- }
+ roll++;
}
}
}