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
87
88
|
$NetBSD: patch-panel-plugin_devperf.c,v 1.3 2022/03/10 01:31:17 gutteridge Exp $
Fix NetBSD support.
--- panel-plugin/devperf.c.orig 2022-03-03 20:02:02.000000000 +0000
+++ panel-plugin/devperf.c
@@ -325,21 +325,39 @@ int DevGetPerfData (const void *p_pvDevi
const char *device = (const char *) p_pvDevice;
struct timeval tv;
size_t size, i, ndrives;
- struct disk_sysctl *drives, drive;
+#ifdef HW_DISKSTATS
+ struct disk_sysctl *drives, drive;
+#else
+ struct io_sysctl *drives, drive;
+#endif
int mib[3];
mib[0] = CTL_HW;
- mib[1] = HW_DISKSTATS;
- mib[2] = sizeof(struct disk_sysctl);
+#ifdef HW_DISKSTATS
+ mib[1] = HW_DISKSTATS;
+ mib[2] = sizeof(struct disk_sysctl);
+#else
+ mib[1] = HW_IOSTATS;
+ mib[2] = sizeof(struct io_sysctl);
+#endif
+
if (sysctl(mib, 3, NULL, &size, NULL, 0) == -1)
return -1;
- ndrives = size / sizeof(struct disk_sysctl);
+#ifdef HW_DISKSTATS
+ ndrives = size / sizeof(struct disk_sysctl);
+#else
+ ndrives = size / sizeof(struct io_sysctl);
+#endif
drives = malloc(size);
if (sysctl(mib, 3, drives, &size, NULL, 0) == -1)
return -1;
for (i = 0; i < ndrives; i++) {
- if (strcmp(drives[i].dk_name, device) == 0) {
+#ifdef HW_DISKSTATS
+ if (strcmp(drives[i].dk_name, device) == 0) {
+#else
+ if (strcmp(drives[i].name, device) == 0) {
+#endif
drive = drives[i];
break;
}
@@ -352,13 +370,18 @@ int DevGetPerfData (const void *p_pvDevi
gettimeofday (&tv, 0);
perf->timestamp_ns = (uint64_t)1000ull * 1000ull * 1000ull * tv.tv_sec + 1000ull * tv.tv_usec;
-#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106110000)
+#ifdef HW_DISKSTATS
+# if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106110000)
/* NetBSD < 1.6K does not have separate read/write statistics. */
perf->rbytes = drive.dk_bytes;
perf->wbytes = drive.dk_bytes;
-#else
+# else
perf->rbytes = drive.dk_rbytes;
perf->wbytes = drive.dk_wbytes;
+# endif
+#else
+ perf->rbytes = drive.rbytes;
+ perf->wbytes = drive.wbytes;
#endif
/*
@@ -366,9 +389,15 @@ int DevGetPerfData (const void *p_pvDevi
* time separatly.
* -- Benedikt
*/
+#ifdef HW_DISKSTATS
perf->qlen = drive.dk_xfer;
perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.dk_time_sec
+ 1000ull * drive.dk_time_usec) / 2ull;
+#else
+ perf->qlen = drive.xfer;
+ perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.time_sec
+ + 1000ull * drive.time_usec) / 2ull;
+#endif
perf->wbusy_ns = perf->rbusy_ns;
return 0;
|
