GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-11 15:27:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #480 from kanoi/master

Browse Source 
usbutils cps sleep_estimate is not an underestimate
This commit is contained in:
kanoi 2013-08-20 17:37:06 -07:00
commit 10545d33c7
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
usbutils.c
View File

@ -2416,18 +2416,17 @@ int _usb_read(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pro
got = 0; got = 0;
if (first && usbdev->usecps && usbdev->last_write_siz) { if (first && usbdev->usecps && usbdev->last_write_siz) {
cgtimer_t now, already; cgtimer_t now, already_done;
double sleep_estimate; double sleep_estimate;
double write_time = (double)(usbdev->last_write_siz) / double write_time = (double)(usbdev->last_write_siz) /
(double)(usbdev->cps); (double)(usbdev->cps);
cgtimer_time(&now); cgtimer_time(&now);
cgtimer_sub(&now, &usbdev->cgt_last_write, &already); cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done);
sleep_estimate = write_time - cgtimer_to_ms(&already); sleep_estimate = write_time - cgtimer_to_ms(&already_done);
cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
if (sleep_estimate > 0.0) { if (sleep_estimate > 0.0) {
cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
cgpu->usbinfo.read_delay_count++; cgpu->usbinfo.read_delay_count++;
cgpu->usbinfo.total_read_delay += sleep_estimate; 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; got = 0;
if (first && usbdev->usecps && usbdev->last_write_siz) { if (first && usbdev->usecps && usbdev->last_write_siz) {
cgtimer_t now, already; cgtimer_t now, already_done;
double sleep_estimate; double sleep_estimate;
double write_time = (double)(usbdev->last_write_siz) / double write_time = (double)(usbdev->last_write_siz) /
(double)(usbdev->cps); (double)(usbdev->cps);
cgtimer_time(&now); cgtimer_time(&now);
cgtimer_sub(&now, &usbdev->cgt_last_write, &already); cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done);
sleep_estimate = write_time - cgtimer_to_ms(&already); sleep_estimate = write_time - cgtimer_to_ms(&already_done);
cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
if (sleep_estimate > 0.0) { if (sleep_estimate > 0.0) {
cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
cgpu->usbinfo.read_delay_count++; cgpu->usbinfo.read_delay_count++;
cgpu->usbinfo.total_read_delay += sleep_estimate; 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; sent = 0;
if (usbdev->usecps) { if (usbdev->usecps) {
if (usbdev->last_write_siz) { if (usbdev->last_write_siz) {
cgtimer_t now, already; cgtimer_t now, already_done;
double sleep_estimate; double sleep_estimate;
double write_time = (double)(usbdev->last_write_siz) / double write_time = (double)(usbdev->last_write_siz) /
(double)(usbdev->cps); (double)(usbdev->cps);
cgtimer_time(&now); cgtimer_time(&now);
cgtimer_sub(&now, &usbdev->cgt_last_write, &already); cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done);
sleep_estimate = write_time - cgtimer_to_ms(&already); sleep_estimate = write_time - cgtimer_to_ms(&already_done);
cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
if (sleep_estimate > 0.0) { if (sleep_estimate > 0.0) {
cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
cgpu->usbinfo.write_delay_count++; cgpu->usbinfo.write_delay_count++;
cgpu->usbinfo.total_write_delay += sleep_estimate; 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->usecps) {
if (usbdev->last_write_siz) { if (usbdev->last_write_siz) {
cgtimer_t now, already; cgtimer_t now, already_done;
double sleep_estimate; double sleep_estimate;
double write_time = (double)(usbdev->last_write_siz) / double write_time = (double)(usbdev->last_write_siz) /
(double)(usbdev->cps); (double)(usbdev->cps);
cgtimer_time(&now); cgtimer_time(&now);
cgtimer_sub(&now, &usbdev->cgt_last_write, &already); cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done);
sleep_estimate = write_time - cgtimer_to_ms(&already); sleep_estimate = write_time - cgtimer_to_ms(&already_done);
cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
if (sleep_estimate > 0.0) { if (sleep_estimate > 0.0) {
cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
cgpu->usbinfo.write_delay_count++; cgpu->usbinfo.write_delay_count++;
cgpu->usbinfo.total_write_delay += sleep_estimate; 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; *amount = 0;
if (usbdev->usecps && usbdev->last_write_siz) { if (usbdev->usecps && usbdev->last_write_siz) {
cgtimer_t now, already; cgtimer_t now, already_done;
double sleep_estimate; double sleep_estimate;
double write_time = (double)(usbdev->last_write_siz) / double write_time = (double)(usbdev->last_write_siz) /
(double)(usbdev->cps); (double)(usbdev->cps);
cgtimer_time(&now); cgtimer_time(&now);
cgtimer_sub(&now, &usbdev->cgt_last_write, &already); cgtimer_sub(&now, &usbdev->cgt_last_write, &already_done);
sleep_estimate = write_time - cgtimer_to_ms(&already); sleep_estimate = write_time - cgtimer_to_ms(&already_done);
cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
if (sleep_estimate > 0.0) { if (sleep_estimate > 0.0) {
cgsleep_ms_r(&usbdev->cgt_last_write, write_time * 1000.0);
cgpu->usbinfo.read_delay_count++; cgpu->usbinfo.read_delay_count++;
cgpu->usbinfo.total_read_delay += sleep_estimate; cgpu->usbinfo.total_read_delay += sleep_estimate;
} }