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.42 by ats, Wed Nov 12 01:36:19 2003 UTC vs.
Revision 1.67 by ats, Thu Apr 8 13:44:44 2004 UTC

#	Line 1 | Line 1
1	<	/*
2	<	* i-scream central monitoring system
1	>	/*
2	>	* i-scream libstatgrab
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 27 | 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 38 | Line 43
43		#if defined(LINUX) || defined(CYGWIN)
44		#include <mntent.h>
45		#include <sys/vfs.h>
41	–	#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 58 | 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	<
79	<	/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */
80	<	orig_ptr=realloc(orig_ptr, (1+strlen(newtext)));
81	<	if(orig_ptr==NULL){
82	<	return NULL;
83	<	}
84	<	strcpy(orig_ptr, newtext);
85	<
86	<	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++){
93	<	disk_stats->device_name=NULL;
94	<	disk_stats->fs_type=NULL;
95	<	disk_stats->mnt_point=NULL;
96	<
97	<	disk_stats++;
98	<	}
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 110 | 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
115	–	static disk_stat_t *disk_stats;
116	–	static int watermark=-1;
117	–
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 136 | Line 125 | disk_stat_t *get_disk_stats(int *entries){
125		struct statfs *mp;
126		#endif
127
139	–	if(watermark==-1){
140	–	disk_stats=malloc(START_VAL * sizeof(disk_stat_t));
141	–	if(disk_stats==NULL){
142	–	return NULL;
143	–	}
144	–	watermark=START_VAL;
145	–	init_disk_stat(0, watermark-1, disk_stats);
146	–	}
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 155 | 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 168 | 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 178 | 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;
183	<	if((disk_stats=realloc(disk_stats, (watermark*2 * sizeof(disk_stat_t))))==NULL){
184	<	disk_stats=disk_ptr;
185	<	return NULL;
186	<	}
187	<
188	<	watermark=watermark*2;
189	<	init_disk_stat(num_disks, watermark-1, disk_stats);
165	>	if (VECTOR_RESIZE(disk_stats, num_disks + 1) < 0) {
166	>	return NULL;
167		}
191	–
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	<
198	<	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	<
202	<	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 213 | 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 235 | Line 210 | disk_stat_t *get_disk_stats(int *entries){
210		#endif
211
212		#ifdef SOLARIS
238	–	/* 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 267 | 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 278 | Line 252 | disk_stat_t *get_disk_stats(int *entries){
252		return disk_stats;
253
254		}
281	–	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;
258	<
259	<	diskio_stats++;
260	<	}
256	>	int sg_fs_compare_device_name(const void *va, const void *vb) {
257	>	const sg_fs_stats *a = (const sg_fs_stats *)va;
258	>	const sg_fs_stats *b = (const sg_fs_stats *)vb;
259	>
260	>	return strcmp(a->device_name, b->device_name);
261		}
262
263	<	diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){
263	>	int sg_fs_compare_mnt_point(const void *va, const void *vb) {
264	>	const sg_fs_stats *a = (const sg_fs_stats *)va;
265	>	const sg_fs_stats *b = (const sg_fs_stats *)vb;
266
267	<	if(diskio_stats==NULL){
267	>	return strcmp(a->mnt_point, b->mnt_point);
268	>	}
269
270	<	if((diskio_stats=malloc(needed_entries * sizeof(diskio_stat_t)))==NULL){
271	<	return NULL;
272	<	}
297	<	diskio_stat_init(0, needed_entries, diskio_stats);
298	<	*cur_entries=needed_entries;
270	>	static void diskio_stat_init(sg_disk_io_stats *d) {
271	>	d->disk_name = NULL;
272	>	}
273
274	<	return diskio_stats;
275	<	}
302	<
303	<
304	<	if(*cur_entries<needed_entries){
305	<	diskio_stats=realloc(diskio_stats, (sizeof(diskio_stat_t)*needed_entries));
306	<	if(diskio_stats==NULL){
307	<	return NULL;
308	<	}
309	<	diskio_stat_init(*cur_entries, needed_entries, diskio_stats);
310	<	*cur_entries=needed_entries;
311	<	}
312	<
313	<	return diskio_stats;
274	>	static void diskio_stat_destroy(sg_disk_io_stats *d) {
275	>	free(d->disk_name);
276		}
277
278	<	static diskio_stat_t *diskio_stats=NULL;
279	<	static int num_diskio=0;
278	>	VECTOR_DECLARE_STATIC(diskio_stats, sg_disk_io_stats, 10,
279	>	diskio_stat_init, diskio_stat_destroy);
280
281		#ifdef LINUX
282		typedef struct {
#	Line 323 | Line 285 | typedef struct {
285		} partition;
286		#endif
287
288	<	diskio_stat_t *get_diskio_stats(int *entries){
289	<
328	<	static int sizeof_diskio_stats=0;
288	>	sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
289	>	int num_diskio;
290		#ifndef LINUX
291	<	diskio_stat_t *diskio_stats_ptr;
291	>	sg_disk_io_stats *diskio_stats_ptr;
292		#endif
293
294		#ifdef SOLARIS
295	<	kstat_ctl_t *kc;
296	<	kstat_t *ksp;
295	>	kstat_ctl_t *kc;
296	>	kstat_t *ksp;
297		kstat_io_t kios;
298		#endif
299		#ifdef LINUX
#	Line 340 | Line 301 | diskio_stat_t *get_diskio_stats(int *entries){
301		char *line_ptr;
302		int major, minor;
303		int has_pp_stats = 1;
304	<	static partition *parts = NULL;
344	<	static int alloc_parts = 0;
304	>	VECTOR_DECLARE_STATIC(parts, partition, 16, NULL, NULL);
305		int i, n;
306		time_t now;
307		const char *format;
308		#endif
309	<	#ifdef FREEBSD
309	>	#if defined(FREEBSD) || defined(DFBSD)
310		static struct statinfo stats;
311		static int stats_init = 0;
312		int counter;
#	Line 357 | Line 317 | diskio_stat_t *get_diskio_stats(int *entries){
317		#endif
318		#ifdef NETBSD
319		struct disk_sysctl *stats;
320	+	#endif
321	+	#ifdef OPENBSD
322	+	int diskcount;
323	+	char *disknames, *name, *bufpp;
324	+	char **dk_name;
325	+	struct diskstats *stats;
326	+	#endif
327	+	#ifdef NETBSD
328	+	#define MIBSIZE 3
329	+	#endif
330	+	#ifdef OPENBSD
331	+	#define MIBSIZE 2
332	+	#endif
333	+	#if defined(NETBSD) || defined(OPENBSD)
334		int num_disks, i;
335	<	int mib[3];
335	>	int mib[MIBSIZE];
336		size_t size;
337		#endif
338
339		num_diskio=0;
340
341	<	#ifdef NETBSD
341	>	#ifdef OPENBSD
342		mib[0] = CTL_HW;
343	+	mib[1] = HW_DISKCOUNT;
344	+
345	+	size = sizeof(diskcount);
346	+	if (sysctl(mib, MIBSIZE, &diskcount, &size, NULL, 0) < 0) {
347	+	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKCOUNT");
348	+	return NULL;
349	+	}
350	+
351	+	mib[0] = CTL_HW;
352	+	mib[1] = HW_DISKNAMES;
353	+
354	+	if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
355	+	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
356	+	return NULL;
357	+	}
358	+
359	+	disknames = sg_malloc(size);
360	+	if (disknames == NULL) {
361	+	return NULL;
362	+	}
363	+
364	+	if (sysctl(mib, MIBSIZE, disknames, &size, NULL, 0) < 0) {
365	+	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
366	+	return NULL;
367	+	}
368	+
369	+	dk_name = sg_malloc(diskcount * sizeof(char *));
370	+	bufpp = disknames;
371	+	for (i = 0; i < diskcount && (name = strsep(&bufpp, ",")) != NULL; i++) {
372	+	dk_name[i] = name;
373	+	}
374	+	#endif
375	+
376	+	#if defined(NETBSD) || defined(OPENBSD)
377	+	mib[0] = CTL_HW;
378		mib[1] = HW_DISKSTATS;
379	+	#ifdef NETBSD
380		mib[2] = sizeof(struct disk_sysctl);
381	+	#endif
382
383	<	if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
383	>	if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
384	>	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
385		return NULL;
386		}
387	+
388	+	#ifdef NETBSD
389		num_disks = size / sizeof(struct disk_sysctl);
390	+	#else
391	+	num_disks = size / sizeof(struct diskstats);
392	+	#endif
393
394	<	stats = malloc(size);
394	>	stats = sg_malloc(size);
395		if (stats == NULL) {
396		return NULL;
397		}
398
399	<	if (sysctl(mib, 3, stats, &size, NULL, 0) < 0) {
399	>	if (sysctl(mib, MIBSIZE, stats, &size, NULL, 0) < 0) {
400	>	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
401		return NULL;
402		}
403
404		for (i = 0; i < num_disks; i++) {
405	+	const char *name;
406		u_int64_t rbytes, wbytes;
407
408	+	#ifdef NETBSD
409		#ifdef HAVE_DK_RBYTES
410		rbytes = stats[i].dk_rbytes;
411		wbytes = stats[i].dk_wbytes;
#	Line 393 | Line 413 | diskio_stat_t *get_diskio_stats(int *entries){
413		/* Before 1.7, NetBSD merged reads and writes. */
414		rbytes = wbytes = stats[i].dk_bytes;
415		#endif
416	+	#else
417	+	rbytes = wbytes = stats[i].ds_bytes;
418	+	#endif
419
420		/* Don't keep stats for disks that have never been used. */
421		if (rbytes == 0 && wbytes == 0) {
422		continue;
423		}
424
425	<	diskio_stats = diskio_stat_malloc(num_diskio + 1,
403	<	&sizeof_diskio_stats,
404	<	diskio_stats);
405	<	if (diskio_stats == NULL) {
425	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
426		return NULL;
427		}
428		diskio_stats_ptr = diskio_stats + num_diskio;
429
430		diskio_stats_ptr->read_bytes = rbytes;
431		diskio_stats_ptr->write_bytes = wbytes;
432	<	if (diskio_stats_ptr->disk_name != NULL) {
433	<	free(diskio_stats_ptr->disk_name);
432	>	#ifdef NETBSD
433	>	name = stats[i].dk_name;
434	>	#else
435	>	name = dk_name[i];
436	>	#endif
437	>	if (sg_update_string(&diskio_stats_ptr->disk_name, name) < 0) {
438	>	return NULL;
439		}
415	–	diskio_stats_ptr->disk_name = strdup(stats[i].dk_name);
440		diskio_stats_ptr->systime = time(NULL);
441
442		num_diskio++;
443		}
444
445		free(stats);
446	+	#ifdef OPENBSD
447	+	free(dk_name);
448	+	free(disknames);
449		#endif
450	+	#endif
451
452	<	#ifdef FREEBSD
452	>	#if defined(FREEBSD) || defined(DFBSD)
453		if (!stats_init) {
454	<	stats.dinfo=malloc(sizeof(struct devinfo));
454	>	stats.dinfo=sg_malloc(sizeof(struct devinfo));
455		if(stats.dinfo==NULL) return NULL;
456		bzero(stats.dinfo, sizeof(struct devinfo));
457		stats_init = 1;
458		}
459		#ifdef FREEBSD5
460	<	if ((devstat_getdevs(NULL, &stats)) < 0) return NULL;
460	>	if ((devstat_getdevs(NULL, &stats)) < 0) {
461	>	sg_set_error(SG_ERROR_DEVSTAT_GETDEVS, NULL);
462	>	return NULL;
463	>	}
464		/* Not aware of a get all devices, so i said 999. If we ever
465		* find a machine with more than 999 disks, then i'll change
466		* this number :)
467		*/
468	<	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;
468	>	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) {
469	>	sg_set_error(SG_ERROR_DEVSTAT_SELECTDEVS, NULL);
470	>	return NULL;
471	>	}
472		#else
473	<	if ((getdevs(&stats)) < 0) return NULL;
473	>	if ((getdevs(&stats)) < 0) {
474	>	sg_set_error(SG_ERROR_DEVSTAT_GETDEVS, NULL);
475	>	return NULL;
476	>	}
477		/* Not aware of a get all devices, so i said 999. If we ever
478		* find a machine with more than 999 disks, then i'll change
479		* this number :)
480		*/
481	<	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;
481	>	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) {
482	>	sg_set_error(SG_ERROR_DEVSTAT_SELECTDEVS, NULL);
483	>	return NULL;
484	>	}
485		#endif
486
487		for(counter=0;counter<stats.dinfo->numdevs;counter++){
#	Line 456 | Line 496 | diskio_stat_t *get_diskio_stats(int *entries){
496		#else
497		if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue;
498		#endif
499	<	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
499	>
500	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
501		return NULL;
502		}
503		diskio_stats_ptr=diskio_stats+num_diskio;
#	Line 469 | Line 510 | diskio_stat_t *get_diskio_stats(int *entries){
510		diskio_stats_ptr->write_bytes=dev_ptr->bytes_written;
511		#endif
512		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
513	<	asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number);
513	>	if (asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number) == -1) {
514	>	sg_set_error(SG_ERROR_ASPRINTF, NULL);
515	>	return NULL;
516	>	}
517		diskio_stats_ptr->systime=time(NULL);
518
519		num_diskio++;
#	Line 479 | Line 523 | diskio_stat_t *get_diskio_stats(int *entries){
523		#endif
524		#ifdef SOLARIS
525		if ((kc = kstat_open()) == NULL) {
526	<	return NULL;
527	<	}
526	>	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
527	>	return NULL;
528	>	}
529
530		for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
531	<	if (!strcmp(ksp->ks_class, "disk")) {
531	>	if (!strcmp(ksp->ks_class, "disk")) {
532
533		if(ksp->ks_type != KSTAT_TYPE_IO) continue;
534		/* We dont want metadevices appearins as num_diskio */
535		if(strcmp(ksp->ks_module, "md")==0) continue;
536	<	if((kstat_read(kc, ksp, &kios))==-1){
536	>	if((kstat_read(kc, ksp, &kios))==-1){
537		}
538
539	<	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
539	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
540		kstat_close(kc);
541		return NULL;
542		}
543		diskio_stats_ptr=diskio_stats+num_diskio;
544
545		diskio_stats_ptr->read_bytes=kios.nread;
501	–
546		diskio_stats_ptr->write_bytes=kios.nwritten;
547	<
548	<	if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
549	<
550	<	diskio_stats_ptr->disk_name=strdup(ksp->ks_name);
547	>	if (sg_update_string(&diskio_stats_ptr->disk_name,
548	>	sg_get_svr_from_bsd(ksp->ks_name)) < 0) {
549	>	return NULL;
550	>	}
551		diskio_stats_ptr->systime=time(NULL);
552	+
553		num_diskio++;
554		}
555		}
#	Line 522 | Line 567 | diskio_stat_t *get_diskio_stats(int *entries){
567		the same format. */
568
569		f = fopen("/proc/diskstats", "r");
570	<	format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld";
570	>	format = " %d %d %99s %*d %*d %lld %*d %*d %*d %lld";
571		if (f == NULL) {
572		f = fopen("/proc/partitions", "r");
573	<	format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld";
573	>	format = " %d %d %*d %99s %*d %*d %lld %*d %*d %*d %lld";
574		}
575		if (f == NULL) goto out;
576		now = time(NULL);
577
578	<	while ((line_ptr = f_read_line(f, "")) != NULL) {
579	<	char name[20];
578	>	while ((line_ptr = sg_f_read_line(f, "")) != NULL) {
579	>	char name[100];
580		char *s;
581		long long rsect, wsect;
582
#	Line 552 | Line 597 | diskio_stat_t *get_diskio_stats(int *entries){
597		wsect = 0;
598		}
599
600	<	diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats,
601	<	diskio_stats);
557	<	if (diskio_stats == NULL) goto out;
558	<	if (n >= alloc_parts) {
559	<	alloc_parts += 16;
560	<	parts = realloc(parts, alloc_parts * sizeof *parts);
561	<	if (parts == NULL) {
562	<	alloc_parts = 0;
563	<	goto out;
564	<	}
600	>	if (VECTOR_RESIZE(diskio_stats, n + 1) < 0) {
601	>	goto out;
602		}
603	+	if (VECTOR_RESIZE(parts, n + 1) < 0) {
604	+	goto out;
605	+	}
606
607	<	if (diskio_stats[n].disk_name != NULL)
608	<	free(diskio_stats[n].disk_name);
609	<	diskio_stats[n].disk_name = strdup(name);
607	>	if (sg_update_string(&diskio_stats[n].disk_name, name) < 0) {
608	>	goto out;
609	>	}
610		diskio_stats[n].read_bytes = rsect * 512;
611		diskio_stats[n].write_bytes = wsect * 512;
612		diskio_stats[n].systime = now;
#	Line 576 | Line 616 | diskio_stat_t *get_diskio_stats(int *entries){
616		n++;
617		}
618
619	+	fclose(f);
620	+	f = NULL;
621	+
622		if (!has_pp_stats) {
623	<	/* This is an older kernel without stats in /proc/partitions.
624	<	Read what we can from /proc/stat instead. */
623	>	/* This is an older kernel where /proc/partitions doesn't
624	>	contain stats. Read what we can from /proc/stat instead, and
625	>	fill in the appropriate bits of the list allocated above. */
626
627		f = fopen("/proc/stat", "r");
628		if (f == NULL) goto out;
629		now = time(NULL);
630
631	<	line_ptr = f_read_line(f, "disk_io:");
631	>	line_ptr = sg_f_read_line(f, "disk_io:");
632		if (line_ptr == NULL) goto out;
633
634		while((line_ptr=strchr(line_ptr, ' '))!=NULL){
#	Line 648 | Line 692 | out:
692		#endif
693
694		#ifdef CYGWIN
695	+	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
696		return NULL;
697		#endif
698
#	Line 656 | Line 701 | out:
701		return diskio_stats;
702		}
703
704	<	diskio_stat_t *get_diskio_stats_diff(int *entries){
705	<	static diskio_stat_t *diskio_stats_diff=NULL;
706	<	static int sizeof_diskio_stats_diff=0;
707	<	diskio_stat_t *diskio_stats_diff_ptr, *diskio_stats_ptr;
708	<	int disks, x, y;
704	>	sg_disk_io_stats *sg_get_disk_io_stats_diff(int *entries){
705	>	VECTOR_DECLARE_STATIC(diff, sg_disk_io_stats, 1,
706	>	diskio_stat_init, diskio_stat_destroy);
707	>	sg_disk_io_stats *src = NULL, *dest;
708	>	int i, j, diff_count, new_count;
709
710	<	if(diskio_stats==NULL){
711	<	diskio_stats_ptr=get_diskio_stats(&disks);
712	<	*entries=disks;
668	<	return diskio_stats_ptr;
710	>	if (diskio_stats == NULL) {
711	>	/* No previous stats, so we can't calculate a difference. */
712	>	return sg_get_disk_io_stats(entries);
713		}
714
715	<	diskio_stats_diff=diskio_stat_malloc(num_diskio, &sizeof_diskio_stats_diff, diskio_stats_diff);
716	<	if(diskio_stats_diff==NULL){
715	>	/* Resize the results array to match the previous stats. */
716	>	diff_count = VECTOR_SIZE(diskio_stats);
717	>	if (VECTOR_RESIZE(diff, diff_count) < 0) {
718		return NULL;
719		}
720
721	<	diskio_stats_diff_ptr=diskio_stats_diff;
722	<	diskio_stats_ptr=diskio_stats;
721	>	/* Copy the previous stats into the result. */
722	>	for (i = 0; i < diff_count; i++) {
723	>	src = &diskio_stats[i];
724	>	dest = &diff[i];
725
726	<	for(disks=0;disks<num_diskio;disks++){
727	<	if(diskio_stats_diff_ptr->disk_name!=NULL){
681	<	free(diskio_stats_diff_ptr->disk_name);
726	>	if (sg_update_string(&dest->disk_name, src->disk_name) < 0) {
727	>	return NULL;
728		}
729	<	diskio_stats_diff_ptr->disk_name=strdup(diskio_stats_ptr->disk_name);
730	<	diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes;
731	<	diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes;
732	<	diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime;
729	>	dest->read_bytes = src->read_bytes;
730	>	dest->write_bytes = src->write_bytes;
731	>	dest->systime = src->systime;
732	>	}
733
734	<	diskio_stats_diff_ptr++;
735	<	diskio_stats_ptr++;
734	>	/* Get a new set of stats. */
735	>	if (sg_get_disk_io_stats(&new_count) == NULL) {
736	>	return NULL;
737		}
738
739	<	diskio_stats_ptr=get_diskio_stats(&disks);
740	<	diskio_stats_diff_ptr=diskio_stats_diff;
739	>	/* For each previous stat... */
740	>	for (i = 0; i < diff_count; i++) {
741	>	dest = &diff[i];
742
743	<	for(x=0;x<sizeof_diskio_stats_diff;x++){
744	<
745	<	if((strcmp(diskio_stats_diff_ptr->disk_name, diskio_stats_ptr->disk_name))==0){
746	<	diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes-diskio_stats_diff_ptr->read_bytes;
747	<	diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes-diskio_stats_diff_ptr->write_bytes;
748	<	diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime-diskio_stats_diff_ptr->systime;
749	<	}else{
702	<	diskio_stats_ptr=diskio_stats;
703	<	for(y=0;y<disks;y++){
704	<	if((strcmp(diskio_stats_diff_ptr->disk_name, diskio_stats_ptr->disk_name))==0){
705	<	diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes-diskio_stats_diff_ptr->read_bytes;
706	<	diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes-diskio_stats_diff_ptr->write_bytes;
707	<	diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime-diskio_stats_diff_ptr->systime;
708	<
709	<	break;
710	<	}
711	<
712	<	diskio_stats_ptr++;
743	>	/* ... find the corresponding new stat ... */
744	>	for (j = 0; j < new_count; j++) {
745	>	/* Try the new stat in the same position first,
746	>	since that's most likely to be it. */
747	>	src = &diskio_stats[(i + j) % new_count];
748	>	if (strcmp(src->disk_name, dest->disk_name) == 0) {
749	>	break;
750		}
751		}
752	+	if (j == new_count) {
753	+	/* No match found. */
754	+	continue;
755	+	}
756
757	<	diskio_stats_ptr++;
758	<	diskio_stats_diff_ptr++;
759	<
757	>	/* ... and subtract the previous stat from it to get the
758	>	difference. */
759	>	dest->read_bytes = src->read_bytes - dest->read_bytes;
760	>	dest->write_bytes = src->write_bytes - dest->write_bytes;
761	>	dest->systime = src->systime - dest->systime;
762		}
763	<
764	<	*entries=sizeof_diskio_stats_diff;
765	<	return diskio_stats_diff;
763	>
764	>	*entries = diff_count;
765	>	return diff;
766		}
767	+
768	+	int sg_disk_io_compare_name(const void *va, const void *vb) {
769	+	const sg_disk_io_stats *a = (const sg_disk_io_stats *)va;
770	+	const sg_disk_io_stats *b = (const sg_disk_io_stats *)vb;
771	+
772	+	return strcmp(a->disk_name, b->disk_name);
773	+	}
774	+

Diff Legend

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