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
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
|
$NetBSD: patch-ad,v 1.2 2005/09/08 13:19:56 cube Exp $
--- src/sysdeps/bsd-net-open.c.orig 2005-05-24 05:44:48.000000000 +0200
+++ src/sysdeps/bsd-net-open.c
@@ -23,110 +23,10 @@
/* ===================================================================== */
-/* Disk monitor interface */
-
-#include <sys/dkstat.h>
-#include <sys/disk.h>
-#include <kvm.h>
-
-static struct nlist nl_disk[] = {
-#define X_DISK_COUNT 0
- { "_disk_count" }, /* number of disks */
-#define X_DISKLIST 1
- { "_disklist" }, /* TAILQ of disks */
- { NULL },
-};
-
-static struct disk *dkdisks; /* kernel disk list head */
-
-extern kvm_t *kvmd;
-
-static gint n_disks;
-
-gchar *
-gkrellm_sys_disk_name_from_device(gint device_number, gint unit_number,
- gint *order)
- {
- return NULL; /* disk data by device not implemented */
- }
-
-gint
-gkrellm_sys_disk_order_from_name(gchar *name)
- {
- return -1; /* append disk charts as added */
- }
-
-
-void
-gkrellm_sys_disk_read_data(void)
-{
- struct disk d, *p;
- gint i;
- char buf[20];
- guint64 rbytes, wbytes;
-
- if (kvmd == NULL) return;
- if (n_disks <= 0) return; /* computed by register_disks() */
- if (nl_disk[0].n_type == 0) return; /* ditto. */
-
- for (i = 0, p = dkdisks; i < n_disks; p = d.dk_link.tqe_next, ++i)
- {
- if (kvm_read(kvmd, (u_long)p, &d, sizeof(d)) == sizeof(d))
- {
- if (kvm_read(kvmd, (u_long)d.dk_name, buf, sizeof(buf)) != sizeof(buf))
- /* fallback to default name if kvm_read failed */
- sprintf(buf, "%s%c", _("Disk"), 'A' + i);
-
- /* It seems impossible to get the read and write transfers
- * separately. Its just a matter of choice to put the total in
- * the rbytes member but I like the blue color so much.
- */
-
- /* Separate read/write stats were implemented in NetBSD 1.6K.
- */
-
-#if __NetBSD_Version__ >= 106110000
- rbytes = d.dk_rbytes;
- wbytes = d.dk_wbytes;
-#else
- rbytes = d.dk_bytes;
- wbytes = 0;
-#endif
-
- gkrellm_disk_assign_data_by_name(buf, rbytes, wbytes, FALSE);
- }
- }
-}
-
-gboolean
-gkrellm_sys_disk_init(void)
-{
- struct disklist_head head;
-
-
- if (kvmd == NULL) return FALSE;
-
- /* get disk count */
- if (kvm_nlist(kvmd, nl_disk) >= 0 && nl_disk[0].n_type != 0)
- if (kvm_read(kvmd, nl_disk[X_DISK_COUNT].n_value,
- (char *)&n_disks, sizeof(n_disks)) != sizeof(n_disks))
- n_disks = 0;
-
- /* get first disk */
- if (n_disks > 0) {
- if (kvm_read(kvmd, nl_disk[X_DISKLIST].n_value,
- &head, sizeof(head)) != sizeof(head))
- n_disks = 0;
-
- dkdisks = head.tqh_first;
- }
- return TRUE;
-}
-
-
-/* ===================================================================== */
/* Inet monitor interface */
+#if defined(__OpenBSD__) || ( defined(__NetBSD__) && __NetBSD_Version__ < 399000100 )
+
#include "../inet.h"
/* NO IPv6 SUPPORT YET */
@@ -191,6 +91,7 @@ gkrellm_sys_inet_read_tcp_data(void)
next = (struct inpcb *)inpcb.inp_queue.cqe_next;
}
}
+#endif
gboolean
gkrellm_sys_inet_init(void)
@@ -199,95 +100,6 @@ gkrellm_sys_inet_init(void)
}
/* ===================================================================== */
-/* Memory/Swap monitor interface */
-
-#include <sys/vmmeter.h>
-#include <sys/sysctl.h>
-#include <uvm/uvm_extern.h>
-#include <kvm.h>
-
-static gulong swapin,
- swapout;
-static guint64 swap_total,
- swap_used;
-
-void
-gkrellm_sys_mem_read_data(void)
-{
- static int mib[] = { CTL_VM, VM_METER };
- static int pgout, pgin;
- unsigned long total, used, x_used, free, shared, buffers, cached;
- struct vmtotal vmt;
- struct uvmexp uvmexp;
- size_t len;
- static struct nlist nl[] = {
-#define X_UVM_EXP 0
- { "_uvmexp" },
- { NULL }
-};
-
-
- if (kvmd == NULL) return;
-
- /* get the name list if it's not done yet */
- if (nl[0].n_type == 0) kvm_nlist(kvmd, nl);
-
- if (nl[0].n_type != 0)
- if (kvm_read(kvmd, nl[X_UVM_EXP].n_value,
- &uvmexp, sizeof(uvmexp)) != sizeof(uvmexp))
- memset(&uvmexp, 0, sizeof(uvmexp));
-
- if (sysctl(mib, 2, &vmt, &len, NULL, 0) < 0)
- memset(&vmt, 0, sizeof(vmt));
-
- total = (uvmexp.npages - uvmexp.wired) << uvmexp.pageshift;
-
- /* not sure of what must be computed */
- x_used = (uvmexp.active + uvmexp.inactive) << uvmexp.pageshift;
- free = uvmexp.free << uvmexp.pageshift;
- shared = vmt.t_rmshr << uvmexp.pageshift;
-
- /* want to see only this in the chat. this could be changed */
- used = uvmexp.active << uvmexp.pageshift;
-
- /* don't know how to get those values */
- buffers = 0;
- cached = 0;
-
- gkrellm_mem_assign_data(total, used, free, shared, buffers, cached);
-
- /* show only the pages located on the disk and not in memory */
- swap_total = (guint64) (uvmexp.swpages << uvmexp.pageshift);
- swap_used = (guint64) (uvmexp.swpgonly << uvmexp.pageshift);
-
- /* For page in/out operations, uvmexp struct doesn't seem to be reliable */
-
- /* if the number of swapped pages that are in memory (inuse - only) is
- * greater that the previous value (pgin), we count this a "page in" */
- if (uvmexp.swpginuse - uvmexp.swpgonly > pgin)
- swapin += uvmexp.swpginuse - uvmexp.swpgonly - pgin;
- pgin = uvmexp.swpginuse - uvmexp.swpgonly;
-
- /* same for page out */
- if (uvmexp.swpgonly > pgout)
- swapout += uvmexp.swpgonly - pgout;
- pgout = uvmexp.swpgonly;
-}
-
-void
-gkrellm_sys_swap_read_data(void)
- {
- gkrellm_swap_assign_data(swap_total, swap_used, swapin, swapout);
- }
-
-gboolean
-gkrellm_sys_mem_init(void)
- {
- return TRUE;
- }
-
-
-/* ===================================================================== */
/* Battery monitor interface */
#include <sys/ioctl.h>
|
