ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/disk_stats.c

Comparing projects/libstatgrab/src/libstatgrab/disk_stats.c (file contents):
Revision 1.22 by pajs, Fri Sep 26 16:33:51 2003 UTC vs.
Revision 1.49 by tdb, Mon Jan 19 16:49:21 2004 UTC

#	Line 1 | Line 1
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
#	Line 25 | Line 28
28		#include <stdio.h>
29		#include <stdlib.h>
30		#include <string.h>
31	+	#include <time.h>
32		#include "statgrab.h"
33
34		#ifdef SOLARIS
35		#include <sys/mnttab.h>
36		#include <sys/statvfs.h>
37		#include <kstat.h>
34	–	#include <sys/types.h>
35	–	#include <dirent.h>
36	–	#include <limits.h>
37	–	#include <unistd.h>
38		#define VALID_FS_TYPES {"ufs", "tmpfs"}
39		#endif
40
41	<	#ifdef LINUX
42	<	#include <sys/vfs.h>
41	>	#if defined(LINUX) || defined(CYGWIN)
42		#include <mntent.h>
43	+	#include <sys/vfs.h>
44		#include "tools.h"
45	–	#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	<	#define START_VAL 1
71	<
72	<	/* Solaris kernel stores the disk names in the old BSD format
73	<	* and we would prefer it in th modern format.
74	<	*/
75	<	#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;
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){
81
82		/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */
#	Line 100 | Line 101 | void init_disk_stat(int start, int end, disk_stat_t *d
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;
109	<	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
#	Line 118 | Line 130 | disk_stat_t *get_disk_stats(int *entries){
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
#	Line 135 | Line 147 | disk_stat_t *get_disk_stats(int *entries){
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;
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	<	}
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		}
#	Line 160 | Line 166 | disk_stat_t *get_disk_stats(int *entries){
166		continue;
167		}
168
169	<	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	<	}
169	>	valid_type = is_valid_fs_type(mp->mnt_type);
170		#endif
171
172		#ifdef SOLARIS
#	Line 177 | Line 177 | disk_stat_t *get_disk_stats(int *entries){
177		if ((statvfs(mp.mnt_mountp, &fs)) !=0){
178		continue;
179		}
180	<	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	<	}
180	>	valid_type = is_valid_fs_type(mp.mnt_fstype);
181		#endif
182
183		if(valid_type){
#	Line 199 | Line 193 | disk_stat_t *get_disk_stats(int *entries){
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		}
#	Line 221 | Line 215 | disk_stat_t *get_disk_stats(int *entries){
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		}
#	Line 275 | Line 269 | disk_stat_t *get_disk_stats(int *entries){
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
#	Line 292 | Line 290 | void diskio_stat_init(int start, int end, diskio_stat_
290		}
291		}
292
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	–	}
329	–	f_ptr++;
330	–	}
331	–	f_ptr = NULL;
332	–	fclose(f);
333	–
334	–	dsk = opendir("/dev/dsk");
335	–	if (dsk == NULL){
336	–	free(file_lines);
337	–	return NULL;
338	–	}
339	–
340	–	while((dsk_ent = readdir(dsk)) != NULL){
341	–	snprintf(link_path, sizeof(link_path), "/dev/dsk/%s", dsk_ent->d_name);
342	–	/* Ignore the non symlinks, e.g. ".." and "." */
343	–	if((readlink(link_path, linkpointer, PATH_MAX)) == -1) continue;
344	–	/* We are only intrested in the string past the ../../devices/ part */
345	–	p = strstr(linkpointer, "devices");
346	–	p+=8;
347	–
348	–	/* We are not intrested in the :a etc slices */
349	–	q = strrchr(p, ':');
350	–	*q = '\0';
351	–
352	–	/* char *p should not contain the info we need to look up in the
353	–	* path_to_inst file.
354	–	*/
355	–
356	–	for(f_ptr = file_lines; f_ptr != NULL; f_ptr++){
357	–	r = strstr(f_ptr->line, p);
358	–	if (r != NULL) break;
359	–	}
360	–
361	–	if(r == NULL){
362	–	free(file_lines);
363	–	closedir(dsk);
364	–	return NULL;
365	–	}
366	–
367	–	/* f_ptr should be pointing to the line of path_to_inst we are intrested in now */
368	–
369	–	sscanf(r, "%*s %d \"%50s", &dev_num, dev_name);
370	–	q = strrchr(dev_name, '"');
371	–	if (q == NULL){
372	–	free(file_lines);
373	–	closedir(dsk);
374	–	return NULL;
375	–	}
376	–	*q = '\0';
377	–
378	–	/* Nasty... Add the number to the end of the string.. This means
379	–	* dev_name now contains the sunos name.. E.g. ssd1
380	–	*/
381	–	snprintf(dev_name, 50, "%s%d", dev_name, dev_num);
382	–	if (disk_mapping == NULL){
383	–	disk_mapping = malloc(sizeof(disk_mapping_t));
384	–	d_ptr = disk_mapping;
385	–	}else{
386	–	d_ptr->next = malloc(sizeof(disk_mapping_t));
387	–	d_ptr = d_ptr->next;
388	–	}
389	–
390	–	if (d_ptr == NULL){
391	–	free(file_lines);
392	–	closedir(dsk);
393	–	return NULL;
394	–	}
395	–
396	–	if( ((d_ptr->sunos_name = strdup(dev_name)) == NULL) ||
397	–	((d_ptr->solaris_name = strdup(dsk_ent->d_name))==NULL) ){
398	–	free(file_lines);
399	–	closedir(dsk);
400	–	return NULL;
401	–	}
402	–	}
403	–	free(file_lines);
404	–	closedir(dsk);
405	–	}
406	–
407	–	for(d_ptr = disk_mapping; d_ptr !=NULL; d_ptr=d_ptr->next){
408	–	if(!strcmp(sunos_name, d_ptr->sunos_name)){
409	–	return (strdup(d_ptr->solaris_name));
410	–	}
411	–	}
412	–
413	–	/* If we really fail to find it.. Return the original name back */
414	–	return strdup(sunos_name);
415	–	}
416	–
417	–	#endif
418	–
293		diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){
294
295		if(diskio_stats==NULL){
#	Line 455 | Line 329 | typedef struct {
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;
#	Line 466 | Line 342 | diskio_stat_t *get_diskio_stats(int *entries){
342		FILE *f;
343		char *line_ptr;
344		int major, minor;
469	–	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		static struct statinfo stats;
#	Line 482 | Line 358 | diskio_stat_t *get_diskio_stats(int *entries){
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		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];
#	Line 504 | Line 454 | diskio_stat_t *get_diskio_stats(int *entries){
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);
#	Line 519 | Line 478 | diskio_stat_t *get_diskio_stats(int *entries){
478		num_diskio++;
479		}
480		free(dev_sel);
522	–	free(stats.dinfo);
481
482		#endif
483		#ifdef SOLARIS
#	Line 548 | Line 506 | diskio_stat_t *get_diskio_stats(int *entries){
506
507		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
508
509	<	diskio_stats_ptr->disk_name=drive_map(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		}
#	Line 562 | Line 520 | diskio_stat_t *get_diskio_stats(int *entries){
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. */
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/partitions", "r");
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 (f == NULL) goto out;
534		now = time(NULL);
535
#	Line 573 | Line 538 | diskio_stat_t *get_diskio_stats(int *entries){
538		char *s;
539		long long rsect, wsect;
540
541	<	int nr = sscanf(line_ptr,
577	<	" %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld",
541	>	int nr = sscanf(line_ptr, format,
542		&major, &minor, name, &rsect, &wsect);
543		if (nr < 3) continue;
580	–	if (nr < 5) {
581	–	has_pp_stats = 0;
582	–	rsect = 0;
583	–	wsect = 0;
584	–	}
544
545		/* Skip device names ending in numbers, since they're
546		partitions. */
#	Line 590 | Line 549 | diskio_stat_t *get_diskio_stats(int *entries){
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	+
558		diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats,
559		diskio_stats);
560		if (diskio_stats == NULL) goto out;
#	Line 614 | Line 579 | diskio_stat_t *get_diskio_stats(int *entries){
579		n++;
580		}
581
582	+	fclose(f);
583	+	f = NULL;
584	+
585		if (!has_pp_stats) {
586	<	/* This is an older kernel without stats in /proc/partitions.
587	<	Read what we can from /proc/stat instead. */
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		f = fopen("/proc/stat", "r");
591		if (f == NULL) goto out;
#	Line 683 | Line 652 | diskio_stat_t *get_diskio_stats(int *entries){
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;
#	Line 724 | Line 697 | diskio_stat_t *get_diskio_stats_diff(int *entries){
697		}
698
699		diskio_stats_ptr=get_diskio_stats(&disks);
700	+	if (diskio_stats_ptr == NULL) {
701	+	return NULL;
702	+	}
703		diskio_stats_diff_ptr=diskio_stats_diff;
704
705		for(x=0;x<sizeof_diskio_stats_diff;x++){

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines