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 |
28 |
|
#include <stdio.h> |
29 |
|
#include <stdlib.h> |
30 |
|
#include <string.h> |
31 |
+ |
#include <time.h> |
32 |
|
#include "statgrab.h" |
33 |
|
|
34 |
|
#ifdef SOLARIS |
38 |
|
#define VALID_FS_TYPES {"ufs", "tmpfs"} |
39 |
|
#endif |
40 |
|
|
41 |
< |
#ifdef LINUX |
38 |
< |
#include <sys/vfs.h> |
41 |
> |
#if defined(LINUX) || defined(CYGWIN) |
42 |
|
#include <mntent.h> |
43 |
+ |
#include <sys/vfs.h> |
44 |
|
#include "tools.h" |
41 |
– |
#define VALID_FS_TYPES {"ext2", "ext3", "xfs", "reiserfs", "vfat", "tmpfs"} |
45 |
|
#endif |
46 |
|
|
47 |
< |
#ifdef FREEBSD |
47 |
> |
#ifdef LINUX |
48 |
> |
#define VALID_FS_TYPES {"adfs", "affs", "befs", "bfs", "efs", "ext2", \ |
49 |
> |
"ext3", "vxfs", "hfs", "hfsplus", "hpfs", "jffs", \ |
50 |
> |
"jffs2", "minix", "msdos", "ntfs", "qnx4", "ramfs", \ |
51 |
> |
"rootfs", "reiserfs", "sysv", "v7", "udf", "ufs", \ |
52 |
> |
"umsdos", "vfat", "xfs", "jfs"} |
53 |
> |
#endif |
54 |
> |
|
55 |
> |
#ifdef CYGWIN |
56 |
> |
#define VALID_FS_TYPES {"user"} |
57 |
> |
#endif |
58 |
> |
|
59 |
> |
#ifdef ALLBSD |
60 |
|
#include <sys/param.h> |
61 |
|
#include <sys/ucred.h> |
62 |
|
#include <sys/mount.h> |
63 |
+ |
#endif |
64 |
+ |
#ifdef FREEBSD |
65 |
|
#include <sys/dkstat.h> |
66 |
|
#include <devstat.h> |
67 |
< |
#define VALID_FS_TYPES {"ufs", "mfs"} |
67 |
> |
#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \ |
68 |
> |
"ufs", "mfs"} |
69 |
|
#endif |
70 |
+ |
#ifdef NETBSD |
71 |
+ |
#include <sys/param.h> |
72 |
+ |
#include <sys/sysctl.h> |
73 |
+ |
#include <sys/disk.h> |
74 |
+ |
#define VALID_FS_TYPES {"ffs", "mfs", "msdos", "lfs", "adosfs", "ext2fs", \ |
75 |
+ |
"ntfs"} |
76 |
+ |
#endif |
77 |
+ |
|
78 |
|
#define START_VAL 1 |
79 |
|
|
80 |
|
char *copy_string(char *orig_ptr, const char *newtext){ |
101 |
|
} |
102 |
|
} |
103 |
|
|
104 |
+ |
int is_valid_fs_type(const char *type) { |
105 |
+ |
const char *types[] = VALID_FS_TYPES; |
106 |
+ |
int i; |
107 |
+ |
|
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 |
|
|
118 |
|
static disk_stat_t *disk_stats; |
119 |
|
static int watermark=-1; |
120 |
|
|
121 |
< |
char *fs_types[] = VALID_FS_TYPES; |
84 |
< |
int x, valid_type; |
121 |
> |
int valid_type; |
122 |
|
int num_disks=0; |
123 |
< |
#if defined(LINUX) || defined (SOLARIS) |
123 |
> |
#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN) |
124 |
|
FILE *f; |
125 |
|
#endif |
126 |
|
|
130 |
|
struct mnttab mp; |
131 |
|
struct statvfs fs; |
132 |
|
#endif |
133 |
< |
#ifdef LINUX |
133 |
> |
#if defined(LINUX) || defined(CYGWIN) |
134 |
|
struct mntent *mp; |
135 |
|
struct statfs fs; |
136 |
|
#endif |
137 |
< |
#ifdef FREEBSD |
137 |
> |
#ifdef ALLBSD |
138 |
|
int nummnt; |
139 |
|
struct statfs *mp; |
140 |
|
#endif |
147 |
|
watermark=START_VAL; |
148 |
|
init_disk_stat(0, watermark-1, disk_stats); |
149 |
|
} |
150 |
< |
#ifdef FREEBSD |
150 |
> |
#ifdef ALLBSD |
151 |
|
nummnt=getmntinfo(&mp , MNT_LOCAL); |
152 |
|
if (nummnt<=0){ |
153 |
|
return NULL; |
154 |
|
} |
155 |
|
for(;nummnt--; mp++){ |
156 |
< |
valid_type=0; |
120 |
< |
for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){ |
121 |
< |
if(strcmp(mp->f_fstypename, fs_types[x]) ==0){ |
122 |
< |
valid_type=1; |
123 |
< |
break; |
124 |
< |
} |
125 |
< |
} |
156 |
> |
valid_type = is_valid_fs_type(mp->f_fstypename); |
157 |
|
#endif |
158 |
|
|
159 |
< |
#ifdef LINUX |
159 |
> |
#if defined(LINUX) || defined(CYGWIN) |
160 |
|
if ((f=setmntent("/etc/mtab", "r" ))==NULL){ |
161 |
|
return NULL; |
162 |
|
} |
166 |
|
continue; |
167 |
|
} |
168 |
|
|
169 |
< |
valid_type=0; |
139 |
< |
for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){ |
140 |
< |
if(strcmp(mp->mnt_type, fs_types[x]) ==0){ |
141 |
< |
valid_type=1; |
142 |
< |
break; |
143 |
< |
} |
144 |
< |
} |
169 |
> |
valid_type = is_valid_fs_type(mp->mnt_type); |
170 |
|
#endif |
171 |
|
|
172 |
|
#ifdef SOLARIS |
177 |
|
if ((statvfs(mp.mnt_mountp, &fs)) !=0){ |
178 |
|
continue; |
179 |
|
} |
180 |
< |
valid_type=0; |
156 |
< |
for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){ |
157 |
< |
if(strcmp(mp.mnt_fstype, fs_types[x]) ==0){ |
158 |
< |
valid_type=1; |
159 |
< |
break; |
160 |
< |
} |
161 |
< |
} |
180 |
> |
valid_type = is_valid_fs_type(mp.mnt_fstype); |
181 |
|
#endif |
182 |
|
|
183 |
|
if(valid_type){ |
193 |
|
} |
194 |
|
|
195 |
|
disk_ptr=disk_stats+num_disks; |
196 |
< |
#ifdef FREEBSD |
196 |
> |
#ifdef ALLBSD |
197 |
|
if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){ |
198 |
|
return NULL; |
199 |
|
} |
215 |
|
/* Freebsd doesn't have a "available" inodes */ |
216 |
|
disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes; |
217 |
|
#endif |
218 |
< |
#ifdef LINUX |
218 |
> |
#if defined(LINUX) || defined(CYGWIN) |
219 |
|
if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->mnt_fsname))==NULL){ |
220 |
|
return NULL; |
221 |
|
} |
269 |
|
|
270 |
|
*entries=num_disks; |
271 |
|
|
272 |
< |
/* If this fails, there is very little i can do about it, so i'll ignore it :) */ |
273 |
< |
#if defined(LINUX) || defined(SOLARIS) |
272 |
> |
/* If this fails, there is very little i can do about it, so |
273 |
> |
I'll ignore it :) */ |
274 |
> |
#if defined(LINUX) || defined(CYGWIN) |
275 |
> |
endmntent(f); |
276 |
> |
#endif |
277 |
> |
#if defined(SOLARIS) |
278 |
|
fclose(f); |
279 |
|
#endif |
280 |
|
|
319 |
|
static diskio_stat_t *diskio_stats=NULL; |
320 |
|
static int num_diskio=0; |
321 |
|
|
322 |
+ |
#ifdef LINUX |
323 |
+ |
typedef struct { |
324 |
+ |
int major; |
325 |
+ |
int minor; |
326 |
+ |
} partition; |
327 |
+ |
#endif |
328 |
+ |
|
329 |
|
diskio_stat_t *get_diskio_stats(int *entries){ |
330 |
|
|
331 |
|
static int sizeof_diskio_stats=0; |
332 |
+ |
#ifndef LINUX |
333 |
|
diskio_stat_t *diskio_stats_ptr; |
334 |
+ |
#endif |
335 |
|
|
336 |
|
#ifdef SOLARIS |
337 |
|
kstat_ctl_t *kc; |
342 |
|
FILE *f; |
343 |
|
char *line_ptr; |
344 |
|
int major, minor; |
345 |
< |
char dev_letter; |
345 |
> |
int has_pp_stats = 1; |
346 |
> |
static partition *parts = NULL; |
347 |
> |
static int alloc_parts = 0; |
348 |
> |
int i, n; |
349 |
> |
time_t now; |
350 |
> |
const char *format; |
351 |
|
#endif |
352 |
|
#ifdef FREEBSD |
353 |
< |
struct statinfo stats; |
353 |
> |
static struct statinfo stats; |
354 |
> |
static int stats_init = 0; |
355 |
|
int counter; |
356 |
|
struct device_selection *dev_sel = NULL; |
357 |
|
int n_selected, n_selections; |
358 |
|
long sel_gen; |
359 |
|
struct devstat *dev_ptr; |
360 |
|
#endif |
361 |
+ |
#ifdef NETBSD |
362 |
+ |
struct disk_sysctl *stats; |
363 |
+ |
int num_disks, i; |
364 |
+ |
int mib[3]; |
365 |
+ |
size_t size; |
366 |
+ |
#endif |
367 |
+ |
|
368 |
|
num_diskio=0; |
369 |
|
|
370 |
+ |
#ifdef NETBSD |
371 |
+ |
mib[0] = CTL_HW; |
372 |
+ |
mib[1] = HW_DISKSTATS; |
373 |
+ |
mib[2] = sizeof(struct disk_sysctl); |
374 |
+ |
|
375 |
+ |
if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) { |
376 |
+ |
return NULL; |
377 |
+ |
} |
378 |
+ |
num_disks = size / sizeof(struct disk_sysctl); |
379 |
+ |
|
380 |
+ |
stats = malloc(size); |
381 |
+ |
if (stats == NULL) { |
382 |
+ |
return NULL; |
383 |
+ |
} |
384 |
+ |
|
385 |
+ |
if (sysctl(mib, 3, stats, &size, NULL, 0) < 0) { |
386 |
+ |
return NULL; |
387 |
+ |
} |
388 |
+ |
|
389 |
+ |
for (i = 0; i < num_disks; i++) { |
390 |
+ |
u_int64_t rbytes, wbytes; |
391 |
+ |
|
392 |
+ |
#ifdef HAVE_DK_RBYTES |
393 |
+ |
rbytes = stats[i].dk_rbytes; |
394 |
+ |
wbytes = stats[i].dk_wbytes; |
395 |
+ |
#else |
396 |
+ |
/* Before 1.7, NetBSD merged reads and writes. */ |
397 |
+ |
rbytes = wbytes = stats[i].dk_bytes; |
398 |
+ |
#endif |
399 |
+ |
|
400 |
+ |
/* Don't keep stats for disks that have never been used. */ |
401 |
+ |
if (rbytes == 0 && wbytes == 0) { |
402 |
+ |
continue; |
403 |
+ |
} |
404 |
+ |
|
405 |
+ |
diskio_stats = diskio_stat_malloc(num_diskio + 1, |
406 |
+ |
&sizeof_diskio_stats, |
407 |
+ |
diskio_stats); |
408 |
+ |
if (diskio_stats == NULL) { |
409 |
+ |
return NULL; |
410 |
+ |
} |
411 |
+ |
diskio_stats_ptr = diskio_stats + num_diskio; |
412 |
+ |
|
413 |
+ |
diskio_stats_ptr->read_bytes = rbytes; |
414 |
+ |
diskio_stats_ptr->write_bytes = wbytes; |
415 |
+ |
if (diskio_stats_ptr->disk_name != NULL) { |
416 |
+ |
free(diskio_stats_ptr->disk_name); |
417 |
+ |
} |
418 |
+ |
diskio_stats_ptr->disk_name = strdup(stats[i].dk_name); |
419 |
+ |
diskio_stats_ptr->systime = time(NULL); |
420 |
+ |
|
421 |
+ |
num_diskio++; |
422 |
+ |
} |
423 |
+ |
|
424 |
+ |
free(stats); |
425 |
+ |
#endif |
426 |
+ |
|
427 |
|
#ifdef FREEBSD |
428 |
< |
stats.dinfo=malloc(sizeof(struct devinfo)); |
429 |
< |
if(stats.dinfo==NULL) return NULL; |
428 |
> |
if (!stats_init) { |
429 |
> |
stats.dinfo=malloc(sizeof(struct devinfo)); |
430 |
> |
if(stats.dinfo==NULL) return NULL; |
431 |
> |
bzero(stats.dinfo, sizeof(struct devinfo)); |
432 |
> |
stats_init = 1; |
433 |
> |
} |
434 |
> |
#ifdef FREEBSD5 |
435 |
> |
if ((devstat_getdevs(NULL, &stats)) < 0) return NULL; |
436 |
> |
/* Not aware of a get all devices, so i said 999. If we ever |
437 |
> |
* find a machine with more than 999 disks, then i'll change |
438 |
> |
* this number :) |
439 |
> |
*/ |
440 |
> |
if (devstat_selectdevs(&dev_sel, &n_selected, &n_selections, &sel_gen, stats.dinfo->generation, stats.dinfo->devices, stats.dinfo->numdevs, NULL, 0, NULL, 0, DS_SELECT_ONLY, 999, 1) < 0) return NULL; |
441 |
> |
#else |
442 |
|
if ((getdevs(&stats)) < 0) return NULL; |
443 |
|
/* Not aware of a get all devices, so i said 999. If we ever |
444 |
|
* find a machine with more than 999 disks, then i'll change |
445 |
|
* this number :) |
446 |
|
*/ |
447 |
|
if (selectdevs(&dev_sel, &n_selected, &n_selections, &sel_gen, stats.dinfo->generation, stats.dinfo->devices, stats.dinfo->numdevs, NULL, 0, NULL, 0, DS_SELECT_ONLY, 999, 1) < 0) return NULL; |
448 |
+ |
#endif |
449 |
|
|
450 |
|
for(counter=0;counter<stats.dinfo->numdevs;counter++){ |
451 |
|
dev_ptr=&stats.dinfo->devices[dev_sel[counter].position]; |
454 |
|
* devices.. like mem, proc.. and also doesn't report floppy |
455 |
|
* drives etc unless they are doing stuff :) |
456 |
|
*/ |
457 |
+ |
#ifdef FREEBSD5 |
458 |
+ |
if((dev_ptr->bytes[DEVSTAT_READ]==0) && (dev_ptr->bytes[DEVSTAT_WRITE]==0)) continue; |
459 |
+ |
#else |
460 |
|
if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue; |
461 |
+ |
#endif |
462 |
|
if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){ |
463 |
|
return NULL; |
464 |
|
} |
465 |
|
diskio_stats_ptr=diskio_stats+num_diskio; |
466 |
< |
|
466 |
> |
|
467 |
> |
#ifdef FREEBSD5 |
468 |
> |
diskio_stats_ptr->read_bytes=dev_ptr->bytes[DEVSTAT_READ]; |
469 |
> |
diskio_stats_ptr->write_bytes=dev_ptr->bytes[DEVSTAT_WRITE]; |
470 |
> |
#else |
471 |
|
diskio_stats_ptr->read_bytes=dev_ptr->bytes_read; |
472 |
|
diskio_stats_ptr->write_bytes=dev_ptr->bytes_written; |
473 |
+ |
#endif |
474 |
|
if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name); |
475 |
|
asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number); |
476 |
|
diskio_stats_ptr->systime=time(NULL); |
478 |
|
num_diskio++; |
479 |
|
} |
480 |
|
free(dev_sel); |
357 |
– |
free(stats.dinfo); |
481 |
|
|
482 |
|
#endif |
483 |
|
#ifdef SOLARIS |
506 |
|
|
507 |
|
if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name); |
508 |
|
|
509 |
< |
diskio_stats_ptr->disk_name=strdup(ksp->ks_name); |
509 |
> |
diskio_stats_ptr->disk_name=strdup((char *) get_svr_from_bsd(ksp->ks_name)); |
510 |
|
diskio_stats_ptr->systime=time(NULL); |
511 |
|
num_diskio++; |
512 |
|
} |
516 |
|
#endif |
517 |
|
|
518 |
|
#ifdef LINUX |
519 |
< |
f=fopen("/proc/stat", "r"); |
520 |
< |
if(f==NULL){ |
521 |
< |
*entries=0; |
522 |
< |
fclose(f); |
523 |
< |
return NULL; |
519 |
> |
num_diskio = 0; |
520 |
> |
n = 0; |
521 |
> |
|
522 |
> |
/* Read /proc/partitions to find what devices exist. Recent 2.4 kernels |
523 |
> |
have statistics in here too, so we can use those directly. |
524 |
> |
2.6 kernels have /proc/diskstats instead with almost (but not quite) |
525 |
> |
the same format. */ |
526 |
> |
|
527 |
> |
f = fopen("/proc/diskstats", "r"); |
528 |
> |
format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld"; |
529 |
> |
if (f == NULL) { |
530 |
> |
f = fopen("/proc/partitions", "r"); |
531 |
> |
format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld"; |
532 |
|
} |
533 |
< |
if((line_ptr=f_read_line(f, "disk_io:"))==NULL){ |
534 |
< |
*entries=0; |
535 |
< |
fclose(f); |
536 |
< |
return NULL; |
537 |
< |
} |
538 |
< |
while((line_ptr=strchr(line_ptr, ' '))!=NULL){ |
539 |
< |
line_ptr++; |
540 |
< |
if(*line_ptr=='\0'){ |
541 |
< |
break; |
533 |
> |
if (f == NULL) goto out; |
534 |
> |
now = time(NULL); |
535 |
> |
|
536 |
> |
while ((line_ptr = f_read_line(f, "")) != NULL) { |
537 |
> |
char name[20]; |
538 |
> |
char *s; |
539 |
> |
long long rsect, wsect; |
540 |
> |
|
541 |
> |
int nr = sscanf(line_ptr, format, |
542 |
> |
&major, &minor, name, &rsect, &wsect); |
543 |
> |
if (nr < 3) continue; |
544 |
> |
|
545 |
> |
/* Skip device names ending in numbers, since they're |
546 |
> |
partitions. */ |
547 |
> |
s = name; |
548 |
> |
while (*s != '\0') s++; |
549 |
> |
--s; |
550 |
> |
if (*s >= '0' && *s <= '9') continue; |
551 |
> |
|
552 |
> |
if (nr < 5) { |
553 |
> |
has_pp_stats = 0; |
554 |
> |
rsect = 0; |
555 |
> |
wsect = 0; |
556 |
|
} |
557 |
< |
if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){ |
558 |
< |
fclose(f); |
559 |
< |
*entries=0; |
560 |
< |
return NULL; |
557 |
> |
|
558 |
> |
diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats, |
559 |
> |
diskio_stats); |
560 |
> |
if (diskio_stats == NULL) goto out; |
561 |
> |
if (n >= alloc_parts) { |
562 |
> |
alloc_parts += 16; |
563 |
> |
parts = realloc(parts, alloc_parts * sizeof *parts); |
564 |
> |
if (parts == NULL) { |
565 |
> |
alloc_parts = 0; |
566 |
> |
goto out; |
567 |
> |
} |
568 |
|
} |
417 |
– |
diskio_stats_ptr=diskio_stats+num_diskio; |
569 |
|
|
570 |
+ |
if (diskio_stats[n].disk_name != NULL) |
571 |
+ |
free(diskio_stats[n].disk_name); |
572 |
+ |
diskio_stats[n].disk_name = strdup(name); |
573 |
+ |
diskio_stats[n].read_bytes = rsect * 512; |
574 |
+ |
diskio_stats[n].write_bytes = wsect * 512; |
575 |
+ |
diskio_stats[n].systime = now; |
576 |
+ |
parts[n].major = major; |
577 |
+ |
parts[n].minor = minor; |
578 |
|
|
579 |
< |
if((sscanf(line_ptr, "(%d,%d):(%*d, %*d, %lld, %*d, %lld)", \ |
580 |
< |
&major, \ |
422 |
< |
&minor, \ |
423 |
< |
&diskio_stats_ptr->read_bytes, \ |
424 |
< |
&diskio_stats_ptr->write_bytes))!=4) { |
425 |
< |
continue; |
426 |
< |
} |
579 |
> |
n++; |
580 |
> |
} |
581 |
|
|
582 |
< |
/* We read the number of blocks. Blocks are stored in 512 bytes */ |
583 |
< |
diskio_stats_ptr->read_bytes=diskio_stats_ptr->read_bytes*512; |
430 |
< |
diskio_stats_ptr->write_bytes=diskio_stats_ptr->write_bytes*512; |
582 |
> |
fclose(f); |
583 |
> |
f = NULL; |
584 |
|
|
585 |
< |
if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name); |
585 |
> |
if (!has_pp_stats) { |
586 |
> |
/* This is an older kernel where /proc/partitions doesn't |
587 |
> |
contain stats. Read what we can from /proc/stat instead, and |
588 |
> |
fill in the appropriate bits of the list allocated above. */ |
589 |
|
|
590 |
< |
switch(major){ |
591 |
< |
case 2: |
592 |
< |
if(minor==0){ |
593 |
< |
diskio_stats_ptr->disk_name=strdup("fd0"); |
594 |
< |
} |
595 |
< |
break; |
590 |
> |
f = fopen("/proc/stat", "r"); |
591 |
> |
if (f == NULL) goto out; |
592 |
> |
now = time(NULL); |
593 |
> |
|
594 |
> |
line_ptr = f_read_line(f, "disk_io:"); |
595 |
> |
if (line_ptr == NULL) goto out; |
596 |
> |
|
597 |
> |
while((line_ptr=strchr(line_ptr, ' '))!=NULL){ |
598 |
> |
long long rsect, wsect; |
599 |
|
|
600 |
< |
case 3: |
601 |
< |
if(minor==0){ |
602 |
< |
diskio_stats_ptr->disk_name=strdup("hda"); |
603 |
< |
}else{ |
604 |
< |
diskio_stats_ptr->disk_name=strdup("hdb"); |
605 |
< |
} |
606 |
< |
break; |
600 |
> |
if (*++line_ptr == '\0') break; |
601 |
> |
|
602 |
> |
if((sscanf(line_ptr, |
603 |
> |
"(%d,%d):(%*d, %*d, %lld, %*d, %lld)", |
604 |
> |
&major, &minor, &rsect, &wsect)) != 4) { |
605 |
> |
continue; |
606 |
> |
} |
607 |
|
|
608 |
+ |
/* Find the corresponding device from earlier. |
609 |
+ |
Just to add to the fun, "minor" is actually the disk |
610 |
+ |
number, not the device minor, so we need to figure |
611 |
+ |
out the real minor number based on the major! |
612 |
+ |
This list is not exhaustive; if you're running |
613 |
+ |
an older kernel you probably don't have fancy |
614 |
+ |
I2O hardware anyway... */ |
615 |
+ |
switch (major) { |
616 |
+ |
case 3: |
617 |
+ |
case 21: |
618 |
|
case 22: |
619 |
< |
if(minor==0){ |
620 |
< |
diskio_stats_ptr->disk_name=strdup("hdc"); |
621 |
< |
}else{ |
622 |
< |
diskio_stats_ptr->disk_name=strdup("hdd"); |
623 |
< |
} |
619 |
> |
case 33: |
620 |
> |
case 34: |
621 |
> |
case 36: |
622 |
> |
case 56: |
623 |
> |
case 57: |
624 |
> |
case 88: |
625 |
> |
case 89: |
626 |
> |
case 90: |
627 |
> |
case 91: |
628 |
> |
minor *= 64; |
629 |
|
break; |
630 |
< |
case 8: |
631 |
< |
dev_letter='a'+(minor/16); |
458 |
< |
diskio_stats_ptr->disk_name=malloc(4); |
459 |
< |
snprintf(diskio_stats_ptr->disk_name, 4, "sd%c", dev_letter); |
630 |
> |
case 9: |
631 |
> |
case 43: |
632 |
|
break; |
633 |
|
default: |
634 |
< |
/* I have no idea what it is then :) */ |
463 |
< |
diskio_stats_ptr->disk_name=malloc(16); |
464 |
< |
snprintf(diskio_stats_ptr->disk_name, 16, "%d %d", major, minor); |
634 |
> |
minor *= 16; |
635 |
|
break; |
636 |
< |
} |
636 |
> |
} |
637 |
> |
for (i = 0; i < n; i++) { |
638 |
> |
if (major == parts[i].major |
639 |
> |
&& minor == parts[i].minor) |
640 |
> |
break; |
641 |
> |
} |
642 |
> |
if (i == n) continue; |
643 |
|
|
644 |
< |
diskio_stats_ptr->systime=time(NULL); |
645 |
< |
num_diskio++; |
644 |
> |
/* We read the number of blocks. Blocks are stored in |
645 |
> |
512 bytes */ |
646 |
> |
diskio_stats[i].read_bytes = rsect * 512; |
647 |
> |
diskio_stats[i].write_bytes = wsect * 512; |
648 |
> |
diskio_stats[i].systime = now; |
649 |
> |
} |
650 |
|
} |
651 |
|
|
652 |
< |
fclose(f); |
652 |
> |
num_diskio = n; |
653 |
> |
out: |
654 |
> |
if (f != NULL) fclose(f); |
655 |
> |
#endif |
656 |
|
|
657 |
+ |
#ifdef CYGWIN |
658 |
+ |
return NULL; |
659 |
|
#endif |
660 |
+ |
|
661 |
|
*entries=num_diskio; |
662 |
|
|
663 |
|
return diskio_stats; |
664 |
|
} |
665 |
|
|
666 |
|
diskio_stat_t *get_diskio_stats_diff(int *entries){ |
667 |
< |
static diskio_stat_t *diskio_stats_diff=NULL; |
668 |
< |
static int sizeof_diskio_stats_diff=0; |
669 |
< |
diskio_stat_t *diskio_stats_diff_ptr, *diskio_stats_ptr; |
670 |
< |
int disks, x, y; |
667 |
> |
static diskio_stat_t *diff = NULL; |
668 |
> |
static int diff_count = 0; |
669 |
> |
diskio_stat_t *src, *dest; |
670 |
> |
int i, j, new_count; |
671 |
|
|
672 |
< |
if(diskio_stats==NULL){ |
673 |
< |
diskio_stats_ptr=get_diskio_stats(&disks); |
674 |
< |
*entries=disks; |
489 |
< |
return diskio_stats_ptr; |
672 |
> |
if (diskio_stats == NULL) { |
673 |
> |
/* No previous stats, so we can't calculate a difference. */ |
674 |
> |
return get_diskio_stats(entries); |
675 |
|
} |
676 |
|
|
677 |
< |
diskio_stats_diff=diskio_stat_malloc(num_diskio, &sizeof_diskio_stats_diff, diskio_stats_diff); |
678 |
< |
if(diskio_stats_diff==NULL){ |
677 |
> |
/* Resize the results array to match the previous stats. */ |
678 |
> |
diff = diskio_stat_malloc(num_diskio, &diff_count, diff); |
679 |
> |
if (diff == NULL) { |
680 |
|
return NULL; |
681 |
|
} |
682 |
|
|
683 |
< |
diskio_stats_diff_ptr=diskio_stats_diff; |
684 |
< |
diskio_stats_ptr=diskio_stats; |
683 |
> |
/* Copy the previous stats into the result. */ |
684 |
> |
for (i = 0; i < diff_count; i++) { |
685 |
> |
src = &diskio_stats[i]; |
686 |
> |
dest = &diff[i]; |
687 |
|
|
688 |
< |
for(disks=0;disks<num_diskio;disks++){ |
689 |
< |
if(diskio_stats_diff_ptr->disk_name!=NULL){ |
502 |
< |
free(diskio_stats_diff_ptr->disk_name); |
688 |
> |
if (dest->disk_name != NULL) { |
689 |
> |
free(dest->disk_name); |
690 |
|
} |
691 |
< |
diskio_stats_diff_ptr->disk_name=strdup(diskio_stats_ptr->disk_name); |
692 |
< |
diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes; |
693 |
< |
diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes; |
694 |
< |
diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime; |
691 |
> |
dest->disk_name = strdup(src->disk_name); |
692 |
> |
dest->read_bytes = src->read_bytes; |
693 |
> |
dest->write_bytes = src->write_bytes; |
694 |
> |
dest->systime = src->systime; |
695 |
> |
} |
696 |
|
|
697 |
< |
diskio_stats_diff_ptr++; |
698 |
< |
diskio_stats_ptr++; |
697 |
> |
/* Get a new set of stats. */ |
698 |
> |
if (get_diskio_stats(&new_count) == NULL) { |
699 |
> |
return NULL; |
700 |
|
} |
701 |
|
|
702 |
< |
diskio_stats_ptr=get_diskio_stats(&disks); |
703 |
< |
diskio_stats_diff_ptr=diskio_stats_diff; |
702 |
> |
/* For each previous stat... */ |
703 |
> |
for (i = 0; i < diff_count; i++) { |
704 |
> |
dest = &diff[i]; |
705 |
|
|
706 |
< |
for(x=0;x<sizeof_diskio_stats_diff;x++){ |
707 |
< |
|
708 |
< |
if((strcmp(diskio_stats_diff_ptr->disk_name, diskio_stats_ptr->disk_name))==0){ |
709 |
< |
diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes-diskio_stats_diff_ptr->read_bytes; |
710 |
< |
diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes-diskio_stats_diff_ptr->write_bytes; |
711 |
< |
diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime-diskio_stats_diff_ptr->systime; |
712 |
< |
}else{ |
523 |
< |
diskio_stats_ptr=diskio_stats; |
524 |
< |
for(y=0;y<disks;y++){ |
525 |
< |
if((strcmp(diskio_stats_diff_ptr->disk_name, diskio_stats_ptr->disk_name))==0){ |
526 |
< |
diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes-diskio_stats_diff_ptr->read_bytes; |
527 |
< |
diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes-diskio_stats_diff_ptr->write_bytes; |
528 |
< |
diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime-diskio_stats_diff_ptr->systime; |
529 |
< |
|
530 |
< |
break; |
531 |
< |
} |
532 |
< |
|
533 |
< |
diskio_stats_ptr++; |
706 |
> |
/* ... find the corresponding new stat ... */ |
707 |
> |
for (j = 0; j < new_count; j++) { |
708 |
> |
/* Try the new stat in the same position first, |
709 |
> |
since that's most likely to be it. */ |
710 |
> |
src = &diskio_stats[(i + j) % new_count]; |
711 |
> |
if (strcmp(src->disk_name, dest->disk_name) == 0) { |
712 |
> |
break; |
713 |
|
} |
714 |
|
} |
715 |
+ |
if (j == new_count) { |
716 |
+ |
/* No match found. */ |
717 |
+ |
continue; |
718 |
+ |
} |
719 |
|
|
720 |
< |
diskio_stats_ptr++; |
721 |
< |
diskio_stats_diff_ptr++; |
722 |
< |
|
720 |
> |
/* ... and subtract the previous stat from it to get the |
721 |
> |
difference. */ |
722 |
> |
dest->read_bytes = src->read_bytes - dest->read_bytes; |
723 |
> |
dest->write_bytes = src->write_bytes - dest->write_bytes; |
724 |
> |
dest->systime = src->systime - dest->systime; |
725 |
|
} |
726 |
< |
|
727 |
< |
*entries=sizeof_diskio_stats_diff; |
728 |
< |
return diskio_stats_diff; |
726 |
> |
|
727 |
> |
*entries = diff_count; |
728 |
> |
return diff; |
729 |
|
} |
730 |
+ |
|