From 612c0b12c84704af5a64d205321ed57f06e3cc85 Mon Sep 17 00:00:00 2001 From: Kano Date: Wed, 21 Aug 2013 10:02:12 +1000 Subject: [PATCH] usbutils cps sleep_estimate is not an underestimate --- usbutils.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/usbutils.c b/usbutils.c index 4a3fbdc0..1a0fa75d 100644 --- a/usbutils.c +++ b/usbutils.c @@ -2416,18 +2416,17 @@ int _usb_read(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pro got = 0; if (first && usbdev->usecps && usbdev->last_write_siz) { - cgtimer_t now, already; + cgtimer_t now, already_done; double sleep_estimate; double write_time = (double)(usbdev->last_write_siz) / (double)(usbdev->cps); cgtimer_time(&now); - cgtimer_sub(&now, &usbdev->cgt_last_write, &already); - sleep_estimate = write_time - cgtimer_to_ms(&already); - - cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0); + cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done); + sleep_estimate = write_time - cgtimer_to_ms(&already_done); if (sleep_estimate > 0.0) { + cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0); cgpu->usbinfo.read_delay_count++; cgpu->usbinfo.total_read_delay += sleep_estimate; } @@ -2521,18 +2520,17 @@ int _usb_read(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pro } got = 0; if (first && usbdev->usecps && usbdev->last_write_siz) { - cgtimer_t now, already; + cgtimer_t now, already_done; double sleep_estimate; double write_time = (double)(usbdev->last_write_siz) / (double)(usbdev->cps); cgtimer_time(&now); - cgtimer_sub(&now, &usbdev->cgt_last_write, &already); - sleep_estimate = write_time - cgtimer_to_ms(&already); - - cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0); + cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done); + sleep_estimate = write_time - cgtimer_to_ms(&already_done); if (sleep_estimate > 0.0) { + cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0); cgpu->usbinfo.read_delay_count++; cgpu->usbinfo.total_read_delay += sleep_estimate; } @@ -2660,18 +2658,17 @@ int _usb_write(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pr sent = 0; if (usbdev->usecps) { if (usbdev->last_write_siz) { - cgtimer_t now, already; + cgtimer_t now, already_done; double sleep_estimate; double write_time = (double)(usbdev->last_write_siz) / (double)(usbdev->cps); cgtimer_time(&now); - cgtimer_sub(&now, &usbdev->cgt_last_write, &already); - sleep_estimate = write_time - cgtimer_to_ms(&already); - - cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0); + cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done); + sleep_estimate = write_time - cgtimer_to_ms(&already_done); if (sleep_estimate > 0.0) { + cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0); cgpu->usbinfo.write_delay_count++; cgpu->usbinfo.total_write_delay += sleep_estimate; } @@ -2757,18 +2754,17 @@ int __usb_transfer(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bReques if (usbdev->usecps) { if (usbdev->last_write_siz) { - cgtimer_t now, already; + cgtimer_t now, already_done; double sleep_estimate; double write_time = (double)(usbdev->last_write_siz) / (double)(usbdev->cps); cgtimer_time(&now); - cgtimer_sub(&now, &usbdev->cgt_last_write, &already); - sleep_estimate = write_time - cgtimer_to_ms(&already); - - cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0); + cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done); + sleep_estimate = write_time - cgtimer_to_ms(&already_done); if (sleep_estimate > 0.0) { + cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0); cgpu->usbinfo.write_delay_count++; cgpu->usbinfo.total_write_delay += sleep_estimate; } @@ -2835,18 +2831,17 @@ int _usb_transfer_read(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRe *amount = 0; if (usbdev->usecps && usbdev->last_write_siz) { - cgtimer_t now, already; + cgtimer_t now, already_done; double sleep_estimate; double write_time = (double)(usbdev->last_write_siz) / (double)(usbdev->cps); cgtimer_time(&now); - cgtimer_sub(&now, &usbdev->cgt_last_write, &already); - sleep_estimate = write_time - cgtimer_to_ms(&already); - - cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0); + cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done); + sleep_estimate = write_time - cgtimer_to_ms(&already_done); if (sleep_estimate > 0.0) { + cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0); cgpu->usbinfo.read_delay_count++; cgpu->usbinfo.total_read_delay += sleep_estimate; }