GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-03-09 20:21:01 +00:00
Code Issues Releases Wiki Activity

usb timeouts - min/max also

Browse Source
This commit is contained in:
Kano 2013-07-20 13:20:24 +10:00
parent 2dffc96e3c
commit 759ce6e7d2
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api.c
View File

@ -3054,17 +3054,23 @@ static int itemstats(struct io_data *io_data, int i, char *id, struct cgminer_st
"%"PRIu64" 0", cgpu->usbinfo.tmo_count); "%"PRIu64" 0", cgpu->usbinfo.tmo_count);
} else { } else {
snprintf(details, sizeof(details), snprintf(details, sizeof(details),
"%"PRIu64" %d=%d/%"PRIu64"/%"PRIu64 "%"PRIu64" %d=%d/%d/%d/%"PRIu64"/%"PRIu64
" %d=%d/%"PRIu64"/%"PRIu64 " %d=%d/%d/%d/%"PRIu64"/%"PRIu64
" %d=%d/%"PRIu64"/%"PRIu64" ", " %d=%d/%d/%d/%"PRIu64"/%"PRIu64" ",
cgpu->usbinfo.tmo_count, cgpu->usbinfo.tmo_count,
USB_TMO_0, cgpu->usbinfo.usb_tmo[0].count, USB_TMO_0, cgpu->usbinfo.usb_tmo[0].count,
cgpu->usbinfo.usb_tmo[0].min_tmo,
cgpu->usbinfo.usb_tmo[0].max_tmo,
cgpu->usbinfo.usb_tmo[0].total_over, cgpu->usbinfo.usb_tmo[0].total_over,
cgpu->usbinfo.usb_tmo[0].total_tmo, cgpu->usbinfo.usb_tmo[0].total_tmo,
USB_TMO_1, cgpu->usbinfo.usb_tmo[1].count, USB_TMO_1, cgpu->usbinfo.usb_tmo[1].count,
cgpu->usbinfo.usb_tmo[1].min_tmo,
cgpu->usbinfo.usb_tmo[1].max_tmo,
cgpu->usbinfo.usb_tmo[1].total_over, cgpu->usbinfo.usb_tmo[1].total_over,
cgpu->usbinfo.usb_tmo[1].total_tmo, cgpu->usbinfo.usb_tmo[1].total_tmo,
USB_TMO_2, cgpu->usbinfo.usb_tmo[2].count, USB_TMO_2, cgpu->usbinfo.usb_tmo[2].count,
cgpu->usbinfo.usb_tmo[2].min_tmo,
cgpu->usbinfo.usb_tmo[2].max_tmo,
cgpu->usbinfo.usb_tmo[2].total_over, cgpu->usbinfo.usb_tmo[2].total_over,
cgpu->usbinfo.usb_tmo[2].total_tmo); cgpu->usbinfo.usb_tmo[2].total_tmo);
} }

12
usbutils.c
View File

@ -2135,12 +2135,13 @@ static void stats(struct cgpu_info *cgpu, struct timeval *tv_start, struct timev
// timeout checks are only done when stats are enabled // timeout checks are only done when stats are enabled
extrams = SECTOMS(tdiff(tv_finish, tv_start)) - timeout; extrams = SECTOMS(tdiff(tv_finish, tv_start)) - timeout;
if (extrams >= USB_TMO_0) { if (extrams >= USB_TMO_0) {
uint32_t totms = (uint32_t)(timeout + extrams);
int offset = 0; int offset = 0;
if (extrams >= USB_TMO_2) { if (extrams >= USB_TMO_2) {
applog(LOG_ERR, "%s%i: TIMEOUT %s took %dms but was %dms", applog(LOG_ERR, "%s%i: TIMEOUT %s took %dms but was %dms",
cgpu->drv->name, cgpu->device_id, cgpu->drv->name, cgpu->device_id,
usb_cmdname(cmd), extrams+timeout, timeout) ; usb_cmdname(cmd), totms, timeout) ;
offset = 2; offset = 2;
} else if (extrams >= USB_TMO_1) } else if (extrams >= USB_TMO_1)
offset = 1; offset = 1;
@ -2148,6 +2149,15 @@ static void stats(struct cgpu_info *cgpu, struct timeval *tv_start, struct timev
cgpu->usbinfo.usb_tmo[offset].count++; cgpu->usbinfo.usb_tmo[offset].count++;
cgpu->usbinfo.usb_tmo[offset].total_over += extrams; cgpu->usbinfo.usb_tmo[offset].total_over += extrams;
cgpu->usbinfo.usb_tmo[offset].total_tmo += timeout; cgpu->usbinfo.usb_tmo[offset].total_tmo += timeout;
if (cgpu->usbinfo.usb_tmo[offset].min_tmo == 0) {
cgpu->usbinfo.usb_tmo[offset].min_tmo = totms;
cgpu->usbinfo.usb_tmo[offset].max_tmo = totms;
} else {
if (cgpu->usbinfo.usb_tmo[offset].min_tmo > totms)
cgpu->usbinfo.usb_tmo[offset].min_tmo = totms;
if (cgpu->usbinfo.usb_tmo[offset].max_tmo < totms)
cgpu->usbinfo.usb_tmo[offset].max_tmo = totms;
}
} }
details = &(usb_stats[cgpu->usbinfo.usbstat - 1].details[cmd * 2 + seq]); details = &(usb_stats[cgpu->usbinfo.usbstat - 1].details[cmd * 2 + seq]);

2
usbutils.h
View File

@ -193,6 +193,8 @@ struct cg_usb_device {
struct cg_usb_tmo { struct cg_usb_tmo {
uint32_t count; uint32_t count;
uint32_t min_tmo;
uint32_t max_tmo;
uint64_t total_over; uint64_t total_over;
uint64_t total_tmo; uint64_t total_tmo;
}; };