GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Use the reentrant cgsleep functions for usecps in usbutils.

nfactor-troky
Con Kolivas 11 years ago
parent
ee2a5ae8f4
commit
deb7be72c6
2 changed files with 28 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 110
      usbutils.c
  2. 4
      usbutils.h

110
usbutils.c
Unescape View File

@ -2415,23 +2415,11 @@ int _usb_read(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pro
} }
got = 0; got = 0;
if (first && usbdev->usecps) { if (first && usbdev->usecps && usbdev->last_write_siz) {
if (usbdev->last_write_tv.tv_sec && usbdev->last_write_siz) { double need = (double)(usbdev->last_write_siz) /
struct timeval now; (double)(usbdev->cps);
double need;
cgsleep_ms_r(&usbdev->cgt_last_write, need * 1000.0);
cgtime(&now);
need = (double)(usbdev->last_write_siz) /
(double)(usbdev->cps) -
tdiff(&now, &(usbdev->last_write_tv));
// Simple error condition check/avoidance '< 1.0'
if (need > 0.0 && need < 1.0) {
cgpu->usbinfo.read_delay_count++;
cgpu->usbinfo.total_read_delay += need;
cgsleep_ms((unsigned int)(need * 1000.0));
}
}
} }
err = usb_bulk_transfer(usbdev->handle, err = usb_bulk_transfer(usbdev->handle,
usbdev->found->eps[ep].ep, usbdev->found->eps[ep].ep,
@ -2521,23 +2509,11 @@ int _usb_read(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pro
usbbufread = bufleft; usbbufread = bufleft;
} }
got = 0; got = 0;
if (first && usbdev->usecps) { if (first && usbdev->usecps && usbdev->last_write_siz) {
if (usbdev->last_write_tv.tv_sec && usbdev->last_write_siz) { double need = (double)(usbdev->last_write_siz) /
struct timeval now; (double)(usbdev->cps);
double need;
cgsleep_ms_r(&usbdev->cgt_last_write, need * 1000.0);
cgtime(&now);
need = (double)(usbdev->last_write_siz) /
(double)(usbdev->cps) -
tdiff(&now, &(usbdev->last_write_tv));
// Simple error condition check/avoidance '< 1.0'
if (need > 0.0 && need < 1.0) {
cgpu->usbinfo.read_delay_count++;
cgpu->usbinfo.total_read_delay += need;
cgsleep_ms((unsigned int)(need * 1000.0));
}
}
} }
err = usb_bulk_transfer(usbdev->handle, err = usb_bulk_transfer(usbdev->handle,
usbdev->found->eps[ep].ep, ptr, usbdev->found->eps[ep].ep, ptr,
@ -2660,24 +2636,12 @@ int _usb_write(struct cgpu_info *cgpu, int ep, char *buf, size_t bufsiz, int *pr
cgtime(&read_start); cgtime(&read_start);
while (bufsiz > 0) { while (bufsiz > 0) {
sent = 0; sent = 0;
if (usbdev->usecps) { if (usbdev->usecps && usbdev->last_write_siz) {
if (usbdev->last_write_tv.tv_sec && usbdev->last_write_siz) { double need = (double)(usbdev->last_write_siz) /
struct timeval now; (double)(usbdev->cps);
double need;
cgsleep_ms_r(&usbdev->cgt_last_write, need * 1000.0);
cgtime(&now); cgsleep_prepare_r(&usbdev->cgt_last_write);
need = (double)(usbdev->last_write_siz) /
(double)(usbdev->cps) -
tdiff(&now, &(usbdev->last_write_tv));
// Simple error condition check/avoidance '< 1.0'
if (need > 0.0 && need < 1.0) {
cgpu->usbinfo.write_delay_count++;
cgpu->usbinfo.total_write_delay += need;
cgsleep_ms((unsigned int)(need * 1000.0));
}
}
cgtime(&(usbdev->last_write_tv));
usbdev->last_write_siz = bufsiz; usbdev->last_write_siz = bufsiz;
} }
err = usb_bulk_transfer(usbdev->handle, err = usb_bulk_transfer(usbdev->handle,
@ -2756,24 +2720,12 @@ int __usb_transfer(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bReques
USBDEBUG("USB debug: @_usb_transfer() buf=%s", bin2hex((unsigned char *)buf, (size_t)siz)); USBDEBUG("USB debug: @_usb_transfer() buf=%s", bin2hex((unsigned char *)buf, (size_t)siz));
if (usbdev->usecps) { if (usbdev->usecps && usbdev->last_write_siz) {
if (usbdev->last_write_tv.tv_sec && usbdev->last_write_siz) { double need = (double)(usbdev->last_write_siz) /
struct timeval now; (double)(usbdev->cps);
double need;
cgtime(&now); cgsleep_ms_r(&usbdev->cgt_last_write, need * 1000.0);
need = (double)(usbdev->last_write_siz) / cgsleep_prepare_r(&usbdev->cgt_last_write);
(double)(usbdev->cps) -
tdiff(&now, &(usbdev->last_write_tv));
// Simple error condition check/avoidance '< 1.0'
if (need > 0.0 && need < 1.0) {
cgpu->usbinfo.write_delay_count++;
cgpu->usbinfo.total_write_delay += need;
cgsleep_ms((unsigned int)(need * 1000.0));
}
}
cgtime(&(usbdev->last_write_tv));
usbdev->last_write_siz = siz; usbdev->last_write_siz = siz;
} }
STATS_TIMEVAL(&tv_start); STATS_TIMEVAL(&tv_start);
@ -2834,23 +2786,11 @@ int _usb_transfer_read(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRe
*amount = 0; *amount = 0;
if (usbdev->usecps) { if (usbdev->usecps && usbdev->last_write_siz) {
if (usbdev->last_write_tv.tv_sec && usbdev->last_write_siz) { double need = (double)(usbdev->last_write_siz) /
struct timeval now; (double)(usbdev->cps);
double need;
cgtime(&now); cgsleep_ms_r(&usbdev->cgt_last_write, need * 1000.0);
need = (double)(usbdev->last_write_siz) /
(double)(usbdev->cps) -
tdiff(&now, &(usbdev->last_write_tv));
// Simple error condition check/avoidance '< 1.0'
if (need > 0.0 && need < 1.0) {
cgpu->usbinfo.read_delay_count++;
cgpu->usbinfo.total_read_delay += need;
cgsleep_ms((unsigned int)(need * 1000.0));
}
}
} }
STATS_TIMEVAL(&tv_start); STATS_TIMEVAL(&tv_start);
cg_rlock(&cgusb_fd_lock); cg_rlock(&cgusb_fd_lock);

4
usbutils.h
Unescape View File

@ -13,6 +13,8 @@
#include <libusb.h> #include <libusb.h>
#include "util.h"
#define EPI(x) (LIBUSB_ENDPOINT_IN | (unsigned char)(x)) #define EPI(x) (LIBUSB_ENDPOINT_IN | (unsigned char)(x))
#define EPO(x) (LIBUSB_ENDPOINT_OUT | (unsigned char)(x)) #define EPO(x) (LIBUSB_ENDPOINT_OUT | (unsigned char)(x))
@ -186,7 +188,7 @@ struct cg_usb_device {
uint32_t bufsiz; uint32_t bufsiz;
uint32_t bufamt; uint32_t bufamt;
uint16_t PrefPacketSize; uint16_t PrefPacketSize;
struct timeval last_write_tv; cgtimer_t cgt_last_write;
size_t last_write_siz; size_t last_write_siz;
}; };

Write Preview
Loading…
Cancel
Save