1 |
< |
/* |
1 |
> |
/* |
2 |
|
* i-scream central monitoring system |
3 |
|
* http://www.i-scream.org |
4 |
< |
* Copyright (C) 2000-2003 i-scream |
4 |
> |
* Copyright (C) 2000-2004 i-scream |
5 |
|
* |
6 |
< |
* This program is free software; you can redistribute it and/or |
7 |
< |
* modify it under the terms of the GNU General Public License |
8 |
< |
* as published by the Free Software Foundation; either version 2 |
9 |
< |
* of the License, or (at your option) any later version. |
6 |
> |
* This library is free software; you can redistribute it and/or |
7 |
> |
* modify it under the terms of the GNU Lesser General Public |
8 |
> |
* License as published by the Free Software Foundation; either |
9 |
> |
* version 2.1 of the License, or (at your option) any later version. |
10 |
|
* |
11 |
< |
* This program is distributed in the hope that it will be useful, |
11 |
> |
* This library is distributed in the hope that it will be useful, |
12 |
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 |
< |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 |
< |
* GNU General Public License for more details. |
13 |
> |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
14 |
> |
* Lesser General Public License for more details. |
15 |
|
* |
16 |
< |
* You should have received a copy of the GNU General Public License |
17 |
< |
* along with this program; if not, write to the Free Software |
18 |
< |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
16 |
> |
* You should have received a copy of the GNU Lesser General Public |
17 |
> |
* License along with this library; if not, write to the Free Software |
18 |
> |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA |
19 |
> |
* 02111-1307 USA |
20 |
> |
* |
21 |
> |
* $Id$ |
22 |
|
*/ |
23 |
|
|
24 |
|
#ifdef HAVE_CONFIG_H |
30 |
|
#include <string.h> |
31 |
|
#include <time.h> |
32 |
|
#include "statgrab.h" |
33 |
+ |
#include "vector.h" |
34 |
|
|
35 |
|
#ifdef SOLARIS |
36 |
|
#include <sys/mnttab.h> |
62 |
|
#include <sys/ucred.h> |
63 |
|
#include <sys/mount.h> |
64 |
|
#endif |
65 |
< |
#ifdef FREEBSD |
65 |
> |
#if defined(FREEBSD) || defined(DFBSD) |
66 |
|
#include <sys/dkstat.h> |
67 |
|
#include <devstat.h> |
68 |
|
#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \ |
69 |
|
"ufs", "mfs"} |
70 |
|
#endif |
71 |
< |
#ifdef NETBSD |
71 |
> |
#if defined(NETBSD) || defined(OPENBSD) |
72 |
|
#include <sys/param.h> |
73 |
|
#include <sys/sysctl.h> |
74 |
|
#include <sys/disk.h> |
76 |
|
"ntfs"} |
77 |
|
#endif |
78 |
|
|
79 |
< |
#define START_VAL 1 |
79 |
> |
static char *copy_string(char **dest, const char *src) { |
80 |
> |
char *new; |
81 |
|
|
82 |
< |
char *copy_string(char *orig_ptr, const char *newtext){ |
82 |
> |
new = realloc(*dest, strlen(src) + 1); |
83 |
> |
if (new == NULL) { |
84 |
> |
return NULL; |
85 |
> |
} |
86 |
|
|
87 |
< |
/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */ |
88 |
< |
orig_ptr=realloc(orig_ptr, (1+strlen(newtext))); |
89 |
< |
if(orig_ptr==NULL){ |
90 |
< |
return NULL; |
83 |
< |
} |
84 |
< |
strcpy(orig_ptr, newtext); |
87 |
> |
strcpy(new, src); |
88 |
> |
*dest = new; |
89 |
> |
return new; |
90 |
> |
} |
91 |
|
|
92 |
< |
return orig_ptr; |
92 |
> |
static void disk_stat_init(disk_stat_t *d) { |
93 |
> |
d->device_name = NULL; |
94 |
> |
d->fs_type = NULL; |
95 |
> |
d->mnt_point = NULL; |
96 |
|
} |
97 |
|
|
98 |
+ |
static void disk_stat_destroy(disk_stat_t *d) { |
99 |
+ |
free(d->device_name); |
100 |
+ |
free(d->fs_type); |
101 |
+ |
free(d->mnt_point); |
102 |
+ |
} |
103 |
|
|
104 |
< |
void init_disk_stat(int start, int end, disk_stat_t *disk_stats){ |
104 |
> |
int is_valid_fs_type(const char *type) { |
105 |
> |
const char *types[] = VALID_FS_TYPES; |
106 |
> |
int i; |
107 |
|
|
108 |
< |
for(disk_stats+=start; start<=end; start++){ |
109 |
< |
disk_stats->device_name=NULL; |
110 |
< |
disk_stats->fs_type=NULL; |
111 |
< |
disk_stats->mnt_point=NULL; |
96 |
< |
|
97 |
< |
disk_stats++; |
108 |
> |
for (i = 0; i < (sizeof types / sizeof *types); i++) { |
109 |
> |
if (strcmp(types[i], type) == 0) { |
110 |
> |
return 1; |
111 |
> |
} |
112 |
|
} |
113 |
+ |
return 0; |
114 |
|
} |
115 |
|
|
116 |
|
disk_stat_t *get_disk_stats(int *entries){ |
117 |
+ |
VECTOR_DECLARE_STATIC(disk_stats, disk_stat_t, 10, |
118 |
+ |
disk_stat_init, disk_stat_destroy); |
119 |
|
|
120 |
< |
static disk_stat_t *disk_stats; |
104 |
< |
static int watermark=-1; |
105 |
< |
|
106 |
< |
char *fs_types[] = VALID_FS_TYPES; |
107 |
< |
int x, valid_type; |
120 |
> |
int valid_type; |
121 |
|
int num_disks=0; |
122 |
|
#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN) |
123 |
|
FILE *f; |
138 |
|
struct statfs *mp; |
139 |
|
#endif |
140 |
|
|
128 |
– |
if(watermark==-1){ |
129 |
– |
disk_stats=malloc(START_VAL * sizeof(disk_stat_t)); |
130 |
– |
if(disk_stats==NULL){ |
131 |
– |
return NULL; |
132 |
– |
} |
133 |
– |
watermark=START_VAL; |
134 |
– |
init_disk_stat(0, watermark-1, disk_stats); |
135 |
– |
} |
141 |
|
#ifdef ALLBSD |
142 |
|
nummnt=getmntinfo(&mp , MNT_LOCAL); |
143 |
|
if (nummnt<=0){ |
144 |
|
return NULL; |
145 |
|
} |
146 |
|
for(;nummnt--; mp++){ |
147 |
< |
valid_type=0; |
143 |
< |
for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){ |
144 |
< |
if(strcmp(mp->f_fstypename, fs_types[x]) ==0){ |
145 |
< |
valid_type=1; |
146 |
< |
break; |
147 |
< |
} |
148 |
< |
} |
147 |
> |
valid_type = is_valid_fs_type(mp->f_fstypename); |
148 |
|
#endif |
149 |
|
|
150 |
|
#if defined(LINUX) || defined(CYGWIN) |
157 |
|
continue; |
158 |
|
} |
159 |
|
|
160 |
< |
valid_type=0; |
162 |
< |
for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){ |
163 |
< |
if(strcmp(mp->mnt_type, fs_types[x]) ==0){ |
164 |
< |
valid_type=1; |
165 |
< |
break; |
166 |
< |
} |
167 |
< |
} |
160 |
> |
valid_type = is_valid_fs_type(mp->mnt_type); |
161 |
|
#endif |
162 |
|
|
163 |
|
#ifdef SOLARIS |
168 |
|
if ((statvfs(mp.mnt_mountp, &fs)) !=0){ |
169 |
|
continue; |
170 |
|
} |
171 |
< |
valid_type=0; |
179 |
< |
for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){ |
180 |
< |
if(strcmp(mp.mnt_fstype, fs_types[x]) ==0){ |
181 |
< |
valid_type=1; |
182 |
< |
break; |
183 |
< |
} |
184 |
< |
} |
171 |
> |
valid_type = is_valid_fs_type(mp.mnt_fstype); |
172 |
|
#endif |
173 |
|
|
174 |
|
if(valid_type){ |
175 |
< |
if(num_disks>watermark-1){ |
176 |
< |
disk_ptr=disk_stats; |
190 |
< |
if((disk_stats=realloc(disk_stats, (watermark*2 * sizeof(disk_stat_t))))==NULL){ |
191 |
< |
disk_stats=disk_ptr; |
192 |
< |
return NULL; |
193 |
< |
} |
194 |
< |
|
195 |
< |
watermark=watermark*2; |
196 |
< |
init_disk_stat(num_disks, watermark-1, disk_stats); |
175 |
> |
if (VECTOR_RESIZE(disk_stats, num_disks + 1) < 0) { |
176 |
> |
return NULL; |
177 |
|
} |
198 |
– |
|
178 |
|
disk_ptr=disk_stats+num_disks; |
179 |
+ |
|
180 |
|
#ifdef ALLBSD |
181 |
< |
if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){ |
181 |
> |
if (copy_string(&disk_ptr->device_name, mp->f_mntfromname) == NULL) { |
182 |
|
return NULL; |
183 |
|
} |
184 |
< |
|
205 |
< |
if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->f_fstypename))==NULL){ |
184 |
> |
if (copy_string(&disk_ptr->fs_type, mp->f_fstypename) == NULL) { |
185 |
|
return NULL; |
186 |
|
} |
187 |
< |
|
209 |
< |
if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->f_mntonname))==NULL){ |
187 |
> |
if (copy_string(&disk_ptr->mnt_point, mp->f_mntonname) == NULL) { |
188 |
|
return NULL; |
189 |
|
} |
190 |
|
|
198 |
|
disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes; |
199 |
|
#endif |
200 |
|
#if defined(LINUX) || defined(CYGWIN) |
201 |
< |
if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->mnt_fsname))==NULL){ |
201 |
> |
if (copy_string(&disk_ptr->device_name, mp->mnt_fsname) == NULL) { |
202 |
|
return NULL; |
203 |
|
} |
204 |
|
|
205 |
< |
if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->mnt_type))==NULL){ |
205 |
> |
if (copy_string(&disk_ptr->fs_type, mp->mnt_type) == NULL) { |
206 |
|
return NULL; |
207 |
|
} |
208 |
|
|
209 |
< |
if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->mnt_dir))==NULL){ |
209 |
> |
if (copy_string(&disk_ptr->mnt_point, mp->mnt_dir) == NULL) { |
210 |
|
return NULL; |
211 |
|
} |
212 |
|
disk_ptr->size = (long long)fs.f_bsize * (long long)fs.f_blocks; |
220 |
|
#endif |
221 |
|
|
222 |
|
#ifdef SOLARIS |
245 |
– |
/* Memory leak in event of realloc failing */ |
223 |
|
/* Maybe make this char[bigenough] and do strncpy's and put a null in the end? |
224 |
|
* Downside is its a bit hungry for a lot of mounts, as MNT_MAX_SIZE would prob |
225 |
|
* be upwards of a k each |
226 |
|
*/ |
227 |
< |
if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp.mnt_special))==NULL){ |
227 |
> |
if (copy_string(&disk_ptr->device_name, mp.mnt_special) == NULL) { |
228 |
|
return NULL; |
229 |
|
} |
230 |
|
|
231 |
< |
if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp.mnt_fstype))==NULL){ |
231 |
> |
if (copy_string(&disk_ptr->fs_type, mp.mnt_fstype) == NULL) { |
232 |
|
return NULL; |
233 |
|
} |
234 |
|
|
235 |
< |
if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp.mnt_mountp))==NULL){ |
235 |
> |
if (copy_string(&disk_ptr->mnt_point, mp.mnt_mountp) == NULL) { |
236 |
|
return NULL; |
237 |
|
} |
238 |
|
|
262 |
|
return disk_stats; |
263 |
|
|
264 |
|
} |
288 |
– |
void diskio_stat_init(int start, int end, diskio_stat_t *diskio_stats){ |
265 |
|
|
266 |
< |
for(diskio_stats+=start; start<end; start++){ |
267 |
< |
diskio_stats->disk_name=NULL; |
292 |
< |
|
293 |
< |
diskio_stats++; |
294 |
< |
} |
266 |
> |
static void diskio_stat_init(diskio_stat_t *d) { |
267 |
> |
d->disk_name = NULL; |
268 |
|
} |
269 |
|
|
270 |
< |
diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){ |
271 |
< |
|
299 |
< |
if(diskio_stats==NULL){ |
300 |
< |
|
301 |
< |
if((diskio_stats=malloc(needed_entries * sizeof(diskio_stat_t)))==NULL){ |
302 |
< |
return NULL; |
303 |
< |
} |
304 |
< |
diskio_stat_init(0, needed_entries, diskio_stats); |
305 |
< |
*cur_entries=needed_entries; |
306 |
< |
|
307 |
< |
return diskio_stats; |
308 |
< |
} |
309 |
< |
|
310 |
< |
|
311 |
< |
if(*cur_entries<needed_entries){ |
312 |
< |
diskio_stats=realloc(diskio_stats, (sizeof(diskio_stat_t)*needed_entries)); |
313 |
< |
if(diskio_stats==NULL){ |
314 |
< |
return NULL; |
315 |
< |
} |
316 |
< |
diskio_stat_init(*cur_entries, needed_entries, diskio_stats); |
317 |
< |
*cur_entries=needed_entries; |
318 |
< |
} |
319 |
< |
|
320 |
< |
return diskio_stats; |
270 |
> |
static void diskio_stat_destroy(diskio_stat_t *d) { |
271 |
> |
free(d->disk_name); |
272 |
|
} |
273 |
|
|
274 |
< |
static diskio_stat_t *diskio_stats=NULL; |
275 |
< |
static int num_diskio=0; |
274 |
> |
VECTOR_DECLARE_STATIC(diskio_stats, diskio_stat_t, 10, |
275 |
> |
diskio_stat_init, diskio_stat_destroy); |
276 |
|
|
277 |
|
#ifdef LINUX |
278 |
|
typedef struct { |
282 |
|
#endif |
283 |
|
|
284 |
|
diskio_stat_t *get_diskio_stats(int *entries){ |
285 |
< |
|
335 |
< |
static int sizeof_diskio_stats=0; |
285 |
> |
int num_diskio; |
286 |
|
#ifndef LINUX |
287 |
|
diskio_stat_t *diskio_stats_ptr; |
288 |
|
#endif |
303 |
|
time_t now; |
304 |
|
const char *format; |
305 |
|
#endif |
306 |
< |
#ifdef FREEBSD |
306 |
> |
#if defined(FREEBSD) || defined(DFBSD) |
307 |
|
static struct statinfo stats; |
308 |
|
static int stats_init = 0; |
309 |
|
int counter; |
314 |
|
#endif |
315 |
|
#ifdef NETBSD |
316 |
|
struct disk_sysctl *stats; |
317 |
+ |
#endif |
318 |
+ |
#ifdef OPENBSD |
319 |
+ |
int diskcount; |
320 |
+ |
char *disknames, *name, *bufpp; |
321 |
+ |
char **dk_name; |
322 |
+ |
struct diskstats *stats; |
323 |
+ |
#endif |
324 |
+ |
#ifdef NETBSD |
325 |
+ |
#define MIBSIZE 3 |
326 |
+ |
#endif |
327 |
+ |
#ifdef OPENBSD |
328 |
+ |
#define MIBSIZE 2 |
329 |
+ |
#endif |
330 |
+ |
#if defined(NETBSD) || defined(OPENBSD) |
331 |
|
int num_disks, i; |
332 |
< |
int mib[3]; |
332 |
> |
int mib[MIBSIZE]; |
333 |
|
size_t size; |
334 |
|
#endif |
335 |
|
|
336 |
|
num_diskio=0; |
337 |
|
|
338 |
< |
#ifdef NETBSD |
338 |
> |
#ifdef OPENBSD |
339 |
|
mib[0] = CTL_HW; |
340 |
+ |
mib[1] = HW_DISKCOUNT; |
341 |
+ |
|
342 |
+ |
size = sizeof(diskcount); |
343 |
+ |
if (sysctl(mib, MIBSIZE, &diskcount, &size, NULL, 0) < 0) { |
344 |
+ |
return NULL; |
345 |
+ |
} |
346 |
+ |
|
347 |
+ |
mib[0] = CTL_HW; |
348 |
+ |
mib[1] = HW_DISKNAMES; |
349 |
+ |
|
350 |
+ |
if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) { |
351 |
+ |
return NULL; |
352 |
+ |
} |
353 |
+ |
|
354 |
+ |
disknames = malloc(size); |
355 |
+ |
if (disknames == NULL) { |
356 |
+ |
return NULL; |
357 |
+ |
} |
358 |
+ |
|
359 |
+ |
if (sysctl(mib, MIBSIZE, disknames, &size, NULL, 0) < 0) { |
360 |
+ |
return NULL; |
361 |
+ |
} |
362 |
+ |
|
363 |
+ |
dk_name = calloc(diskcount, sizeof(char *)); |
364 |
+ |
bufpp = disknames; |
365 |
+ |
for (i = 0; i < diskcount && (name = strsep(&bufpp, ",")) != NULL; i++) { |
366 |
+ |
dk_name[i] = name; |
367 |
+ |
} |
368 |
+ |
#endif |
369 |
+ |
|
370 |
+ |
#if defined(NETBSD) || defined(OPENBSD) |
371 |
+ |
mib[0] = CTL_HW; |
372 |
|
mib[1] = HW_DISKSTATS; |
373 |
+ |
#ifdef NETBSD |
374 |
|
mib[2] = sizeof(struct disk_sysctl); |
375 |
+ |
#endif |
376 |
|
|
377 |
< |
if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) { |
377 |
> |
if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) { |
378 |
|
return NULL; |
379 |
|
} |
380 |
+ |
|
381 |
+ |
#ifdef NETBSD |
382 |
|
num_disks = size / sizeof(struct disk_sysctl); |
383 |
+ |
#else |
384 |
+ |
num_disks = size / sizeof(struct diskstats); |
385 |
+ |
#endif |
386 |
|
|
387 |
|
stats = malloc(size); |
388 |
|
if (stats == NULL) { |
389 |
|
return NULL; |
390 |
|
} |
391 |
|
|
392 |
< |
if (sysctl(mib, 3, stats, &size, NULL, 0) < 0) { |
392 |
> |
if (sysctl(mib, MIBSIZE, stats, &size, NULL, 0) < 0) { |
393 |
|
return NULL; |
394 |
|
} |
395 |
|
|
396 |
|
for (i = 0; i < num_disks; i++) { |
397 |
|
u_int64_t rbytes, wbytes; |
398 |
|
|
399 |
+ |
#ifdef NETBSD |
400 |
|
#ifdef HAVE_DK_RBYTES |
401 |
|
rbytes = stats[i].dk_rbytes; |
402 |
|
wbytes = stats[i].dk_wbytes; |
404 |
|
/* Before 1.7, NetBSD merged reads and writes. */ |
405 |
|
rbytes = wbytes = stats[i].dk_bytes; |
406 |
|
#endif |
407 |
+ |
#else |
408 |
+ |
rbytes = wbytes = stats[i].ds_bytes; |
409 |
+ |
#endif |
410 |
|
|
411 |
|
/* Don't keep stats for disks that have never been used. */ |
412 |
|
if (rbytes == 0 && wbytes == 0) { |
413 |
|
continue; |
414 |
|
} |
415 |
|
|
416 |
< |
diskio_stats = diskio_stat_malloc(num_diskio + 1, |
410 |
< |
&sizeof_diskio_stats, |
411 |
< |
diskio_stats); |
412 |
< |
if (diskio_stats == NULL) { |
416 |
> |
if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) { |
417 |
|
return NULL; |
418 |
|
} |
419 |
|
diskio_stats_ptr = diskio_stats + num_diskio; |
423 |
|
if (diskio_stats_ptr->disk_name != NULL) { |
424 |
|
free(diskio_stats_ptr->disk_name); |
425 |
|
} |
426 |
+ |
#ifdef NETBSD |
427 |
|
diskio_stats_ptr->disk_name = strdup(stats[i].dk_name); |
428 |
+ |
#else |
429 |
+ |
diskio_stats_ptr->disk_name = strdup(dk_name[i]); |
430 |
+ |
#endif |
431 |
|
diskio_stats_ptr->systime = time(NULL); |
432 |
|
|
433 |
|
num_diskio++; |
434 |
|
} |
435 |
|
|
436 |
|
free(stats); |
437 |
+ |
#ifdef OPENBSD |
438 |
+ |
free(dk_name); |
439 |
+ |
free(disknames); |
440 |
|
#endif |
441 |
+ |
#endif |
442 |
|
|
443 |
< |
#ifdef FREEBSD |
443 |
> |
#if defined(FREEBSD) || defined(DFBSD) |
444 |
|
if (!stats_init) { |
445 |
|
stats.dinfo=malloc(sizeof(struct devinfo)); |
446 |
|
if(stats.dinfo==NULL) return NULL; |
475 |
|
#else |
476 |
|
if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue; |
477 |
|
#endif |
478 |
< |
if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){ |
478 |
> |
|
479 |
> |
if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) { |
480 |
|
return NULL; |
481 |
|
} |
482 |
|
diskio_stats_ptr=diskio_stats+num_diskio; |
511 |
|
if((kstat_read(kc, ksp, &kios))==-1){ |
512 |
|
} |
513 |
|
|
514 |
< |
if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){ |
514 |
> |
if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) { |
515 |
|
kstat_close(kc); |
516 |
|
return NULL; |
517 |
|
} |
523 |
|
|
524 |
|
if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name); |
525 |
|
|
526 |
< |
diskio_stats_ptr->disk_name=strdup(ksp->ks_name); |
526 |
> |
diskio_stats_ptr->disk_name=strdup((char *) get_svr_from_bsd(ksp->ks_name)); |
527 |
|
diskio_stats_ptr->systime=time(NULL); |
528 |
|
num_diskio++; |
529 |
|
} |
542 |
|
the same format. */ |
543 |
|
|
544 |
|
f = fopen("/proc/diskstats", "r"); |
545 |
< |
format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld"; |
545 |
> |
format = " %d %d %99s %*d %*d %lld %*d %*d %*d %lld"; |
546 |
|
if (f == NULL) { |
547 |
|
f = fopen("/proc/partitions", "r"); |
548 |
< |
format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld"; |
548 |
> |
format = " %d %d %*d %99s %*d %*d %lld %*d %*d %*d %lld"; |
549 |
|
} |
550 |
|
if (f == NULL) goto out; |
551 |
|
now = time(NULL); |
552 |
|
|
553 |
|
while ((line_ptr = f_read_line(f, "")) != NULL) { |
554 |
< |
char name[20]; |
554 |
> |
char name[100]; |
555 |
|
char *s; |
556 |
|
long long rsect, wsect; |
557 |
|
|
572 |
|
wsect = 0; |
573 |
|
} |
574 |
|
|
575 |
< |
diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats, |
576 |
< |
diskio_stats); |
577 |
< |
if (diskio_stats == NULL) goto out; |
575 |
> |
if (VECTOR_RESIZE(diskio_stats, n + 1) < 0) { |
576 |
> |
goto out; |
577 |
> |
} |
578 |
|
if (n >= alloc_parts) { |
579 |
|
alloc_parts += 16; |
580 |
|
parts = realloc(parts, alloc_parts * sizeof *parts); |
596 |
|
n++; |
597 |
|
} |
598 |
|
|
599 |
+ |
fclose(f); |
600 |
+ |
f = NULL; |
601 |
+ |
|
602 |
|
if (!has_pp_stats) { |
603 |
< |
/* This is an older kernel without stats in /proc/partitions. |
604 |
< |
Read what we can from /proc/stat instead. */ |
603 |
> |
/* This is an older kernel where /proc/partitions doesn't |
604 |
> |
contain stats. Read what we can from /proc/stat instead, and |
605 |
> |
fill in the appropriate bits of the list allocated above. */ |
606 |
|
|
607 |
|
f = fopen("/proc/stat", "r"); |
608 |
|
if (f == NULL) goto out; |
669 |
|
num_diskio = n; |
670 |
|
out: |
671 |
|
if (f != NULL) fclose(f); |
672 |
+ |
#endif |
673 |
|
|
674 |
+ |
#ifdef CYGWIN |
675 |
+ |
return NULL; |
676 |
|
#endif |
677 |
+ |
|
678 |
|
*entries=num_diskio; |
679 |
|
|
680 |
|
return diskio_stats; |
681 |
|
} |
682 |
|
|
683 |
|
diskio_stat_t *get_diskio_stats_diff(int *entries){ |
684 |
< |
static diskio_stat_t *diskio_stats_diff=NULL; |
685 |
< |
static int sizeof_diskio_stats_diff=0; |
686 |
< |
diskio_stat_t *diskio_stats_diff_ptr, *diskio_stats_ptr; |
687 |
< |
int disks, x, y; |
684 |
> |
VECTOR_DECLARE_STATIC(diff, diskio_stat_t, 1, |
685 |
> |
diskio_stat_init, diskio_stat_destroy); |
686 |
> |
diskio_stat_t *src = NULL, *dest; |
687 |
> |
int i, j, diff_count, new_count; |
688 |
|
|
689 |
< |
if(diskio_stats==NULL){ |
690 |
< |
diskio_stats_ptr=get_diskio_stats(&disks); |
691 |
< |
*entries=disks; |
671 |
< |
return diskio_stats_ptr; |
689 |
> |
if (diskio_stats == NULL) { |
690 |
> |
/* No previous stats, so we can't calculate a difference. */ |
691 |
> |
return get_diskio_stats(entries); |
692 |
|
} |
693 |
|
|
694 |
< |
diskio_stats_diff=diskio_stat_malloc(num_diskio, &sizeof_diskio_stats_diff, diskio_stats_diff); |
695 |
< |
if(diskio_stats_diff==NULL){ |
694 |
> |
/* Resize the results array to match the previous stats. */ |
695 |
> |
diff_count = VECTOR_SIZE(diskio_stats); |
696 |
> |
if (VECTOR_RESIZE(diff, diff_count) < 0) { |
697 |
|
return NULL; |
698 |
|
} |
699 |
|
|
700 |
< |
diskio_stats_diff_ptr=diskio_stats_diff; |
701 |
< |
diskio_stats_ptr=diskio_stats; |
700 |
> |
/* Copy the previous stats into the result. */ |
701 |
> |
for (i = 0; i < diff_count; i++) { |
702 |
> |
src = &diskio_stats[i]; |
703 |
> |
dest = &diff[i]; |
704 |
|
|
705 |
< |
for(disks=0;disks<num_diskio;disks++){ |
706 |
< |
if(diskio_stats_diff_ptr->disk_name!=NULL){ |
684 |
< |
free(diskio_stats_diff_ptr->disk_name); |
705 |
> |
if (dest->disk_name != NULL) { |
706 |
> |
free(dest->disk_name); |
707 |
|
} |
708 |
< |
diskio_stats_diff_ptr->disk_name=strdup(diskio_stats_ptr->disk_name); |
709 |
< |
diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes; |
710 |
< |
diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes; |
711 |
< |
diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime; |
708 |
> |
dest->disk_name = strdup(src->disk_name); |
709 |
> |
dest->read_bytes = src->read_bytes; |
710 |
> |
dest->write_bytes = src->write_bytes; |
711 |
> |
dest->systime = src->systime; |
712 |
> |
} |
713 |
|
|
714 |
< |
diskio_stats_diff_ptr++; |
715 |
< |
diskio_stats_ptr++; |
714 |
> |
/* Get a new set of stats. */ |
715 |
> |
if (get_diskio_stats(&new_count) == NULL) { |
716 |
> |
return NULL; |
717 |
|
} |
718 |
|
|
719 |
< |
diskio_stats_ptr=get_diskio_stats(&disks); |
720 |
< |
diskio_stats_diff_ptr=diskio_stats_diff; |
719 |
> |
/* For each previous stat... */ |
720 |
> |
for (i = 0; i < diff_count; i++) { |
721 |
> |
dest = &diff[i]; |
722 |
|
|
723 |
< |
for(x=0;x<sizeof_diskio_stats_diff;x++){ |
724 |
< |
|
725 |
< |
if((strcmp(diskio_stats_diff_ptr->disk_name, diskio_stats_ptr->disk_name))==0){ |
726 |
< |
diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes-diskio_stats_diff_ptr->read_bytes; |
727 |
< |
diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes-diskio_stats_diff_ptr->write_bytes; |
728 |
< |
diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime-diskio_stats_diff_ptr->systime; |
729 |
< |
}else{ |
705 |
< |
diskio_stats_ptr=diskio_stats; |
706 |
< |
for(y=0;y<disks;y++){ |
707 |
< |
if((strcmp(diskio_stats_diff_ptr->disk_name, diskio_stats_ptr->disk_name))==0){ |
708 |
< |
diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes-diskio_stats_diff_ptr->read_bytes; |
709 |
< |
diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes-diskio_stats_diff_ptr->write_bytes; |
710 |
< |
diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime-diskio_stats_diff_ptr->systime; |
711 |
< |
|
712 |
< |
break; |
713 |
< |
} |
714 |
< |
|
715 |
< |
diskio_stats_ptr++; |
723 |
> |
/* ... find the corresponding new stat ... */ |
724 |
> |
for (j = 0; j < new_count; j++) { |
725 |
> |
/* Try the new stat in the same position first, |
726 |
> |
since that's most likely to be it. */ |
727 |
> |
src = &diskio_stats[(i + j) % new_count]; |
728 |
> |
if (strcmp(src->disk_name, dest->disk_name) == 0) { |
729 |
> |
break; |
730 |
|
} |
731 |
|
} |
732 |
+ |
if (j == new_count) { |
733 |
+ |
/* No match found. */ |
734 |
+ |
continue; |
735 |
+ |
} |
736 |
|
|
737 |
< |
diskio_stats_ptr++; |
738 |
< |
diskio_stats_diff_ptr++; |
739 |
< |
|
737 |
> |
/* ... and subtract the previous stat from it to get the |
738 |
> |
difference. */ |
739 |
> |
dest->read_bytes = src->read_bytes - dest->read_bytes; |
740 |
> |
dest->write_bytes = src->write_bytes - dest->write_bytes; |
741 |
> |
dest->systime = src->systime - dest->systime; |
742 |
|
} |
743 |
< |
|
744 |
< |
*entries=sizeof_diskio_stats_diff; |
745 |
< |
return diskio_stats_diff; |
743 |
> |
|
744 |
> |
*entries = diff_count; |
745 |
> |
return diff; |
746 |
|
} |
747 |
+ |
|