Commit 023ca6a11df9d387a5e14a6982caf329761fbc5b
2013-10-07T17:17:20
Remove devlock lock contention statistics since transfers are all done under read lock now.
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/api.c b/api.c
index 06ddbbe..ffbf4a1 100644
--- a/api.c
+++ b/api.c
@@ -3089,7 +3089,6 @@ static int itemstats(struct io_data *io_data, int i, char *id, struct cgminer_st
if (cgpu) {
#ifdef USE_USBUTILS
char details[256];
- int val;
if (cgpu->usbinfo.pipe_count)
snprintf(details, sizeof(details),
@@ -3143,14 +3142,6 @@ static int itemstats(struct io_data *io_data, int i, char *id, struct cgminer_st
root = api_add_string(root, "USB tmo", details, true);
root = api_add_int(root, "USB cancellations", &cgpu->usb_cancels, false);
- root = api_add_int(root, "USB bulk reads", &cgpu->usb_bulk_reads, false);
- val = cgpu->usb_rlock_total_wait / (cgpu->usb_bulk_reads ? : 1);
- root = api_add_int(root, "USB avg rlock ms wait", &val, true);
- root = api_add_int(root, "USB max rlock ms wait", &cgpu->usb_rlock_max_wait, false);
- root = api_add_int(root, "USB bulk writes", &cgpu->usb_bulk_writes, false);
- val = cgpu->usb_wlock_total_wait / (cgpu->usb_bulk_writes ? : 1);
- root = api_add_int(root, "USB avg wlock ms wait", &val, true);
- root = api_add_int(root, "USB max wlock ms wait", &cgpu->usb_wlock_max_wait, false);
#endif
}
diff --git a/miner.h b/miner.h
index aa6f81b..30b6cd7 100644
--- a/miner.h
+++ b/miner.h
@@ -472,12 +472,6 @@ struct cgpu_info {
#endif
#ifdef USE_USBUTILS
struct cg_usb_info usbinfo;
- int usb_bulk_writes;
- int usb_bulk_reads;
- int usb_wlock_total_wait;
- int usb_rlock_total_wait;
- int usb_wlock_max_wait;
- int usb_rlock_max_wait;
int usb_cancels;
#endif
#ifdef USE_MODMINER
diff --git a/usbutils.c b/usbutils.c
index 7ebded3..ec9b088 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -2364,18 +2364,8 @@ int _usb_read(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_t
int endlen;
unsigned char *ptr, *usbbuf = cgpu->usbinfo.bulkbuf;
size_t usbbufread;
- int lock_wait;
- /* Get statistics on how long reads wait on the devlock */
- cgpu->usb_bulk_reads++;
-
- cgtime(&read_start);
DEVRLOCK(cgpu, pstate);
- cgtime(&tv_finish);
- lock_wait = ms_tdiff(&tv_finish, &read_start);
- cgpu->usb_rlock_total_wait += lock_wait;
- if (lock_wait > cgpu->usb_rlock_max_wait)
- cgpu->usb_rlock_max_wait = lock_wait;
if (cgpu->usbinfo.nodev) {
*buf = '\0';
@@ -2642,18 +2632,8 @@ int _usb_write(struct cgpu_info *cgpu, int intinfo, int epinfo, char *buf, size_
double max, done;
__maybe_unused bool first = true;
int err, sent, tot, pstate;
- int lock_wait;
- /* Get statistics on how long writes wait on the devlock */
- cgpu->usb_bulk_writes++;
-
- cgtime(&read_start);
DEVRLOCK(cgpu, pstate);
- cgtime(&tv_finish);
- lock_wait = ms_tdiff(&tv_finish, &read_start);
- cgpu->usb_wlock_total_wait += lock_wait;
- if (lock_wait > cgpu->usb_wlock_max_wait)
- cgpu->usb_wlock_max_wait = lock_wait;
USBDEBUG("USB debug: _usb_write(%s (nodev=%s),intinfo=%d,epinfo=%d,buf='%s',bufsiz=%d,proc=%p,timeout=%u,cmd=%s)", cgpu->drv->name, bool_str(cgpu->usbinfo.nodev), intinfo, epinfo, (char *)str_text(buf), (int)bufsiz, processed, timeout, usb_cmdname(cmd));