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.50 by ats, Wed Jan 21 23:46:54 2004 UTC vs.
Revision 1.66 by tdb, Wed Apr 7 19:26:16 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>
#	Line 41 | Line 43
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 61 | Line 62
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"}
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>
75		#define VALID_FS_TYPES {"ffs", "mfs", "msdos", "lfs", "adosfs", "ext2fs", \
76	<	"ntfs"}
76	>	"ntfs"}
77		#endif
78
79	<	#define START_VAL 1
80	<
81	<	char *copy_string(char *orig_ptr, const char *newtext){
82	<
82	<	/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */
83	<	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;
79	>	static void disk_stat_init(sg_fs_stats *d) {
80	>	d->device_name = NULL;
81	>	d->fs_type = NULL;
82	>	d->mnt_point = NULL;
83		}
84
85	<
86	<	void init_disk_stat(int start, int end, disk_stat_t *disk_stats){
87	<
88	<	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	<	}
85	>	static void disk_stat_destroy(sg_fs_stats *d) {
86	>	free(d->device_name);
87	>	free(d->fs_type);
88	>	free(d->mnt_point);
89		}
90
91	<	int is_valid_fs_type(const char *type) {
91	>	static int is_valid_fs_type(const char *type) {
92		const char *types[] = VALID_FS_TYPES;
93		int i;
94
#	Line 113 | Line 100 | int is_valid_fs_type(const char *type) {
100		return 0;
101		}
102
103	<	disk_stat_t *get_disk_stats(int *entries){
103	>	sg_fs_stats *sg_get_fs_stats(int *entries){
104	>	VECTOR_DECLARE_STATIC(disk_stats, sg_fs_stats, 10,
105	>	disk_stat_init, disk_stat_destroy);
106
118	–	static disk_stat_t *disk_stats;
119	–	static int watermark=-1;
120	–
107		int valid_type;
108		int num_disks=0;
109		#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN)
110		FILE *f;
111		#endif
112
113	<	disk_stat_t *disk_ptr;
113	>	sg_fs_stats *disk_ptr;
114
115		#ifdef SOLARIS
116		struct mnttab mp;
#	Line 139 | Line 125 | disk_stat_t *get_disk_stats(int *entries){
125		struct statfs *mp;
126		#endif
127
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	–	}
128		#ifdef ALLBSD
129		nummnt=getmntinfo(&mp , MNT_LOCAL);
130		if (nummnt<=0){
131	+	sg_set_error(SG_ERROR_GETMNTINFO, NULL);
132		return NULL;
133		}
134		for(;nummnt--; mp++){
#	Line 158 | Line 137 | disk_stat_t *get_disk_stats(int *entries){
137
138		#if defined(LINUX) || defined(CYGWIN)
139		if ((f=setmntent("/etc/mtab", "r" ))==NULL){
140	+	sg_set_error(SG_ERROR_SETMNTENT, NULL);
141		return NULL;
142		}
143
#	Line 171 | Line 151 | disk_stat_t *get_disk_stats(int *entries){
151
152		#ifdef SOLARIS
153		if ((f=fopen("/etc/mnttab", "r" ))==NULL){
154	+	sg_set_error(SG_ERROR_OPEN, "/etc/mnttab");
155		return NULL;
156		}
157		while((getmntent(f, &mp)) == 0){
#	Line 181 | Line 162 | disk_stat_t *get_disk_stats(int *entries){
162		#endif
163
164		if(valid_type){
165	<	if(num_disks>watermark-1){
166	<	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);
165	>	if (VECTOR_RESIZE(disk_stats, num_disks + 1) < 0) {
166	>	return NULL;
167		}
194	–
168		disk_ptr=disk_stats+num_disks;
169	+
170		#ifdef ALLBSD
171	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){
171	>	if (sg_update_string(&disk_ptr->device_name, mp->f_mntfromname) < 0) {
172		return NULL;
173		}
174	<
201	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->f_fstypename))==NULL){
174	>	if (sg_update_string(&disk_ptr->fs_type, mp->f_fstypename) < 0) {
175		return NULL;
176		}
177	<
205	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->f_mntonname))==NULL){
177	>	if (sg_update_string(&disk_ptr->mnt_point, mp->f_mntonname) < 0) {
178		return NULL;
179		}
180
#	Line 216 | Line 188 | disk_stat_t *get_disk_stats(int *entries){
188		disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes;
189		#endif
190		#if defined(LINUX) || defined(CYGWIN)
191	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->mnt_fsname))==NULL){
191	>	if (sg_update_string(&disk_ptr->device_name, mp->mnt_fsname) < 0) {
192		return NULL;
193		}
194
195	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->mnt_type))==NULL){
195	>	if (sg_update_string(&disk_ptr->fs_type, mp->mnt_type) < 0) {
196		return NULL;
197		}
198
199	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->mnt_dir))==NULL){
199	>	if (sg_update_string(&disk_ptr->mnt_point, mp->mnt_dir) < 0) {
200		return NULL;
201		}
202		disk_ptr->size = (long long)fs.f_bsize * (long long)fs.f_blocks;
#	Line 238 | Line 210 | disk_stat_t *get_disk_stats(int *entries){
210		#endif
211
212		#ifdef SOLARIS
241	–	/* Memory leak in event of realloc failing */
213		/* Maybe make this char[bigenough] and do strncpy's and put a null in the end?
214		* Downside is its a bit hungry for a lot of mounts, as MNT_MAX_SIZE would prob
215		* be upwards of a k each
216		*/
217	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp.mnt_special))==NULL){
217	>	if (sg_update_string(&disk_ptr->device_name, mp.mnt_special) < 0) {
218		return NULL;
219		}
220
221	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp.mnt_fstype))==NULL){
222	<	return NULL;
223	<	}
221	>	if (sg_update_string(&disk_ptr->fs_type, mp.mnt_fstype) < 0) {
222	>	return NULL;
223	>	}
224
225	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp.mnt_mountp))==NULL){
226	<	return NULL;
227	<	}
225	>	if (sg_update_string(&disk_ptr->mnt_point, mp.mnt_mountp) < 0) {
226	>	return NULL;
227	>	}
228
229		disk_ptr->size = (long long)fs.f_frsize * (long long)fs.f_blocks;
230		disk_ptr->avail = (long long)fs.f_frsize * (long long)fs.f_bavail;
#	Line 270 | Line 241 | disk_stat_t *get_disk_stats(int *entries){
241		*entries=num_disks;
242
243		/* If this fails, there is very little i can do about it, so
244	<	I'll ignore it :) */
244	>	I'll ignore it :) */
245		#if defined(LINUX) || defined(CYGWIN)
246		endmntent(f);
247		#endif
#	Line 281 | Line 252 | disk_stat_t *get_disk_stats(int *entries){
252		return disk_stats;
253
254		}
284	–	void diskio_stat_init(int start, int end, diskio_stat_t *diskio_stats){
255
256	<	for(diskio_stats+=start; start<end; start++){
257	<	diskio_stats->disk_name=NULL;
288	<
289	<	diskio_stats++;
290	<	}
256	>	static void diskio_stat_init(sg_disk_io_stats *d) {
257	>	d->disk_name = NULL;
258		}
259
260	<	diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){
261	<
295	<	if(diskio_stats==NULL){
296	<
297	<	if((diskio_stats=malloc(needed_entries * sizeof(diskio_stat_t)))==NULL){
298	<	return NULL;
299	<	}
300	<	diskio_stat_init(0, needed_entries, diskio_stats);
301	<	*cur_entries=needed_entries;
302	<
303	<	return diskio_stats;
304	<	}
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;
260	>	static void diskio_stat_destroy(sg_disk_io_stats *d) {
261	>	free(d->disk_name);
262		}
263
264	<	static diskio_stat_t *diskio_stats=NULL;
265	<	static int num_diskio=0;
264	>	VECTOR_DECLARE_STATIC(diskio_stats, sg_disk_io_stats, 10,
265	>	diskio_stat_init, diskio_stat_destroy);
266
267		#ifdef LINUX
268		typedef struct {
#	Line 326 | Line 271 | typedef struct {
271		} partition;
272		#endif
273
274	<	diskio_stat_t *get_diskio_stats(int *entries){
275	<
331	<	static int sizeof_diskio_stats=0;
274	>	sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
275	>	int num_diskio;
276		#ifndef LINUX
277	<	diskio_stat_t *diskio_stats_ptr;
277	>	sg_disk_io_stats *diskio_stats_ptr;
278		#endif
279
280		#ifdef SOLARIS
281	<	kstat_ctl_t *kc;
282	<	kstat_t *ksp;
281	>	kstat_ctl_t *kc;
282	>	kstat_t *ksp;
283		kstat_io_t kios;
284		#endif
285		#ifdef LINUX
#	Line 343 | Line 287 | diskio_stat_t *get_diskio_stats(int *entries){
287		char *line_ptr;
288		int major, minor;
289		int has_pp_stats = 1;
290	<	static partition *parts = NULL;
347	<	static int alloc_parts = 0;
290	>	VECTOR_DECLARE_STATIC(parts, partition, 16, NULL, NULL);
291		int i, n;
292		time_t now;
293		const char *format;
294		#endif
295	<	#ifdef FREEBSD
295	>	#if defined(FREEBSD) || defined(DFBSD)
296		static struct statinfo stats;
297		static int stats_init = 0;
298		int counter;
#	Line 360 | Line 303 | diskio_stat_t *get_diskio_stats(int *entries){
303		#endif
304		#ifdef NETBSD
305		struct disk_sysctl *stats;
306	+	#endif
307	+	#ifdef OPENBSD
308	+	int diskcount;
309	+	char *disknames, *name, *bufpp;
310	+	char **dk_name;
311	+	struct diskstats *stats;
312	+	#endif
313	+	#ifdef NETBSD
314	+	#define MIBSIZE 3
315	+	#endif
316	+	#ifdef OPENBSD
317	+	#define MIBSIZE 2
318	+	#endif
319	+	#if defined(NETBSD) || defined(OPENBSD)
320		int num_disks, i;
321	<	int mib[3];
321	>	int mib[MIBSIZE];
322		size_t size;
323		#endif
324
325		num_diskio=0;
326
327	<	#ifdef NETBSD
327	>	#ifdef OPENBSD
328		mib[0] = CTL_HW;
329	+	mib[1] = HW_DISKCOUNT;
330	+
331	+	size = sizeof(diskcount);
332	+	if (sysctl(mib, MIBSIZE, &diskcount, &size, NULL, 0) < 0) {
333	+	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKCOUNT");
334	+	return NULL;
335	+	}
336	+
337	+	mib[0] = CTL_HW;
338	+	mib[1] = HW_DISKNAMES;
339	+
340	+	if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
341	+	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
342	+	return NULL;
343	+	}
344	+
345	+	disknames = sg_malloc(size);
346	+	if (disknames == NULL) {
347	+	return NULL;
348	+	}
349	+
350	+	if (sysctl(mib, MIBSIZE, disknames, &size, NULL, 0) < 0) {
351	+	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
352	+	return NULL;
353	+	}
354	+
355	+	dk_name = sg_malloc(diskcount * sizeof(char *));
356	+	bufpp = disknames;
357	+	for (i = 0; i < diskcount && (name = strsep(&bufpp, ",")) != NULL; i++) {
358	+	dk_name[i] = name;
359	+	}
360	+	#endif
361	+
362	+	#if defined(NETBSD) || defined(OPENBSD)
363	+	mib[0] = CTL_HW;
364		mib[1] = HW_DISKSTATS;
365	+	#ifdef NETBSD
366		mib[2] = sizeof(struct disk_sysctl);
367	+	#endif
368
369	<	if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
369	>	if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
370	>	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
371		return NULL;
372		}
373	+
374	+	#ifdef NETBSD
375		num_disks = size / sizeof(struct disk_sysctl);
376	+	#else
377	+	num_disks = size / sizeof(struct diskstats);
378	+	#endif
379
380	<	stats = malloc(size);
380	>	stats = sg_malloc(size);
381		if (stats == NULL) {
382		return NULL;
383		}
384
385	<	if (sysctl(mib, 3, stats, &size, NULL, 0) < 0) {
385	>	if (sysctl(mib, MIBSIZE, stats, &size, NULL, 0) < 0) {
386	>	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
387		return NULL;
388		}
389
390		for (i = 0; i < num_disks; i++) {
391	+	const char *name;
392		u_int64_t rbytes, wbytes;
393
394	+	#ifdef NETBSD
395		#ifdef HAVE_DK_RBYTES
396		rbytes = stats[i].dk_rbytes;
397		wbytes = stats[i].dk_wbytes;
#	Line 396 | Line 399 | diskio_stat_t *get_diskio_stats(int *entries){
399		/* Before 1.7, NetBSD merged reads and writes. */
400		rbytes = wbytes = stats[i].dk_bytes;
401		#endif
402	+	#else
403	+	rbytes = wbytes = stats[i].ds_bytes;
404	+	#endif
405
406		/* Don't keep stats for disks that have never been used. */
407		if (rbytes == 0 && wbytes == 0) {
408		continue;
409		}
410
411	<	diskio_stats = diskio_stat_malloc(num_diskio + 1,
406	<	&sizeof_diskio_stats,
407	<	diskio_stats);
408	<	if (diskio_stats == NULL) {
411	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
412		return NULL;
413		}
414		diskio_stats_ptr = diskio_stats + num_diskio;
415
416		diskio_stats_ptr->read_bytes = rbytes;
417		diskio_stats_ptr->write_bytes = wbytes;
418	<	if (diskio_stats_ptr->disk_name != NULL) {
419	<	free(diskio_stats_ptr->disk_name);
418	>	#ifdef NETBSD
419	>	name = stats[i].dk_name;
420	>	#else
421	>	name = dk_name[i];
422	>	#endif
423	>	if (sg_update_string(&diskio_stats_ptr->disk_name, name) < 0) {
424	>	return NULL;
425		}
418	–	diskio_stats_ptr->disk_name = strdup(stats[i].dk_name);
426		diskio_stats_ptr->systime = time(NULL);
427
428		num_diskio++;
429		}
430
431		free(stats);
432	+	#ifdef OPENBSD
433	+	free(dk_name);
434	+	free(disknames);
435		#endif
436	+	#endif
437
438	<	#ifdef FREEBSD
438	>	#if defined(FREEBSD) || defined(DFBSD)
439		if (!stats_init) {
440	<	stats.dinfo=malloc(sizeof(struct devinfo));
440	>	stats.dinfo=sg_malloc(sizeof(struct devinfo));
441		if(stats.dinfo==NULL) return NULL;
442		bzero(stats.dinfo, sizeof(struct devinfo));
443		stats_init = 1;
444		}
445		#ifdef FREEBSD5
446	<	if ((devstat_getdevs(NULL, &stats)) < 0) return NULL;
446	>	if ((devstat_getdevs(NULL, &stats)) < 0) {
447	>	sg_set_error(SG_ERROR_DEVSTAT_GETDEVS, NULL);
448	>	return NULL;
449	>	}
450		/* Not aware of a get all devices, so i said 999. If we ever
451		* find a machine with more than 999 disks, then i'll change
452		* this number :)
453		*/
454	<	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;
454	>	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) {
455	>	sg_set_error(SG_ERROR_DEVSTAT_SELECTDEVS, NULL);
456	>	return NULL;
457	>	}
458		#else
459	<	if ((getdevs(&stats)) < 0) return NULL;
459	>	if ((getdevs(&stats)) < 0) {
460	>	sg_set_error(SG_ERROR_DEVSTAT_GETDEVS, NULL);
461	>	return NULL;
462	>	}
463		/* Not aware of a get all devices, so i said 999. If we ever
464		* find a machine with more than 999 disks, then i'll change
465		* this number :)
466		*/
467	<	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;
467	>	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) {
468	>	sg_set_error(SG_ERROR_DEVSTAT_SELECTDEVS, NULL);
469	>	return NULL;
470	>	}
471		#endif
472
473		for(counter=0;counter<stats.dinfo->numdevs;counter++){
#	Line 459 | Line 482 | diskio_stat_t *get_diskio_stats(int *entries){
482		#else
483		if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue;
484		#endif
485	<	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
485	>
486	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
487		return NULL;
488		}
489		diskio_stats_ptr=diskio_stats+num_diskio;
#	Line 472 | Line 496 | diskio_stat_t *get_diskio_stats(int *entries){
496		diskio_stats_ptr->write_bytes=dev_ptr->bytes_written;
497		#endif
498		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
499	<	asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number);
499	>	if (asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number) == -1) {
500	>	sg_set_error(SG_ERROR_ASPRINTF, NULL);
501	>	return NULL;
502	>	}
503		diskio_stats_ptr->systime=time(NULL);
504
505		num_diskio++;
#	Line 482 | Line 509 | diskio_stat_t *get_diskio_stats(int *entries){
509		#endif
510		#ifdef SOLARIS
511		if ((kc = kstat_open()) == NULL) {
512	<	return NULL;
513	<	}
512	>	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
513	>	return NULL;
514	>	}
515
516		for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
517	<	if (!strcmp(ksp->ks_class, "disk")) {
517	>	if (!strcmp(ksp->ks_class, "disk")) {
518
519		if(ksp->ks_type != KSTAT_TYPE_IO) continue;
520		/* We dont want metadevices appearins as num_diskio */
521		if(strcmp(ksp->ks_module, "md")==0) continue;
522	<	if((kstat_read(kc, ksp, &kios))==-1){
522	>	if((kstat_read(kc, ksp, &kios))==-1){
523		}
524
525	<	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
525	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
526		kstat_close(kc);
527		return NULL;
528		}
529		diskio_stats_ptr=diskio_stats+num_diskio;
530
531		diskio_stats_ptr->read_bytes=kios.nread;
504	–
532		diskio_stats_ptr->write_bytes=kios.nwritten;
533	<
534	<	if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
535	<
536	<	diskio_stats_ptr->disk_name=strdup((char *) get_svr_from_bsd(ksp->ks_name));
533	>	if (sg_update_string(&diskio_stats_ptr->disk_name,
534	>	sg_get_svr_from_bsd(ksp->ks_name)) < 0) {
535	>	return NULL;
536	>	}
537		diskio_stats_ptr->systime=time(NULL);
538	+
539		num_diskio++;
540		}
541		}
#	Line 525 | Line 553 | diskio_stat_t *get_diskio_stats(int *entries){
553		the same format. */
554
555		f = fopen("/proc/diskstats", "r");
556	<	format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld";
556	>	format = " %d %d %99s %*d %*d %lld %*d %*d %*d %lld";
557		if (f == NULL) {
558		f = fopen("/proc/partitions", "r");
559	<	format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld";
559	>	format = " %d %d %*d %99s %*d %*d %lld %*d %*d %*d %lld";
560		}
561		if (f == NULL) goto out;
562		now = time(NULL);
563
564	<	while ((line_ptr = f_read_line(f, "")) != NULL) {
565	<	char name[20];
564	>	while ((line_ptr = sg_f_read_line(f, "")) != NULL) {
565	>	char name[100];
566		char *s;
567		long long rsect, wsect;
568
#	Line 555 | Line 583 | diskio_stat_t *get_diskio_stats(int *entries){
583		wsect = 0;
584		}
585
586	<	diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats,
587	<	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	<	}
586	>	if (VECTOR_RESIZE(diskio_stats, n + 1) < 0) {
587	>	goto out;
588		}
589	+	if (VECTOR_RESIZE(parts, n + 1) < 0) {
590	+	goto out;
591	+	}
592
593	<	if (diskio_stats[n].disk_name != NULL)
594	<	free(diskio_stats[n].disk_name);
595	<	diskio_stats[n].disk_name = strdup(name);
593	>	if (sg_update_string(&diskio_stats[n].disk_name, name) < 0) {
594	>	goto out;
595	>	}
596		diskio_stats[n].read_bytes = rsect * 512;
597		diskio_stats[n].write_bytes = wsect * 512;
598		diskio_stats[n].systime = now;
#	Line 591 | Line 614 | diskio_stat_t *get_diskio_stats(int *entries){
614		if (f == NULL) goto out;
615		now = time(NULL);
616
617	<	line_ptr = f_read_line(f, "disk_io:");
617	>	line_ptr = sg_f_read_line(f, "disk_io:");
618		if (line_ptr == NULL) goto out;
619
620		while((line_ptr=strchr(line_ptr, ' '))!=NULL){
#	Line 655 | Line 678 | out:
678		#endif
679
680		#ifdef CYGWIN
681	+	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
682		return NULL;
683		#endif
684
#	Line 663 | Line 687 | out:
687		return diskio_stats;
688		}
689
690	<	diskio_stat_t *get_diskio_stats_diff(int *entries){
691	<	static diskio_stat_t *diff = NULL;
692	<	static int diff_count = 0;
693	<	diskio_stat_t *src, *dest;
694	<	int i, j, new_count;
690	>	sg_disk_io_stats *sg_get_disk_io_stats_diff(int *entries){
691	>	VECTOR_DECLARE_STATIC(diff, sg_disk_io_stats, 1,
692	>	diskio_stat_init, diskio_stat_destroy);
693	>	sg_disk_io_stats *src = NULL, *dest;
694	>	int i, j, diff_count, new_count;
695
696		if (diskio_stats == NULL) {
697		/* No previous stats, so we can't calculate a difference. */
698	<	return get_diskio_stats(entries);
698	>	return sg_get_disk_io_stats(entries);
699		}
700
701		/* Resize the results array to match the previous stats. */
702	<	diff = diskio_stat_malloc(num_diskio, &diff_count, diff);
703	<	if (diff == NULL) {
702	>	diff_count = VECTOR_SIZE(diskio_stats);
703	>	if (VECTOR_RESIZE(diff, diff_count) < 0) {
704		return NULL;
705		}
706
#	Line 685 | Line 709 | diskio_stat_t *get_diskio_stats_diff(int *entries){
709		src = &diskio_stats[i];
710		dest = &diff[i];
711
712	<	if (dest->disk_name != NULL) {
713	<	free(dest->disk_name);
712	>	if (sg_update_string(&dest->disk_name, src->disk_name) < 0) {
713	>	return NULL;
714		}
691	–	dest->disk_name = strdup(src->disk_name);
715		dest->read_bytes = src->read_bytes;
716		dest->write_bytes = src->write_bytes;
717		dest->systime = src->systime;
718		}
719
720		/* Get a new set of stats. */
721	<	if (get_diskio_stats(&new_count) == NULL) {
721	>	if (sg_get_disk_io_stats(&new_count) == NULL) {
722		return NULL;
723		}
724

Diff Legend

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