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.53 by tdb, Mon Feb 16 14:55:32 2004 UTC vs.
Revision 1.74 by ats, Mon Nov 1 20:36:46 2004 UTC

#	Line 1 | Line 1
1		/*
2	<	* i-scream central monitoring system
2	>	* i-scream libstatgrab
3		* http://www.i-scream.org
4		* Copyright (C) 2000-2004 i-scream
5		*
#	Line 30 | Line 30
30		#include <string.h>
31		#include <time.h>
32		#include "statgrab.h"
33	+	#include "vector.h"
34	+	#include "tools.h"
35
36		#ifdef SOLARIS
37		#include <sys/mnttab.h>
38		#include <sys/statvfs.h>
39		#include <kstat.h>
40	<	#define VALID_FS_TYPES {"ufs", "tmpfs"}
40	>	#define VALID_FS_TYPES {"ufs", "tmpfs", "vxfs"}
41		#endif
42
43		#if defined(LINUX) || defined(CYGWIN)
44		#include <mntent.h>
45		#include <sys/vfs.h>
44	–	#include "tools.h"
46		#endif
47
48		#ifdef LINUX
49		#define VALID_FS_TYPES {"adfs", "affs", "befs", "bfs", "efs", "ext2", \
50	<	"ext3", "vxfs", "hfs", "hfsplus", "hpfs", "jffs", \
51	<	"jffs2", "minix", "msdos", "ntfs", "qnx4", "ramfs", \
52	<	"rootfs", "reiserfs", "sysv", "v7", "udf", "ufs", \
53	<	"umsdos", "vfat", "xfs", "jfs"}
50	>	"ext3", "vxfs", "hfs", "hfsplus", "hpfs", "jffs", \
51	>	"jffs2", "minix", "msdos", "ntfs", "qnx4", "ramfs", \
52	>	"rootfs", "reiserfs", "sysv", "v7", "udf", "ufs", \
53	>	"umsdos", "vfat", "xfs", "jfs"}
54		#endif
55
56		#ifdef CYGWIN
#	Line 65 | Line 66
66		#include <sys/dkstat.h>
67		#include <devstat.h>
68		#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \
69	<	"ufs", "mfs"}
69	>	"ufs", "mfs"}
70		#endif
71		#if defined(NETBSD) || defined(OPENBSD)
72		#include <sys/param.h>
73		#include <sys/sysctl.h>
74		#include <sys/disk.h>
75		#define VALID_FS_TYPES {"ffs", "mfs", "msdos", "lfs", "adosfs", "ext2fs", \
76	<	"ntfs"}
76	>	"ntfs"}
77		#endif
78
79	<	#define START_VAL 1
79	>	#ifdef HPUX
80	>	#include <sys/param.h>
81	>	#include <sys/pstat.h>
82	>	#include <sys/types.h>
83	>	#include <sys/stat.h>
84	>	#include <sys/vfs.h>
85	>	#include <mntent.h>
86	>	#include <dirent.h>
87	>	#include <stdio.h>
88	>	#include <time.h>
89	>	#define VALID_FS_TYPES {"vxfs", "hfs"}
90	>	#endif
91
92	<	char *copy_string(char *orig_ptr, const char *newtext){
93	<
94	<	/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */
95	<	orig_ptr=realloc(orig_ptr, (1+strlen(newtext)));
84	<	if(orig_ptr==NULL){
85	<	return NULL;
86	<	}
87	<	strcpy(orig_ptr, newtext);
88	<
89	<	return orig_ptr;
92	>	static void disk_stat_init(sg_fs_stats *d) {
93	>	d->device_name = NULL;
94	>	d->fs_type = NULL;
95	>	d->mnt_point = NULL;
96		}
97
98	<
99	<	void init_disk_stat(int start, int end, disk_stat_t *disk_stats){
100	<
101	<	for(disk_stats+=start; start<=end; start++){
96	<	disk_stats->device_name=NULL;
97	<	disk_stats->fs_type=NULL;
98	<	disk_stats->mnt_point=NULL;
99	<
100	<	disk_stats++;
101	<	}
98	>	static void disk_stat_destroy(sg_fs_stats *d) {
99	>	free(d->device_name);
100	>	free(d->fs_type);
101	>	free(d->mnt_point);
102		}
103
104	<	int is_valid_fs_type(const char *type) {
104	>	static int is_valid_fs_type(const char *type) {
105		const char *types[] = VALID_FS_TYPES;
106		int i;
107
#	Line 113 | Line 113 | int is_valid_fs_type(const char *type) {
113		return 0;
114		}
115
116	<	disk_stat_t *get_disk_stats(int *entries){
116	>	sg_fs_stats *sg_get_fs_stats(int *entries){
117	>	VECTOR_DECLARE_STATIC(disk_stats, sg_fs_stats, 10,
118	>	disk_stat_init, disk_stat_destroy);
119
118	–	static disk_stat_t *disk_stats;
119	–	static int watermark=-1;
120	–
120		int valid_type;
121		int num_disks=0;
122	<	#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN)
122	>	#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN) || defined(HPUX)
123		FILE *f;
124		#endif
125
126	<	disk_stat_t *disk_ptr;
126	>	sg_fs_stats *disk_ptr;
127
128		#ifdef SOLARIS
129		struct mnttab mp;
130		struct statvfs fs;
131		#endif
132	<	#if defined(LINUX) || defined(CYGWIN)
132	>	#if defined(LINUX) || defined(CYGWIN) || defined(HPUX)
133		struct mntent *mp;
134		struct statfs fs;
135		#endif
136		#ifdef ALLBSD
137		int nummnt;
138	+	#ifdef HAVE_STATVFS
139	+	struct statvfs *mp;
140	+	#else
141		struct statfs *mp;
142		#endif
143	+	#endif
144
142	–	if(watermark==-1){
143	–	disk_stats=malloc(START_VAL * sizeof(disk_stat_t));
144	–	if(disk_stats==NULL){
145	–	return NULL;
146	–	}
147	–	watermark=START_VAL;
148	–	init_disk_stat(0, watermark-1, disk_stats);
149	–	}
145		#ifdef ALLBSD
146		nummnt=getmntinfo(&mp , MNT_LOCAL);
147		if (nummnt<=0){
148	+	sg_set_error_with_errno(SG_ERROR_GETMNTINFO, NULL);
149		return NULL;
150		}
151		for(;nummnt--; mp++){
152		valid_type = is_valid_fs_type(mp->f_fstypename);
153		#endif
154
155	<	#if defined(LINUX) || defined(CYGWIN)
155	>	#if defined(LINUX) || defined(CYGWIN) || defined(HPUX)
156	>	#ifdef MNT_MNTTAB
157	>	if ((f=setmntent(MNT_MNTTAB, "r" ))==NULL){
158	>	#else
159		if ((f=setmntent("/etc/mtab", "r" ))==NULL){
160	+	#endif
161	+	sg_set_error(SG_ERROR_SETMNTENT, NULL);
162		return NULL;
163		}
164
#	Line 171 | Line 172 | disk_stat_t *get_disk_stats(int *entries){
172
173		#ifdef SOLARIS
174		if ((f=fopen("/etc/mnttab", "r" ))==NULL){
175	+	sg_set_error_with_errno(SG_ERROR_OPEN, "/etc/mnttab");
176		return NULL;
177		}
178		while((getmntent(f, &mp)) == 0){
#	Line 181 | Line 183 | disk_stat_t *get_disk_stats(int *entries){
183		#endif
184
185		if(valid_type){
186	<	if(num_disks>watermark-1){
187	<	disk_ptr=disk_stats;
186	<	if((disk_stats=realloc(disk_stats, (watermark*2 * sizeof(disk_stat_t))))==NULL){
187	<	disk_stats=disk_ptr;
188	<	return NULL;
189	<	}
190	<
191	<	watermark=watermark*2;
192	<	init_disk_stat(num_disks, watermark-1, disk_stats);
186	>	if (VECTOR_RESIZE(disk_stats, num_disks + 1) < 0) {
187	>	return NULL;
188		}
194	–
189		disk_ptr=disk_stats+num_disks;
190	+
191		#ifdef ALLBSD
192	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){
192	>	if (sg_update_string(&disk_ptr->device_name, mp->f_mntfromname) < 0) {
193		return NULL;
194		}
195	<
201	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->f_fstypename))==NULL){
195	>	if (sg_update_string(&disk_ptr->fs_type, mp->f_fstypename) < 0) {
196		return NULL;
197		}
198	<
205	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->f_mntonname))==NULL){
198	>	if (sg_update_string(&disk_ptr->mnt_point, mp->f_mntonname) < 0) {
199		return NULL;
200		}
201
#	Line 215 | Line 208 | disk_stat_t *get_disk_stats(int *entries){
208		/* Freebsd doesn't have a "available" inodes */
209		disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes;
210		#endif
211	<	#if defined(LINUX) || defined(CYGWIN)
212	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->mnt_fsname))==NULL){
211	>	#if defined(LINUX) || defined(CYGWIN) || defined(HPUX)
212	>	if (sg_update_string(&disk_ptr->device_name, mp->mnt_fsname) < 0) {
213		return NULL;
214		}
215
216	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->mnt_type))==NULL){
216	>	if (sg_update_string(&disk_ptr->fs_type, mp->mnt_type) < 0) {
217		return NULL;
218		}
219
220	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->mnt_dir))==NULL){
220	>	if (sg_update_string(&disk_ptr->mnt_point, mp->mnt_dir) < 0) {
221		return NULL;
222		}
223		disk_ptr->size = (long long)fs.f_bsize * (long long)fs.f_blocks;
#	Line 238 | Line 231 | disk_stat_t *get_disk_stats(int *entries){
231		#endif
232
233		#ifdef SOLARIS
241	–	/* Memory leak in event of realloc failing */
234		/* Maybe make this char[bigenough] and do strncpy's and put a null in the end?
235		* Downside is its a bit hungry for a lot of mounts, as MNT_MAX_SIZE would prob
236		* be upwards of a k each
237		*/
238	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp.mnt_special))==NULL){
238	>	if (sg_update_string(&disk_ptr->device_name, mp.mnt_special) < 0) {
239		return NULL;
240		}
241
242	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp.mnt_fstype))==NULL){
243	<	return NULL;
244	<	}
242	>	if (sg_update_string(&disk_ptr->fs_type, mp.mnt_fstype) < 0) {
243	>	return NULL;
244	>	}
245
246	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp.mnt_mountp))==NULL){
247	<	return NULL;
248	<	}
246	>	if (sg_update_string(&disk_ptr->mnt_point, mp.mnt_mountp) < 0) {
247	>	return NULL;
248	>	}
249
250		disk_ptr->size = (long long)fs.f_frsize * (long long)fs.f_blocks;
251		disk_ptr->avail = (long long)fs.f_frsize * (long long)fs.f_bavail;
#	Line 270 | Line 262 | disk_stat_t *get_disk_stats(int *entries){
262		*entries=num_disks;
263
264		/* If this fails, there is very little i can do about it, so
265	<	I'll ignore it :) */
266	<	#if defined(LINUX) || defined(CYGWIN)
265	>	I'll ignore it :) */
266	>	#if defined(LINUX) || defined(CYGWIN) || defined(HPUX)
267		endmntent(f);
268		#endif
269		#if defined(SOLARIS)
#	Line 281 | Line 273 | disk_stat_t *get_disk_stats(int *entries){
273		return disk_stats;
274
275		}
284	–	void diskio_stat_init(int start, int end, diskio_stat_t *diskio_stats){
276
277	<	for(diskio_stats+=start; start<end; start++){
278	<	diskio_stats->disk_name=NULL;
279	<
280	<	diskio_stats++;
281	<	}
277	>	int sg_fs_compare_device_name(const void *va, const void *vb) {
278	>	const sg_fs_stats *a = (const sg_fs_stats *)va;
279	>	const sg_fs_stats *b = (const sg_fs_stats *)vb;
280	>
281	>	return strcmp(a->device_name, b->device_name);
282		}
283
284	<	diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){
284	>	int sg_fs_compare_mnt_point(const void *va, const void *vb) {
285	>	const sg_fs_stats *a = (const sg_fs_stats *)va;
286	>	const sg_fs_stats *b = (const sg_fs_stats *)vb;
287
288	<	if(diskio_stats==NULL){
288	>	return strcmp(a->mnt_point, b->mnt_point);
289	>	}
290
291	<	if((diskio_stats=malloc(needed_entries * sizeof(diskio_stat_t)))==NULL){
292	<	return NULL;
293	<	}
300	<	diskio_stat_init(0, needed_entries, diskio_stats);
301	<	*cur_entries=needed_entries;
291	>	static void diskio_stat_init(sg_disk_io_stats *d) {
292	>	d->disk_name = NULL;
293	>	}
294
295	<	return diskio_stats;
296	<	}
305	<
306	<
307	<	if(*cur_entries<needed_entries){
308	<	diskio_stats=realloc(diskio_stats, (sizeof(diskio_stat_t)*needed_entries));
309	<	if(diskio_stats==NULL){
310	<	return NULL;
311	<	}
312	<	diskio_stat_init(*cur_entries, needed_entries, diskio_stats);
313	<	*cur_entries=needed_entries;
314	<	}
315	<
316	<	return diskio_stats;
295	>	static void diskio_stat_destroy(sg_disk_io_stats *d) {
296	>	free(d->disk_name);
297		}
298
299	<	static diskio_stat_t *diskio_stats=NULL;
300	<	static int num_diskio=0;
299	>	VECTOR_DECLARE_STATIC(diskio_stats, sg_disk_io_stats, 10,
300	>	diskio_stat_init, diskio_stat_destroy);
301
302		#ifdef LINUX
303		typedef struct {
#	Line 326 | Line 306 | typedef struct {
306		} partition;
307		#endif
308
309	<	diskio_stat_t *get_diskio_stats(int *entries){
310	<
331	<	static int sizeof_diskio_stats=0;
309	>	sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
310	>	int num_diskio;
311		#ifndef LINUX
312	<	diskio_stat_t *diskio_stats_ptr;
312	>	sg_disk_io_stats *diskio_stats_ptr;
313		#endif
314
315	+	#ifdef HPUX
316	+	long long rbytes = 0, wbytes = 0;
317	+	struct dirent *dinfo = NULL;
318	+	struct stat lstatinfo;
319	+	struct pst_diskinfo pstat_diskinfo;
320	+	char fullpathbuf[1024] = {0};
321	+	dev_t diskid;
322	+	DIR *dh = NULL;
323	+	int disknum = 0;
324	+	#endif
325		#ifdef SOLARIS
326	<	kstat_ctl_t *kc;
327	<	kstat_t *ksp;
326	>	kstat_ctl_t *kc;
327	>	kstat_t *ksp;
328		kstat_io_t kios;
329		#endif
330		#ifdef LINUX
#	Line 343 | Line 332 | diskio_stat_t *get_diskio_stats(int *entries){
332		char *line_ptr;
333		int major, minor;
334		int has_pp_stats = 1;
335	<	static partition *parts = NULL;
347	<	static int alloc_parts = 0;
335	>	VECTOR_DECLARE_STATIC(parts, partition, 16, NULL, NULL);
336		int i, n;
337		time_t now;
338		const char *format;
#	Line 381 | Line 369 | diskio_stat_t *get_diskio_stats(int *entries){
369
370		num_diskio=0;
371
372	+	#ifdef HPUX
373	+
374	+	/* The "128" here is arbitrary, it can be increased to any number
375	+	at the expense of only more system calls to pstat(). */
376	+	for (disknum = 0; disknum < 128; disknum++) {
377	+	if (pstat_getdisk(&pstat_diskinfo, sizeof(pstat_diskinfo), 1, disknum) == -1) {
378	+	break;
379	+	}
380	+
381	+	if (pstat_diskinfo.psd_idx != disknum) {
382	+	continue;
383	+	}
384	+
385	+	/* Skip "disabled" disks.. */
386	+	if (pstat_diskinfo.psd_status == 0) {
387	+	continue;
388	+	}
389	+
390	+	/* We can't seperate the reads from the writes, we'll
391	+	just give the same to each. */
392	+	rbytes = wbytes = (pstat_diskinfo.psd_dkwds * 64);
393	+
394	+	/* Skip unused disks. */
395	+	if (rbytes == 0 && wbytes == 0) {
396	+	continue;
397	+	}
398	+
399	+	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
400	+	return NULL;
401	+	}
402	+
403	+	diskio_stats_ptr = diskio_stats + num_diskio;
404	+
405	+	diskio_stats_ptr->read_bytes = rbytes;
406	+	diskio_stats_ptr->write_bytes = wbytes;
407	+
408	+	diskio_stats_ptr->systime = time(NULL);
409	+
410	+	num_diskio++;
411	+
412	+	if (diskio_stats_ptr->disk_name == NULL) {
413	+	dh = opendir("/dev/dsk");
414	+	if (dh == NULL) {
415	+	continue;
416	+	}
417	+
418	+	diskid = (pstat_diskinfo.psd_dev.psd_major << 24) | pstat_diskinfo.psd_dev.psd_minor;
419	+	while (1) {
420	+	dinfo = readdir(dh);
421	+	if (dinfo == NULL) {
422	+	break;
423	+	}
424	+	snprintf(fullpathbuf, sizeof(fullpathbuf), "/dev/dsk/%s", dinfo->d_name);
425	+	if (lstat(fullpathbuf, &lstatinfo) < 0) {
426	+	continue;
427	+	}
428	+
429	+	if (lstatinfo.st_rdev == diskid) {
430	+	if (sg_update_string(&diskio_stats_ptr->disk_name, dinfo->d_name) < 0) {
431	+	return NULL;
432	+	}
433	+	break;
434	+	}
435	+	}
436	+	closedir(dh);
437	+
438	+	if (diskio_stats_ptr->disk_name == NULL) {
439	+	if (sg_update_string(&diskio_stats_ptr->disk_name, pstat_diskinfo.psd_hw_path.psh_name) < 0) {
440	+	return NULL;
441	+	}
442	+	}
443	+	}
444	+	}
445	+	#endif
446		#ifdef OPENBSD
447		mib[0] = CTL_HW;
448		mib[1] = HW_DISKCOUNT;
449
450		size = sizeof(diskcount);
451		if (sysctl(mib, MIBSIZE, &diskcount, &size, NULL, 0) < 0) {
452	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKCOUNT");
453		return NULL;
454		}
455
#	Line 394 | Line 457 | diskio_stat_t *get_diskio_stats(int *entries){
457		mib[1] = HW_DISKNAMES;
458
459		if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
460	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
461		return NULL;
462		}
463
464	<	disknames = malloc(size);
464	>	disknames = sg_malloc(size);
465		if (disknames == NULL) {
466		return NULL;
467		}
468
469		if (sysctl(mib, MIBSIZE, disknames, &size, NULL, 0) < 0) {
470	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
471		return NULL;
472		}
473
474	<	dk_name = calloc(diskcount, sizeof(char *));
474	>	dk_name = sg_malloc(diskcount * sizeof(char *));
475		bufpp = disknames;
476		for (i = 0; i < diskcount && (name = strsep(&bufpp, ",")) != NULL; i++) {
477		dk_name[i] = name;
#	Line 421 | Line 486 | diskio_stat_t *get_diskio_stats(int *entries){
486		#endif
487
488		if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
489	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
490		return NULL;
491		}
492
#	Line 430 | Line 496 | diskio_stat_t *get_diskio_stats(int *entries){
496		num_disks = size / sizeof(struct diskstats);
497		#endif
498
499	<	stats = malloc(size);
499	>	stats = sg_malloc(size);
500		if (stats == NULL) {
501		return NULL;
502		}
503
504		if (sysctl(mib, MIBSIZE, stats, &size, NULL, 0) < 0) {
505	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
506		return NULL;
507		}
508
509		for (i = 0; i < num_disks; i++) {
510	+	const char *name;
511		u_int64_t rbytes, wbytes;
512
513		#ifdef NETBSD
#	Line 447 | Line 515 | diskio_stat_t *get_diskio_stats(int *entries){
515		rbytes = stats[i].dk_rbytes;
516		wbytes = stats[i].dk_wbytes;
517		#else
518	<	/* Before 1.7, NetBSD merged reads and writes. */
518	>	/* Before 2.0, NetBSD merged reads and writes. */
519		rbytes = wbytes = stats[i].dk_bytes;
520		#endif
521		#else
522	+	#ifdef HAVE_DS_RBYTES
523	+	rbytes = stats[i].ds_rbytes;
524	+	wbytes = stats[i].ds_wbytes;
525	+	#else
526	+	/* Before 3.5, OpenBSD merged reads and writes */
527		rbytes = wbytes = stats[i].ds_bytes;
528		#endif
529	+	#endif
530
531		/* Don't keep stats for disks that have never been used. */
532		if (rbytes == 0 && wbytes == 0) {
533		continue;
534		}
535
536	<	diskio_stats = diskio_stat_malloc(num_diskio + 1,
463	<	&sizeof_diskio_stats,
464	<	diskio_stats);
465	<	if (diskio_stats == NULL) {
536	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
537		return NULL;
538		}
539		diskio_stats_ptr = diskio_stats + num_diskio;
540
541		diskio_stats_ptr->read_bytes = rbytes;
542		diskio_stats_ptr->write_bytes = wbytes;
472	–	if (diskio_stats_ptr->disk_name != NULL) {
473	–	free(diskio_stats_ptr->disk_name);
474	–	}
543		#ifdef NETBSD
544	<	diskio_stats_ptr->disk_name = strdup(stats[i].dk_name);
544	>	name = stats[i].dk_name;
545		#else
546	<	diskio_stats_ptr->disk_name = strdup(dk_name[i]);
546	>	name = dk_name[i];
547		#endif
548	+	if (sg_update_string(&diskio_stats_ptr->disk_name, name) < 0) {
549	+	return NULL;
550	+	}
551		diskio_stats_ptr->systime = time(NULL);
552
553		num_diskio++;
#	Line 491 | Line 562 | diskio_stat_t *get_diskio_stats(int *entries){
562
563		#if defined(FREEBSD) || defined(DFBSD)
564		if (!stats_init) {
565	<	stats.dinfo=malloc(sizeof(struct devinfo));
565	>	stats.dinfo=sg_malloc(sizeof(struct devinfo));
566		if(stats.dinfo==NULL) return NULL;
567		bzero(stats.dinfo, sizeof(struct devinfo));
568		stats_init = 1;
569		}
570		#ifdef FREEBSD5
571	<	if ((devstat_getdevs(NULL, &stats)) < 0) return NULL;
571	>	if ((devstat_getdevs(NULL, &stats)) < 0) {
572	>	/* FIXME devstat functions return a string error in
573	>	devstat_errbuf */
574	>	sg_set_error(SG_ERROR_DEVSTAT_GETDEVS, NULL);
575	>	return NULL;
576	>	}
577		/* Not aware of a get all devices, so i said 999. If we ever
578		* find a machine with more than 999 disks, then i'll change
579		* this number :)
580		*/
581	<	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;
581	>	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) {
582	>	sg_set_error(SG_ERROR_DEVSTAT_SELECTDEVS, NULL);
583	>	return NULL;
584	>	}
585		#else
586	<	if ((getdevs(&stats)) < 0) return NULL;
586	>	if ((getdevs(&stats)) < 0) {
587	>	sg_set_error(SG_ERROR_DEVSTAT_GETDEVS, NULL);
588	>	return NULL;
589	>	}
590		/* Not aware of a get all devices, so i said 999. If we ever
591		* find a machine with more than 999 disks, then i'll change
592		* this number :)
593		*/
594	<	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;
594	>	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) {
595	>	sg_set_error(SG_ERROR_DEVSTAT_SELECTDEVS, NULL);
596	>	return NULL;
597	>	}
598		#endif
599
600		for(counter=0;counter<stats.dinfo->numdevs;counter++){
#	Line 524 | Line 609 | diskio_stat_t *get_diskio_stats(int *entries){
609		#else
610		if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue;
611		#endif
612	<	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
612	>
613	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
614		return NULL;
615		}
616		diskio_stats_ptr=diskio_stats+num_diskio;
#	Line 537 | Line 623 | diskio_stat_t *get_diskio_stats(int *entries){
623		diskio_stats_ptr->write_bytes=dev_ptr->bytes_written;
624		#endif
625		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
626	<	asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number);
626	>	if (asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number) == -1) {
627	>	sg_set_error_with_errno(SG_ERROR_ASPRINTF, NULL);
628	>	return NULL;
629	>	}
630		diskio_stats_ptr->systime=time(NULL);
631
632		num_diskio++;
#	Line 547 | Line 636 | diskio_stat_t *get_diskio_stats(int *entries){
636		#endif
637		#ifdef SOLARIS
638		if ((kc = kstat_open()) == NULL) {
639	<	return NULL;
640	<	}
639	>	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
640	>	return NULL;
641	>	}
642
643		for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
644	<	if (!strcmp(ksp->ks_class, "disk")) {
644	>	if (!strcmp(ksp->ks_class, "disk")) {
645
646		if(ksp->ks_type != KSTAT_TYPE_IO) continue;
647		/* We dont want metadevices appearins as num_diskio */
648		if(strcmp(ksp->ks_module, "md")==0) continue;
649	<	if((kstat_read(kc, ksp, &kios))==-1){
649	>	if((kstat_read(kc, ksp, &kios))==-1){
650		}
651
652	<	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
652	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
653		kstat_close(kc);
654		return NULL;
655		}
656		diskio_stats_ptr=diskio_stats+num_diskio;
657
658		diskio_stats_ptr->read_bytes=kios.nread;
569	–
659		diskio_stats_ptr->write_bytes=kios.nwritten;
660	<
661	<	if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
662	<
663	<	diskio_stats_ptr->disk_name=strdup((char *) get_svr_from_bsd(ksp->ks_name));
660	>	if (sg_update_string(&diskio_stats_ptr->disk_name,
661	>	sg_get_svr_from_bsd(ksp->ks_name)) < 0) {
662	>	return NULL;
663	>	}
664		diskio_stats_ptr->systime=time(NULL);
665	+
666		num_diskio++;
667		}
668		}
#	Line 590 | Line 680 | diskio_stat_t *get_diskio_stats(int *entries){
680		the same format. */
681
682		f = fopen("/proc/diskstats", "r");
683	<	format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld";
683	>	format = " %d %d %99s %*d %*d %lld %*d %*d %*d %lld";
684		if (f == NULL) {
685		f = fopen("/proc/partitions", "r");
686	<	format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld";
686	>	format = " %d %d %*d %99s %*d %*d %lld %*d %*d %*d %lld";
687		}
688		if (f == NULL) goto out;
689		now = time(NULL);
690
691	<	while ((line_ptr = f_read_line(f, "")) != NULL) {
692	<	char name[20];
691	>	while ((line_ptr = sg_f_read_line(f, "")) != NULL) {
692	>	char name[100];
693		char *s;
694		long long rsect, wsect;
695
#	Line 620 | Line 710 | diskio_stat_t *get_diskio_stats(int *entries){
710		wsect = 0;
711		}
712
713	<	diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats,
714	<	diskio_stats);
625	<	if (diskio_stats == NULL) goto out;
626	<	if (n >= alloc_parts) {
627	<	alloc_parts += 16;
628	<	parts = realloc(parts, alloc_parts * sizeof *parts);
629	<	if (parts == NULL) {
630	<	alloc_parts = 0;
631	<	goto out;
632	<	}
713	>	if (VECTOR_RESIZE(diskio_stats, n + 1) < 0) {
714	>	goto out;
715		}
716	+	if (VECTOR_RESIZE(parts, n + 1) < 0) {
717	+	goto out;
718	+	}
719
720	<	if (diskio_stats[n].disk_name != NULL)
721	<	free(diskio_stats[n].disk_name);
722	<	diskio_stats[n].disk_name = strdup(name);
720	>	if (sg_update_string(&diskio_stats[n].disk_name, name) < 0) {
721	>	goto out;
722	>	}
723		diskio_stats[n].read_bytes = rsect * 512;
724		diskio_stats[n].write_bytes = wsect * 512;
725		diskio_stats[n].systime = now;
#	Line 656 | Line 741 | diskio_stat_t *get_diskio_stats(int *entries){
741		if (f == NULL) goto out;
742		now = time(NULL);
743
744	<	line_ptr = f_read_line(f, "disk_io:");
744	>	line_ptr = sg_f_read_line(f, "disk_io:");
745		if (line_ptr == NULL) goto out;
746
747		while((line_ptr=strchr(line_ptr, ' '))!=NULL){
#	Line 720 | Line 805 | out:
805		#endif
806
807		#ifdef CYGWIN
808	+	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
809		return NULL;
810		#endif
811
#	Line 728 | Line 814 | out:
814		return diskio_stats;
815		}
816
817	<	diskio_stat_t *get_diskio_stats_diff(int *entries){
818	<	static diskio_stat_t *diff = NULL;
819	<	static int diff_count = 0;
820	<	diskio_stat_t *src, *dest;
821	<	int i, j, new_count;
817	>	sg_disk_io_stats *sg_get_disk_io_stats_diff(int *entries){
818	>	VECTOR_DECLARE_STATIC(diff, sg_disk_io_stats, 1,
819	>	diskio_stat_init, diskio_stat_destroy);
820	>	sg_disk_io_stats *src = NULL, *dest;
821	>	int i, j, diff_count, new_count;
822
823		if (diskio_stats == NULL) {
824		/* No previous stats, so we can't calculate a difference. */
825	<	return get_diskio_stats(entries);
825	>	return sg_get_disk_io_stats(entries);
826		}
827
828		/* Resize the results array to match the previous stats. */
829	<	diff = diskio_stat_malloc(num_diskio, &diff_count, diff);
830	<	if (diff == NULL) {
829	>	diff_count = VECTOR_SIZE(diskio_stats);
830	>	if (VECTOR_RESIZE(diff, diff_count) < 0) {
831		return NULL;
832		}
833
#	Line 750 | Line 836 | diskio_stat_t *get_diskio_stats_diff(int *entries){
836		src = &diskio_stats[i];
837		dest = &diff[i];
838
839	<	if (dest->disk_name != NULL) {
840	<	free(dest->disk_name);
839	>	if (sg_update_string(&dest->disk_name, src->disk_name) < 0) {
840	>	return NULL;
841		}
756	–	dest->disk_name = strdup(src->disk_name);
842		dest->read_bytes = src->read_bytes;
843		dest->write_bytes = src->write_bytes;
844		dest->systime = src->systime;
845		}
846
847		/* Get a new set of stats. */
848	<	if (get_diskio_stats(&new_count) == NULL) {
848	>	if (sg_get_disk_io_stats(&new_count) == NULL) {
849		return NULL;
850		}
851
#	Line 791 | Line 876 | diskio_stat_t *get_diskio_stats_diff(int *entries){
876
877		*entries = diff_count;
878		return diff;
879	+	}
880	+
881	+	int sg_disk_io_compare_name(const void *va, const void *vb) {
882	+	const sg_disk_io_stats *a = (const sg_disk_io_stats *)va;
883	+	const sg_disk_io_stats *b = (const sg_disk_io_stats *)vb;
884	+
885	+	return strcmp(a->disk_name, b->disk_name);
886		}
887

Diff Legend

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