25 |
|
#include <stdio.h> |
26 |
|
#include <stdlib.h> |
27 |
|
#include <string.h> |
28 |
+ |
#include <time.h> |
29 |
|
#include "statgrab.h" |
30 |
|
|
31 |
|
#ifdef SOLARIS |
32 |
|
#include <sys/mnttab.h> |
33 |
|
#include <sys/statvfs.h> |
34 |
|
#include <kstat.h> |
34 |
– |
#include <sys/types.h> |
35 |
– |
#include <dirent.h> |
36 |
– |
#include <limits.h> |
37 |
– |
#include <unistd.h> |
35 |
|
#define VALID_FS_TYPES {"ufs", "tmpfs"} |
36 |
|
#endif |
37 |
|
|
38 |
< |
#ifdef LINUX |
42 |
< |
#include <sys/vfs.h> |
38 |
> |
#if defined(LINUX) || defined(CYGWIN) |
39 |
|
#include <mntent.h> |
40 |
+ |
#include <sys/vfs.h> |
41 |
|
#include "tools.h" |
45 |
– |
#define VALID_FS_TYPES {"ext2", "ext3", "xfs", "reiserfs", "vfat", "tmpfs"} |
42 |
|
#endif |
43 |
|
|
44 |
< |
#ifdef FREEBSD |
44 |
> |
#ifdef LINUX |
45 |
> |
#define VALID_FS_TYPES {"adfs", "affs", "befs", "bfs", "efs", "ext2", \ |
46 |
> |
"ext3", "vxfs", "hfs", "hfsplus", "hpfs", "jffs", \ |
47 |
> |
"jffs2", "minix", "msdos", "ntfs", "qnx4", "ramfs", \ |
48 |
> |
"rootfs", "reiserfs", "sysv", "v7", "udf", "ufs", \ |
49 |
> |
"umsdos", "vfat", "xfs", "jfs"} |
50 |
> |
#endif |
51 |
> |
|
52 |
> |
#ifdef CYGWIN |
53 |
> |
#define VALID_FS_TYPES {"user"} |
54 |
> |
#endif |
55 |
> |
|
56 |
> |
#ifdef ALLBSD |
57 |
|
#include <sys/param.h> |
58 |
|
#include <sys/ucred.h> |
59 |
|
#include <sys/mount.h> |
60 |
+ |
#endif |
61 |
+ |
#ifdef FREEBSD |
62 |
|
#include <sys/dkstat.h> |
63 |
|
#include <devstat.h> |
64 |
< |
#define VALID_FS_TYPES {"ufs", "mfs"} |
64 |
> |
#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \ |
65 |
> |
"ufs", "mfs"} |
66 |
|
#endif |
67 |
< |
#define START_VAL 1 |
68 |
< |
|
69 |
< |
/* Solaris kernel stores the disk names in the old BSD format |
70 |
< |
* and we would prefer it in th modern format. |
71 |
< |
*/ |
72 |
< |
#ifdef SOLARIS |
62 |
< |
/* Lines from the path_to_inst file */ |
63 |
< |
typedef struct { |
64 |
< |
/* unlikely to get a line that long */ |
65 |
< |
char line[256]; |
66 |
< |
}file_line_t; |
67 |
< |
|
68 |
< |
/* Linked list of the mappings from the older bsd-based sunos names |
69 |
< |
* to the modern solaris names |
70 |
< |
*/ |
71 |
< |
struct disk_mapping_ent_t{ |
72 |
< |
char *sunos_name; |
73 |
< |
char *solaris_name; |
74 |
< |
struct disk_mapping_ent_t *next; |
75 |
< |
}; |
76 |
< |
typedef struct disk_mapping_ent_t disk_mapping_t; |
67 |
> |
#ifdef NETBSD |
68 |
> |
#include <sys/param.h> |
69 |
> |
#include <sys/sysctl.h> |
70 |
> |
#include <sys/disk.h> |
71 |
> |
#define VALID_FS_TYPES {"ffs", "mfs", "msdos", "lfs", "adosfs", "ext2fs", \ |
72 |
> |
"ntfs"} |
73 |
|
#endif |
74 |
|
|
75 |
+ |
#define START_VAL 1 |
76 |
+ |
|
77 |
|
char *copy_string(char *orig_ptr, const char *newtext){ |
78 |
|
|
79 |
|
/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */ |
98 |
|
} |
99 |
|
} |
100 |
|
|
101 |
+ |
int is_valid_fs_type(const char *type) { |
102 |
+ |
const char *types[] = VALID_FS_TYPES; |
103 |
+ |
int i; |
104 |
+ |
|
105 |
+ |
for (i = 0; i < (sizeof types / sizeof *types); i++) { |
106 |
+ |
if (strcmp(types[i], type) == 0) { |
107 |
+ |
return 1; |
108 |
+ |
} |
109 |
+ |
} |
110 |
+ |
return 0; |
111 |
+ |
} |
112 |
+ |
|
113 |
|
disk_stat_t *get_disk_stats(int *entries){ |
114 |
|
|
115 |
|
static disk_stat_t *disk_stats; |
116 |
|
static int watermark=-1; |
117 |
|
|
118 |
< |
char *fs_types[] = VALID_FS_TYPES; |
109 |
< |
int x, valid_type; |
118 |
> |
int valid_type; |
119 |
|
int num_disks=0; |
120 |
< |
#if defined(LINUX) || defined (SOLARIS) |
120 |
> |
#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN) |
121 |
|
FILE *f; |
122 |
|
#endif |
123 |
|
|
127 |
|
struct mnttab mp; |
128 |
|
struct statvfs fs; |
129 |
|
#endif |
130 |
< |
#ifdef LINUX |
130 |
> |
#if defined(LINUX) || defined(CYGWIN) |
131 |
|
struct mntent *mp; |
132 |
|
struct statfs fs; |
133 |
|
#endif |
134 |
< |
#ifdef FREEBSD |
134 |
> |
#ifdef ALLBSD |
135 |
|
int nummnt; |
136 |
|
struct statfs *mp; |
137 |
|
#endif |
144 |
|
watermark=START_VAL; |
145 |
|
init_disk_stat(0, watermark-1, disk_stats); |
146 |
|
} |
147 |
< |
#ifdef FREEBSD |
147 |
> |
#ifdef ALLBSD |
148 |
|
nummnt=getmntinfo(&mp , MNT_LOCAL); |
149 |
|
if (nummnt<=0){ |
150 |
|
return NULL; |
151 |
|
} |
152 |
|
for(;nummnt--; mp++){ |
153 |
< |
valid_type=0; |
145 |
< |
for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){ |
146 |
< |
if(strcmp(mp->f_fstypename, fs_types[x]) ==0){ |
147 |
< |
valid_type=1; |
148 |
< |
break; |
149 |
< |
} |
150 |
< |
} |
153 |
> |
valid_type = is_valid_fs_type(mp->f_fstypename); |
154 |
|
#endif |
155 |
|
|
156 |
< |
#ifdef LINUX |
156 |
> |
#if defined(LINUX) || defined(CYGWIN) |
157 |
|
if ((f=setmntent("/etc/mtab", "r" ))==NULL){ |
158 |
|
return NULL; |
159 |
|
} |
163 |
|
continue; |
164 |
|
} |
165 |
|
|
166 |
< |
valid_type=0; |
164 |
< |
for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){ |
165 |
< |
if(strcmp(mp->mnt_type, fs_types[x]) ==0){ |
166 |
< |
valid_type=1; |
167 |
< |
break; |
168 |
< |
} |
169 |
< |
} |
166 |
> |
valid_type = is_valid_fs_type(mp->mnt_type); |
167 |
|
#endif |
168 |
|
|
169 |
|
#ifdef SOLARIS |
174 |
|
if ((statvfs(mp.mnt_mountp, &fs)) !=0){ |
175 |
|
continue; |
176 |
|
} |
177 |
< |
valid_type=0; |
181 |
< |
for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){ |
182 |
< |
if(strcmp(mp.mnt_fstype, fs_types[x]) ==0){ |
183 |
< |
valid_type=1; |
184 |
< |
break; |
185 |
< |
} |
186 |
< |
} |
177 |
> |
valid_type = is_valid_fs_type(mp.mnt_fstype); |
178 |
|
#endif |
179 |
|
|
180 |
|
if(valid_type){ |
190 |
|
} |
191 |
|
|
192 |
|
disk_ptr=disk_stats+num_disks; |
193 |
< |
#ifdef FREEBSD |
193 |
> |
#ifdef ALLBSD |
194 |
|
if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){ |
195 |
|
return NULL; |
196 |
|
} |
212 |
|
/* Freebsd doesn't have a "available" inodes */ |
213 |
|
disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes; |
214 |
|
#endif |
215 |
< |
#ifdef LINUX |
215 |
> |
#if defined(LINUX) || defined(CYGWIN) |
216 |
|
if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->mnt_fsname))==NULL){ |
217 |
|
return NULL; |
218 |
|
} |
266 |
|
|
267 |
|
*entries=num_disks; |
268 |
|
|
269 |
< |
/* If this fails, there is very little i can do about it, so i'll ignore it :) */ |
270 |
< |
#if defined(LINUX) || defined(SOLARIS) |
269 |
> |
/* If this fails, there is very little i can do about it, so |
270 |
> |
I'll ignore it :) */ |
271 |
> |
#if defined(LINUX) || defined(CYGWIN) |
272 |
> |
endmntent(f); |
273 |
> |
#endif |
274 |
> |
#if defined(SOLARIS) |
275 |
|
fclose(f); |
276 |
|
#endif |
277 |
|
|
287 |
|
} |
288 |
|
} |
289 |
|
|
295 |
– |
#ifdef SOLARIS |
296 |
– |
char *drive_map(char *sunos_name){ |
297 |
– |
file_line_t *file_lines = NULL; |
298 |
– |
file_line_t *f_ptr; |
299 |
– |
static disk_mapping_t *disk_mapping = NULL; |
300 |
– |
disk_mapping_t *d_ptr; |
301 |
– |
int x = 0; |
302 |
– |
int y = 256; |
303 |
– |
FILE *f; |
304 |
– |
DIR *dsk; |
305 |
– |
struct dirent *dsk_ent; |
306 |
– |
char linkpointer[PATH_MAX]; |
307 |
– |
char link_path[PATH_MAX]; |
308 |
– |
char *p, *r, *q; |
309 |
– |
|
310 |
– |
int dev_num; |
311 |
– |
char dev_name[51]; |
312 |
– |
|
313 |
– |
if(disk_mapping == NULL){ |
314 |
– |
/* Read in the path_to_inst file into memory */ |
315 |
– |
file_lines = malloc(sizeof(file_line_t) * y); |
316 |
– |
f_ptr = file_lines; |
317 |
– |
if(file_lines == NULL) return NULL; |
318 |
– |
f = fopen("/etc/path_to_inst", "r"); |
319 |
– |
if (f == NULL){ |
320 |
– |
free(file_lines); |
321 |
– |
return NULL; |
322 |
– |
} |
323 |
– |
for(x=0;fgets(f_ptr->line, sizeof(f_ptr->line), f);x++){ |
324 |
– |
if ((x+1) >= y){ |
325 |
– |
y = y*2; |
326 |
– |
file_lines = realloc(file_lines, sizeof(file_line_t) * y); |
327 |
– |
if (file_lines == NULL) return NULL; |
328 |
– |
f_ptr=file_lines+x; |
329 |
– |
} |
330 |
– |
f_ptr++; |
331 |
– |
} |
332 |
– |
f_ptr = NULL; |
333 |
– |
fclose(f); |
334 |
– |
|
335 |
– |
dsk = opendir("/dev/dsk"); |
336 |
– |
if (dsk == NULL){ |
337 |
– |
free(file_lines); |
338 |
– |
return NULL; |
339 |
– |
} |
340 |
– |
|
341 |
– |
while((dsk_ent = readdir(dsk)) != NULL){ |
342 |
– |
snprintf(link_path, sizeof(link_path), "/dev/dsk/%s", dsk_ent->d_name); |
343 |
– |
/* Ignore the non symlinks, e.g. ".." and "." */ |
344 |
– |
if((readlink(link_path, linkpointer, PATH_MAX)) == -1) continue; |
345 |
– |
/* We are only intrested in the string past the ../../devices/ part */ |
346 |
– |
p = strstr(linkpointer, "devices"); |
347 |
– |
p+=8; |
348 |
– |
|
349 |
– |
/* We are not intrested in the :a etc slices */ |
350 |
– |
q = strrchr(p, ':'); |
351 |
– |
*q = '\0'; |
352 |
– |
|
353 |
– |
/* char *p should not contain the info we need to look up in the |
354 |
– |
* path_to_inst file. |
355 |
– |
*/ |
356 |
– |
|
357 |
– |
for(f_ptr = file_lines; f_ptr != NULL; f_ptr++){ |
358 |
– |
r = strstr(f_ptr->line, p); |
359 |
– |
if (r != NULL) break; |
360 |
– |
} |
361 |
– |
|
362 |
– |
if(r == NULL){ |
363 |
– |
free(file_lines); |
364 |
– |
closedir(dsk); |
365 |
– |
return NULL; |
366 |
– |
} |
367 |
– |
|
368 |
– |
/* f_ptr should be pointing to the line of path_to_inst we are intrested in now */ |
369 |
– |
|
370 |
– |
sscanf(r, "%*s %d \"%50s", &dev_num, dev_name); |
371 |
– |
q = strrchr(dev_name, '"'); |
372 |
– |
if (q == NULL){ |
373 |
– |
free(file_lines); |
374 |
– |
closedir(dsk); |
375 |
– |
return NULL; |
376 |
– |
} |
377 |
– |
*q = '\0'; |
378 |
– |
|
379 |
– |
/* Nasty... Add the number to the end of the string.. This means |
380 |
– |
* dev_name now contains the sunos name.. E.g. ssd1 |
381 |
– |
*/ |
382 |
– |
snprintf(dev_name, 50, "%s%d", dev_name, dev_num); |
383 |
– |
if (disk_mapping == NULL){ |
384 |
– |
disk_mapping = malloc(sizeof(disk_mapping_t)); |
385 |
– |
d_ptr = disk_mapping; |
386 |
– |
}else{ |
387 |
– |
d_ptr->next = malloc(sizeof(disk_mapping_t)); |
388 |
– |
d_ptr = d_ptr->next; |
389 |
– |
} |
390 |
– |
|
391 |
– |
if (d_ptr == NULL){ |
392 |
– |
free(file_lines); |
393 |
– |
closedir(dsk); |
394 |
– |
return NULL; |
395 |
– |
} |
396 |
– |
|
397 |
– |
if( ((d_ptr->sunos_name = strdup(dev_name)) == NULL) || |
398 |
– |
((d_ptr->solaris_name = strdup(dsk_ent->d_name))==NULL) ){ |
399 |
– |
free(file_lines); |
400 |
– |
closedir(dsk); |
401 |
– |
return NULL; |
402 |
– |
} |
403 |
– |
} |
404 |
– |
free(file_lines); |
405 |
– |
closedir(dsk); |
406 |
– |
} |
407 |
– |
|
408 |
– |
for(d_ptr = disk_mapping; d_ptr !=NULL; d_ptr=d_ptr->next){ |
409 |
– |
if(!strcmp(sunos_name, d_ptr->sunos_name)){ |
410 |
– |
return (strdup(d_ptr->solaris_name)); |
411 |
– |
} |
412 |
– |
} |
413 |
– |
|
414 |
– |
/* If we really fail to find it.. Return the original name back */ |
415 |
– |
return strdup(sunos_name); |
416 |
– |
} |
417 |
– |
|
418 |
– |
#endif |
419 |
– |
|
290 |
|
diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){ |
291 |
|
|
292 |
|
if(diskio_stats==NULL){ |
326 |
|
diskio_stat_t *get_diskio_stats(int *entries){ |
327 |
|
|
328 |
|
static int sizeof_diskio_stats=0; |
329 |
+ |
#ifndef LINUX |
330 |
|
diskio_stat_t *diskio_stats_ptr; |
331 |
+ |
#endif |
332 |
|
|
333 |
|
#ifdef SOLARIS |
334 |
|
kstat_ctl_t *kc; |
339 |
|
FILE *f; |
340 |
|
char *line_ptr; |
341 |
|
int major, minor; |
470 |
– |
char dev_letter; |
342 |
|
int has_pp_stats = 1; |
343 |
|
static partition *parts = NULL; |
344 |
|
static int alloc_parts = 0; |
345 |
|
int i, n; |
346 |
|
time_t now; |
347 |
+ |
const char *format; |
348 |
|
#endif |
349 |
|
#ifdef FREEBSD |
350 |
|
static struct statinfo stats; |
355 |
|
long sel_gen; |
356 |
|
struct devstat *dev_ptr; |
357 |
|
#endif |
358 |
+ |
#ifdef NETBSD |
359 |
+ |
struct disk_sysctl *stats; |
360 |
+ |
int num_disks, i; |
361 |
+ |
int mib[3]; |
362 |
+ |
size_t size; |
363 |
+ |
#endif |
364 |
+ |
|
365 |
|
num_diskio=0; |
366 |
|
|
367 |
+ |
#ifdef NETBSD |
368 |
+ |
mib[0] = CTL_HW; |
369 |
+ |
mib[1] = HW_DISKSTATS; |
370 |
+ |
mib[2] = sizeof(struct disk_sysctl); |
371 |
+ |
|
372 |
+ |
if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) { |
373 |
+ |
return NULL; |
374 |
+ |
} |
375 |
+ |
num_disks = size / sizeof(struct disk_sysctl); |
376 |
+ |
|
377 |
+ |
stats = malloc(size); |
378 |
+ |
if (stats == NULL) { |
379 |
+ |
return NULL; |
380 |
+ |
} |
381 |
+ |
|
382 |
+ |
if (sysctl(mib, 3, stats, &size, NULL, 0) < 0) { |
383 |
+ |
return NULL; |
384 |
+ |
} |
385 |
+ |
|
386 |
+ |
for (i = 0; i < num_disks; i++) { |
387 |
+ |
u_int64_t rbytes, wbytes; |
388 |
+ |
|
389 |
+ |
#ifdef HAVE_DK_RBYTES |
390 |
+ |
rbytes = stats[i].dk_rbytes; |
391 |
+ |
wbytes = stats[i].dk_wbytes; |
392 |
+ |
#else |
393 |
+ |
/* Before 1.7, NetBSD merged reads and writes. */ |
394 |
+ |
rbytes = wbytes = stats[i].dk_bytes; |
395 |
+ |
#endif |
396 |
+ |
|
397 |
+ |
/* Don't keep stats for disks that have never been used. */ |
398 |
+ |
if (rbytes == 0 && wbytes == 0) { |
399 |
+ |
continue; |
400 |
+ |
} |
401 |
+ |
|
402 |
+ |
diskio_stats = diskio_stat_malloc(num_diskio + 1, |
403 |
+ |
&sizeof_diskio_stats, |
404 |
+ |
diskio_stats); |
405 |
+ |
if (diskio_stats == NULL) { |
406 |
+ |
return NULL; |
407 |
+ |
} |
408 |
+ |
diskio_stats_ptr = diskio_stats + num_diskio; |
409 |
+ |
|
410 |
+ |
diskio_stats_ptr->read_bytes = rbytes; |
411 |
+ |
diskio_stats_ptr->write_bytes = wbytes; |
412 |
+ |
if (diskio_stats_ptr->disk_name != NULL) { |
413 |
+ |
free(diskio_stats_ptr->disk_name); |
414 |
+ |
} |
415 |
+ |
diskio_stats_ptr->disk_name = strdup(stats[i].dk_name); |
416 |
+ |
diskio_stats_ptr->systime = time(NULL); |
417 |
+ |
|
418 |
+ |
num_diskio++; |
419 |
+ |
} |
420 |
+ |
|
421 |
+ |
free(stats); |
422 |
+ |
#endif |
423 |
+ |
|
424 |
|
#ifdef FREEBSD |
425 |
|
if (!stats_init) { |
426 |
|
stats.dinfo=malloc(sizeof(struct devinfo)); |
427 |
|
if(stats.dinfo==NULL) return NULL; |
428 |
+ |
bzero(stats.dinfo, sizeof(struct devinfo)); |
429 |
|
stats_init = 1; |
430 |
|
} |
431 |
+ |
#ifdef FREEBSD5 |
432 |
+ |
if ((devstat_getdevs(NULL, &stats)) < 0) return NULL; |
433 |
+ |
/* Not aware of a get all devices, so i said 999. If we ever |
434 |
+ |
* find a machine with more than 999 disks, then i'll change |
435 |
+ |
* this number :) |
436 |
+ |
*/ |
437 |
+ |
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; |
438 |
+ |
#else |
439 |
|
if ((getdevs(&stats)) < 0) return NULL; |
440 |
|
/* Not aware of a get all devices, so i said 999. If we ever |
441 |
|
* find a machine with more than 999 disks, then i'll change |
442 |
|
* this number :) |
443 |
|
*/ |
444 |
|
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; |
445 |
+ |
#endif |
446 |
|
|
447 |
|
for(counter=0;counter<stats.dinfo->numdevs;counter++){ |
448 |
|
dev_ptr=&stats.dinfo->devices[dev_sel[counter].position]; |
451 |
|
* devices.. like mem, proc.. and also doesn't report floppy |
452 |
|
* drives etc unless they are doing stuff :) |
453 |
|
*/ |
454 |
+ |
#ifdef FREEBSD5 |
455 |
+ |
if((dev_ptr->bytes[DEVSTAT_READ]==0) && (dev_ptr->bytes[DEVSTAT_WRITE]==0)) continue; |
456 |
+ |
#else |
457 |
|
if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue; |
458 |
+ |
#endif |
459 |
|
if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){ |
460 |
|
return NULL; |
461 |
|
} |
462 |
|
diskio_stats_ptr=diskio_stats+num_diskio; |
463 |
< |
|
463 |
> |
|
464 |
> |
#ifdef FREEBSD5 |
465 |
> |
diskio_stats_ptr->read_bytes=dev_ptr->bytes[DEVSTAT_READ]; |
466 |
> |
diskio_stats_ptr->write_bytes=dev_ptr->bytes[DEVSTAT_WRITE]; |
467 |
> |
#else |
468 |
|
diskio_stats_ptr->read_bytes=dev_ptr->bytes_read; |
469 |
|
diskio_stats_ptr->write_bytes=dev_ptr->bytes_written; |
470 |
+ |
#endif |
471 |
|
if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name); |
472 |
|
asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number); |
473 |
|
diskio_stats_ptr->systime=time(NULL); |
503 |
|
|
504 |
|
if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name); |
505 |
|
|
506 |
< |
diskio_stats_ptr->disk_name=drive_map(ksp->ks_name); |
506 |
> |
diskio_stats_ptr->disk_name=strdup(ksp->ks_name); |
507 |
|
diskio_stats_ptr->systime=time(NULL); |
508 |
|
num_diskio++; |
509 |
|
} |
517 |
|
n = 0; |
518 |
|
|
519 |
|
/* Read /proc/partitions to find what devices exist. Recent 2.4 kernels |
520 |
< |
have statistics in here too, so we can use those directly. */ |
520 |
> |
have statistics in here too, so we can use those directly. |
521 |
> |
2.6 kernels have /proc/diskstats instead with almost (but not quite) |
522 |
> |
the same format. */ |
523 |
|
|
524 |
< |
f = fopen("/proc/partitions", "r"); |
524 |
> |
f = fopen("/proc/diskstats", "r"); |
525 |
> |
format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld"; |
526 |
> |
if (f == NULL) { |
527 |
> |
f = fopen("/proc/partitions", "r"); |
528 |
> |
format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld"; |
529 |
> |
} |
530 |
|
if (f == NULL) goto out; |
531 |
|
now = time(NULL); |
532 |
|
|
535 |
|
char *s; |
536 |
|
long long rsect, wsect; |
537 |
|
|
538 |
< |
int nr = sscanf(line_ptr, |
577 |
< |
" %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld", |
538 |
> |
int nr = sscanf(line_ptr, format, |
539 |
|
&major, &minor, name, &rsect, &wsect); |
540 |
|
if (nr < 3) continue; |
580 |
– |
if (nr < 5) { |
581 |
– |
has_pp_stats = 0; |
582 |
– |
rsect = 0; |
583 |
– |
wsect = 0; |
584 |
– |
} |
541 |
|
|
542 |
|
/* Skip device names ending in numbers, since they're |
543 |
|
partitions. */ |
545 |
|
while (*s != '\0') s++; |
546 |
|
--s; |
547 |
|
if (*s >= '0' && *s <= '9') continue; |
548 |
+ |
|
549 |
+ |
if (nr < 5) { |
550 |
+ |
has_pp_stats = 0; |
551 |
+ |
rsect = 0; |
552 |
+ |
wsect = 0; |
553 |
+ |
} |
554 |
|
|
555 |
|
diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats, |
556 |
|
diskio_stats); |