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.56 by ats, Sun Apr 4 22:18:38 2004 UTC vs.
Revision 1.83 by tdb, Sat Sep 24 13:29:22 2005 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 31 | Line 31
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>
46	<	#include "tools.h"
46	>	#include <sys/statvfs.h>
47		#endif
48
49		#ifdef LINUX
50		#define VALID_FS_TYPES {"adfs", "affs", "befs", "bfs", "efs", "ext2", \
51	<	"ext3", "vxfs", "hfs", "hfsplus", "hpfs", "jffs", \
52	<	"jffs2", "minix", "msdos", "ntfs", "qnx4", "ramfs", \
53	<	"rootfs", "reiserfs", "sysv", "v7", "udf", "ufs", \
54	<	"umsdos", "vfat", "xfs", "jfs"}
51	>	"ext3", "vxfs", "hfs", "hfsplus", "hpfs", "jffs", \
52	>	"jffs2", "minix", "msdos", "ntfs", "qnx4", "ramfs", \
53	>	"rootfs", "reiserfs", "sysv", "v7", "udf", "ufs", \
54	>	"umsdos", "vfat", "xfs", "jfs", "nfs"}
55		#endif
56
57		#ifdef CYGWIN
#	Line 66 | Line 67
67		#include <sys/dkstat.h>
68		#include <devstat.h>
69		#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \
70	<	"ufs", "mfs"}
70	>	"ufs", "mfs", "nfs"}
71		#endif
72		#if defined(NETBSD) || defined(OPENBSD)
73		#include <sys/param.h>
74		#include <sys/sysctl.h>
75		#include <sys/disk.h>
76		#define VALID_FS_TYPES {"ffs", "mfs", "msdos", "lfs", "adosfs", "ext2fs", \
77	<	"ntfs"}
77	>	"ntfs", "nfs"}
78		#endif
79
80	<	char *copy_string(char *orig_ptr, const char *newtext){
80	>	#ifdef HPUX
81	>	#include <sys/param.h>
82	>	#include <sys/pstat.h>
83	>	#include <sys/types.h>
84	>	#include <sys/stat.h>
85	>	#include <sys/vfs.h>
86	>	#include <mntent.h>
87	>	#include <dirent.h>
88	>	#include <stdio.h>
89	>	#include <time.h>
90	>	#define VALID_FS_TYPES {"vxfs", "hfs"}
91	>	#define DISK_BATCH 30
92	>	#endif
93
94	<	/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */
95	<	orig_ptr=realloc(orig_ptr, (1+strlen(newtext)));
96	<	if(orig_ptr==NULL){
97	<	return NULL;
98	<	}
86	<	strcpy(orig_ptr, newtext);
94	>	#ifdef WIN32
95	>	#include "win32.h"
96	>	/*#define VALID_FS_TYPES {"NTFS", "FAT", "FAT32"} unused*/
97	>	#define BUFSIZE 512
98	>	#endif
99
100	<	return orig_ptr;
101	<	}
100	>	#ifdef ALLBSD
101	>	#define SG_MP_FSTYPENAME(mp) (mp)->f_fstypename
102	>	#define SG_MP_DEVNAME(mp)    (mp)->f_mntfromname
103	>	#define SG_MP_MOUNTP(mp)     (mp)->f_mntonname
104	>	#define SG_FS_FRSIZE(fs)     (long long) (*(fs))->f_bsize
105	>	#define SG_FS_BSIZE(fs)      (long long) (*(fs))->f_iosize
106	>	#define SG_FS_BLOCKS(fs)     (long long) (*(fs))->f_blocks
107	>	#define SG_FS_BFREE(fs)      (long long) (*(fs))->f_bfree
108	>	#define SG_FS_BAVAIL(fs)     (long long) (*(fs))->f_bavail
109	>	#define SG_FS_FILES(fs)      (long long) (*(fs))->f_files
110	>	#define SG_FS_FFREE(fs)      (long long) (*(fs))->f_ffree
111	>	#define SG_FS_FAVAIL(fs)     -1LL
112	>	#endif
113	>	#if defined(LINUX) || defined(CYGWIN) || defined(HPUX)
114	>	#define SG_MP_FSTYPENAME(mp) (mp)->mnt_type
115	>	#define SG_MP_DEVNAME(mp)    (mp)->mnt_fsname
116	>	#define SG_MP_MOUNTP(mp)     (mp)->mnt_dir
117	>	#define SG_FS_FRSIZE(fs)     (long long) (fs).f_frsize
118	>	#define SG_FS_BSIZE(fs)      (long long) (fs).f_bsize
119	>	#define SG_FS_BLOCKS(fs)     (long long) (fs).f_blocks
120	>	#define SG_FS_BFREE(fs)      (long long) (fs).f_bfree
121	>	#define SG_FS_BAVAIL(fs)     (long long) (fs).f_bavail
122	>	#define SG_FS_FILES(fs)      (long long) (fs).f_files
123	>	#define SG_FS_FFREE(fs)      (long long) (fs).f_ffree
124	>	#define SG_FS_FAVAIL(fs)     (long long) (fs).f_favail
125	>	#endif
126	>	#ifdef SOLARIS
127	>	#define SG_MP_FSTYPENAME(mp) (mp).mnt_fstype
128	>	#define SG_MP_DEVNAME(mp)    (mp).mnt_special
129	>	#define SG_MP_MOUNTP(mp)     (mp).mnt_mountp
130	>	#define SG_FS_FRSIZE(fs)     (long long) (fs).f_frsize
131	>	#define SG_FS_BSIZE(fs)      (long long) (fs).f_bsize
132	>	#define SG_FS_BLOCKS(fs)     (long long) (fs).f_blocks
133	>	#define SG_FS_BFREE(fs)      (long long) (fs).f_bfree
134	>	#define SG_FS_BAVAIL(fs)     (long long) (fs).f_bavail
135	>	#define SG_FS_FILES(fs)      (long long) (fs).f_files
136	>	#define SG_FS_FFREE(fs)      (long long) (fs).f_ffree
137	>	#define SG_FS_FAVAIL(fs)     (long long) (fs).f_favail
138	>	#endif
139
140	<	static void disk_stat_init(disk_stat_t *d) {
140	>	static void disk_stat_init(sg_fs_stats *d) {
141		d->device_name = NULL;
142		d->fs_type = NULL;
143		d->mnt_point = NULL;
144		}
145
146	<	static void disk_stat_destroy(disk_stat_t *d) {
146	>	static void disk_stat_destroy(sg_fs_stats *d) {
147		free(d->device_name);
148		free(d->fs_type);
149		free(d->mnt_point);
150		}
151
152	<	int is_valid_fs_type(const char *type) {
152	>	#ifndef WIN32 /* not used by WIN32, so stop compiler throwing warnings */
153	>	static int is_valid_fs_type(const char *type) {
154		const char *types[] = VALID_FS_TYPES;
155		int i;
156
157	<	for (i = 0; i < (sizeof types / sizeof *types); i++) {
157	>	for (i = 0; i < (int) (sizeof types / sizeof *types); i++) {
158		if (strcmp(types[i], type) == 0) {
159		return 1;
160		}
161		}
162		return 0;
163		}
164	+	#endif
165
166	<	disk_stat_t *get_disk_stats(int *entries){
167	<	VECTOR_DECLARE_STATIC(disk_stats, disk_stat_t, 10,
168	<	disk_stat_init, disk_stat_destroy);
166	>	sg_fs_stats *sg_get_fs_stats(int *entries){
167	>	VECTOR_DECLARE_STATIC(disk_stats, sg_fs_stats, 10,
168	>	disk_stat_init, disk_stat_destroy);
169
119	–	int valid_type;
170		int num_disks=0;
171	<	#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN)
171	>	#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN) || defined(HPUX)
172		FILE *f;
173		#endif
174
175	<	disk_stat_t *disk_ptr;
175	>	sg_fs_stats *disk_ptr;
176
177		#ifdef SOLARIS
178		struct mnttab mp;
179		struct statvfs fs;
180		#endif
181	<	#if defined(LINUX) || defined(CYGWIN)
181	>	#if defined(LINUX) || defined(CYGWIN) || defined(HPUX)
182		struct mntent *mp;
183	<	struct statfs fs;
183	>	struct statvfs fs;
184		#endif
185		#ifdef ALLBSD
186		int nummnt;
187	<	struct statfs *mp;
187	>	#ifdef HAVE_STATVFS
188	>	struct statvfs *mp, **fs;
189	>	#else
190	>	struct statfs *mp, **fs;
191		#endif
192	+	#endif
193	+	#ifdef WIN32
194	+	char lp_buf[MAX_PATH];
195	+	char volume_name_buf[BUFSIZE];
196	+	char filesys_name_buf[BUFSIZE];
197	+	char drive[4] = " :\\";
198	+	char *p;
199	+	lp_buf[0]='\0';
200	+	#endif
201
202		#ifdef ALLBSD
203	<	nummnt=getmntinfo(&mp , MNT_LOCAL);
203	>	nummnt=getmntinfo(&mp, MNT_WAIT);
204		if (nummnt<=0){
205	+	sg_set_error_with_errno(SG_ERROR_GETMNTINFO, NULL);
206		return NULL;
207		}
208	<	for(;nummnt--; mp++){
146	<	valid_type = is_valid_fs_type(mp->f_fstypename);
208	>	for(fs = &mp; nummnt--; (*fs)++){
209		#endif
210
211	<	#if defined(LINUX) || defined(CYGWIN)
211	>	#if defined(LINUX) || defined(CYGWIN) || defined(HPUX)
212	>	#ifdef MNT_MNTTAB
213	>	if ((f=setmntent(MNT_MNTTAB, "r" ))==NULL){
214	>	#else
215		if ((f=setmntent("/etc/mtab", "r" ))==NULL){
216	+	#endif
217	+	sg_set_error(SG_ERROR_SETMNTENT, NULL);
218		return NULL;
219		}
220
221		while((mp=getmntent(f))){
222	<	if((statfs(mp->mnt_dir, &fs)) !=0){
222	>	if((statvfs(mp->mnt_dir, &fs)) !=0){
223		continue;
224		}
225
159	–	valid_type = is_valid_fs_type(mp->mnt_type);
226		#endif
227
228		#ifdef SOLARIS
229		if ((f=fopen("/etc/mnttab", "r" ))==NULL){
230	+	sg_set_error_with_errno(SG_ERROR_OPEN, "/etc/mnttab");
231		return NULL;
232		}
233		while((getmntent(f, &mp)) == 0){
234		if ((statvfs(mp.mnt_mountp, &fs)) !=0){
235		continue;
236		}
170	–	valid_type = is_valid_fs_type(mp.mnt_fstype);
237		#endif
238
239	<	if(valid_type){
239	>	#ifdef WIN32
240	>	if (!(GetLogicalDriveStrings(BUFSIZE-1, lp_buf))) {
241	>	sg_set_error(SG_ERROR_GETMNTINFO, "GetLogicalDriveStrings");
242	>	return NULL;
243	>	}
244	>	p = lp_buf;
245	>	do {
246	>	// Copy drive letter to template string
247	>	*drive = *p;
248	>	// Only interested in harddrives.
249	>	int drive_type = GetDriveType(drive);
250	>
251	>	if(drive_type == DRIVE_FIXED) {
252	>	#else
253	>	if(is_valid_fs_type(SG_MP_FSTYPENAME(mp))){
254	>	#endif
255		if (VECTOR_RESIZE(disk_stats, num_disks + 1) < 0) {
256		return NULL;
257		}
258		disk_ptr=disk_stats+num_disks;
259
260	<	#ifdef ALLBSD
261	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){
260	>	#ifndef WIN32
261	>	/* Maybe make this char[bigenough] and do strncpy's and put a null in the end?
262	>	* Downside is its a bit hungry for a lot of mounts, as MNT_MAX_SIZE would prob
263	>	* be upwards of a k each
264	>	*/
265	>	if (sg_update_string(&disk_ptr->device_name, SG_MP_DEVNAME(mp)) < 0) {
266		return NULL;
267		}
268	<
184	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->f_fstypename))==NULL){
268	>	if (sg_update_string(&disk_ptr->fs_type, SG_MP_FSTYPENAME(mp)) < 0) {
269		return NULL;
270		}
271	<
188	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->f_mntonname))==NULL){
271	>	if (sg_update_string(&disk_ptr->mnt_point, SG_MP_MOUNTP(mp)) < 0) {
272		return NULL;
273		}
274
275	<	disk_ptr->size = (long long)mp->f_bsize * (long long) mp->f_blocks;
276	<	disk_ptr->avail = (long long)mp->f_bsize * (long long) mp->f_bavail;
277	<	disk_ptr->used = (disk_ptr->size) - ((long long)mp->f_bsize * (long long)mp->f_bfree);
275	>	disk_ptr->size  = SG_FS_FRSIZE(fs) * SG_FS_BLOCKS(fs);
276	>	disk_ptr->avail = SG_FS_FRSIZE(fs) * SG_FS_BAVAIL(fs);
277	>	disk_ptr->used  = (disk_ptr->size) - (SG_FS_FRSIZE(fs) * SG_FS_BFREE(fs));
278	>
279	>	disk_ptr->total_inodes = SG_FS_FILES(fs);
280	>	disk_ptr->free_inodes  = SG_FS_FFREE(fs);
281	>	/* Linux, FreeBSD don't have a "available" inodes */
282	>	disk_ptr->used_inodes  = disk_ptr->total_inodes - disk_ptr->free_inodes;
283	>	disk_ptr->avail_inodes = SG_FS_FAVAIL(fs);
284
285	<	disk_ptr->total_inodes=(long long)mp->f_files;
286	<	disk_ptr->free_inodes=(long long)mp->f_ffree;
287	<	/* Freebsd doesn't have a "available" inodes */
288	<	disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes;
289	<	#endif
290	<	#if defined(LINUX) || defined(CYGWIN)
291	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->mnt_fsname))==NULL){
285	>	disk_ptr->io_size      = SG_FS_BSIZE(fs);
286	>	disk_ptr->block_size   = SG_FS_FRSIZE(fs);
287	>	disk_ptr->total_blocks = SG_FS_BLOCKS(fs);
288	>	disk_ptr->free_blocks  = SG_FS_BFREE(fs);
289	>	disk_ptr->avail_blocks = SG_FS_BAVAIL(fs);
290	>	disk_ptr->used_blocks  = disk_ptr->total_blocks - disk_ptr->free_blocks;
291	>	#else
292	>	if(!GetVolumeInformation(drive, volume_name_buf, BUFSIZE,
293	>	NULL, NULL, NULL,
294	>	filesys_name_buf, BUFSIZE)) {
295	>	sg_set_error_with_errno(SG_ERROR_DISKINFO,
296	>	"GetVolumeInformation");
297		return NULL;
298		}
299	<
300	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->mnt_type))==NULL){
299	>
300	>	if (sg_update_string(&disk_ptr->device_name,
301	>	volume_name_buf) < 0) {
302		return NULL;
303		}
304	<
305	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->mnt_dir))==NULL){
304	>	if (sg_update_string(&disk_ptr->fs_type,
305	>	filesys_name_buf) < 0) {
306		return NULL;
307		}
308	<	disk_ptr->size = (long long)fs.f_bsize * (long long)fs.f_blocks;
309	<	disk_ptr->avail = (long long)fs.f_bsize * (long long)fs.f_bavail;
215	<	disk_ptr->used = (disk_ptr->size) - ((long long)fs.f_bsize * (long long)fs.f_bfree);
216	<
217	<	disk_ptr->total_inodes=(long long)fs.f_files;
218	<	disk_ptr->free_inodes=(long long)fs.f_ffree;
219	<	/* Linux doesn't have a "available" inodes */
220	<	disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes;
221	<	#endif
222	<
223	<	#ifdef SOLARIS
224	<	/* Memory leak in event of realloc failing */
225	<	/* Maybe make this char[bigenough] and do strncpy's and put a null in the end?
226	<	* Downside is its a bit hungry for a lot of mounts, as MNT_MAX_SIZE would prob
227	<	* be upwards of a k each
228	<	*/
229	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp.mnt_special))==NULL){
308	>	if (sg_update_string(&disk_ptr->mnt_point,
309	>	drive) < 0) {
310		return NULL;
311		}
312	+	if (!GetDiskFreeSpaceEx(drive, NULL,
313	+	(PULARGE_INTEGER)&disk_ptr->size,
314	+	(PULARGE_INTEGER)&disk_ptr->avail)) {
315	+	sg_set_error_with_errno(SG_ERROR_DISKINFO,
316	+	"GetDiskFreeSpaceEx");
317	+	return NULL;
318	+	}
319	+	disk_ptr->used = disk_ptr->size - disk_ptr->avail;
320	+	disk_ptr->total_inodes = 0;
321	+	disk_ptr->free_inodes  = 0;
322	+	disk_ptr->used_inodes  = 0;
323	+	disk_ptr->avail_inodes = 0;
324
325	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp.mnt_fstype))==NULL){
326	<	return NULL;
327	<	}
328	<
329	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp.mnt_mountp))==NULL){
330	<	return NULL;
331	<	}
240	<
241	<	disk_ptr->size = (long long)fs.f_frsize * (long long)fs.f_blocks;
242	<	disk_ptr->avail = (long long)fs.f_frsize * (long long)fs.f_bavail;
243	<	disk_ptr->used = (disk_ptr->size) - ((long long)fs.f_frsize * (long long)fs.f_bfree);
244	<
245	<	disk_ptr->total_inodes=(long long)fs.f_files;
246	<	disk_ptr->used_inodes=disk_ptr->total_inodes - (long long)fs.f_ffree;
247	<	disk_ptr->free_inodes=(long long)fs.f_favail;
325	>	/* I dunno what to do with these... so have nothing */
326	>	disk_ptr->io_size = 0;
327	>	disk_ptr->block_size = 0;
328	>	disk_ptr->total_blocks = 0;
329	>	disk_ptr->free_blocks = 0;
330	>	disk_ptr->avail_blocks = 0;
331	>	disk_ptr->used_blocks = 0;
332		#endif
333		num_disks++;
334		}
335	+	#ifdef WIN32
336	+	while(*p++);
337	+	} while(*p);
338	+	#else
339		}
340	+	#endif
341
342		*entries=num_disks;
343
344		/* If this fails, there is very little i can do about it, so
345	<	I'll ignore it :) */
346	<	#if defined(LINUX) || defined(CYGWIN)
345	>	I'll ignore it :) */
346	>	#if defined(LINUX) || defined(CYGWIN) || defined(HPUX)
347		endmntent(f);
348		#endif
349		#if defined(SOLARIS)
#	Line 265 | Line 354 | disk_stat_t *get_disk_stats(int *entries){
354
355		}
356
357	<	static void diskio_stat_init(diskio_stat_t *d) {
357	>	int sg_fs_compare_device_name(const void *va, const void *vb) {
358	>	const sg_fs_stats *a = (const sg_fs_stats *)va;
359	>	const sg_fs_stats *b = (const sg_fs_stats *)vb;
360	>
361	>	return strcmp(a->device_name, b->device_name);
362	>	}
363	>
364	>	int sg_fs_compare_mnt_point(const void *va, const void *vb) {
365	>	const sg_fs_stats *a = (const sg_fs_stats *)va;
366	>	const sg_fs_stats *b = (const sg_fs_stats *)vb;
367	>
368	>	return strcmp(a->mnt_point, b->mnt_point);
369	>	}
370	>
371	>	static void diskio_stat_init(sg_disk_io_stats *d) {
372		d->disk_name = NULL;
373		}
374
375	<	static void diskio_stat_destroy(diskio_stat_t *d) {
375	>	static void diskio_stat_destroy(sg_disk_io_stats *d) {
376		free(d->disk_name);
377		}
378
379	<	VECTOR_DECLARE_STATIC(diskio_stats, diskio_stat_t, 10,
380	<	diskio_stat_init, diskio_stat_destroy);
379	>	VECTOR_DECLARE_STATIC(diskio_stats, sg_disk_io_stats, 10,
380	>	diskio_stat_init, diskio_stat_destroy);
381
382		#ifdef LINUX
383		typedef struct {
#	Line 283 | Line 386 | typedef struct {
386		} partition;
387		#endif
388
389	<	diskio_stat_t *get_diskio_stats(int *entries){
389	>	sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
390		int num_diskio;
391		#ifndef LINUX
392	<	diskio_stat_t *diskio_stats_ptr;
392	>	sg_disk_io_stats *diskio_stats_ptr;
393		#endif
394
395	+	#ifdef HPUX
396	+	long long rbytes = 0, wbytes = 0;
397	+	struct dirent *dinfo = NULL;
398	+	struct stat lstatinfo;
399	+	struct pst_diskinfo pstat_diskinfo[DISK_BATCH];
400	+	char fullpathbuf[1024] = {0};
401	+	dev_t diskid;
402	+	DIR *dh = NULL;
403	+	int diskidx = 0;
404	+	int num, i;
405	+	#endif
406		#ifdef SOLARIS
407	<	kstat_ctl_t *kc;
408	<	kstat_t *ksp;
407	>	kstat_ctl_t *kc;
408	>	kstat_t *ksp;
409		kstat_io_t kios;
410		#endif
411		#ifdef LINUX
#	Line 299 | Line 413 | diskio_stat_t *get_diskio_stats(int *entries){
413		char *line_ptr;
414		int major, minor;
415		int has_pp_stats = 1;
416	<	static partition *parts = NULL;
303	<	static int alloc_parts = 0;
416	>	VECTOR_DECLARE_STATIC(parts, partition, 16, NULL, NULL);
417		int i, n;
418		time_t now;
419		const char *format;
420	+	static regex_t not_part_re, part_re;
421	+	static int re_compiled = 0;
422		#endif
423		#if defined(FREEBSD) || defined(DFBSD)
424		static struct statinfo stats;
#	Line 334 | Line 449 | diskio_stat_t *get_diskio_stats(int *entries){
449		int mib[MIBSIZE];
450		size_t size;
451		#endif
452	+	#ifdef WIN32
453	+	char *name;
454	+	long long rbytes;
455	+	long long wbytes;
456	+	#endif
457
458		num_diskio=0;
459
460	+	#ifdef HPUX
461	+	while (1) {
462	+	num = pstat_getdisk(pstat_diskinfo, sizeof pstat_diskinfo[0],
463	+	DISK_BATCH, diskidx);
464	+	if (num == -1) {
465	+	sg_set_error_with_errno(SG_ERROR_PSTAT,
466	+	"pstat_getdisk");
467	+	return NULL;
468	+	} else if (num == 0) {
469	+	break;
470	+	}
471	+
472	+	for (i = 0; i < num; i++) {
473	+	struct pst_diskinfo *di = &pstat_diskinfo[i];
474	+
475	+	/* Skip "disabled" disks. */
476	+	if (di->psd_status == 0) {
477	+	continue;
478	+	}
479	+
480	+	/* We can't seperate the reads from the writes, we'll
481	+	* just give the same to each. (This value is in
482	+	* 64-byte chunks according to the pstat header file,
483	+	* and can wrap to be negative.)
484	+	*/
485	+	rbytes = wbytes = ((unsigned long) di->psd_dkwds) * 64LL;
486	+
487	+	/* Skip unused disks. */
488	+	if (rbytes == 0 && wbytes == 0) {
489	+	continue;
490	+	}
491	+
492	+	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
493	+	return NULL;
494	+	}
495	+
496	+	diskio_stats_ptr = diskio_stats + num_diskio;
497	+
498	+	diskio_stats_ptr->read_bytes = rbytes;
499	+	diskio_stats_ptr->write_bytes = wbytes;
500	+
501	+	diskio_stats_ptr->systime = time(NULL);
502	+
503	+	num_diskio++;
504	+
505	+	/* FIXME This should use a static cache, like the Linux
506	+	* code below. */
507	+	if (diskio_stats_ptr->disk_name == NULL) {
508	+	dh = opendir("/dev/dsk");
509	+	if (dh == NULL) {
510	+	continue;
511	+	}
512	+
513	+	diskid = (di->psd_dev.psd_major << 24) | di->psd_dev.psd_minor;
514	+	while (1) {
515	+	dinfo = readdir(dh);
516	+	if (dinfo == NULL) {
517	+	break;
518	+	}
519	+	snprintf(fullpathbuf, sizeof(fullpathbuf), "/dev/dsk/%s", dinfo->d_name);
520	+	if (lstat(fullpathbuf, &lstatinfo) < 0) {
521	+	continue;
522	+	}
523	+
524	+	if (lstatinfo.st_rdev == diskid) {
525	+	if (sg_update_string(&diskio_stats_ptr->disk_name, dinfo->d_name) < 0) {
526	+	return NULL;
527	+	}
528	+	break;
529	+	}
530	+	}
531	+	closedir(dh);
532	+
533	+	if (diskio_stats_ptr->disk_name == NULL) {
534	+	if (sg_update_string(&diskio_stats_ptr->disk_name, di->psd_hw_path.psh_name) < 0) {
535	+	return NULL;
536	+	}
537	+	}
538	+	}
539	+	}
540	+	diskidx = pstat_diskinfo[num - 1].psd_idx + 1;
541	+	}
542	+	#endif
543		#ifdef OPENBSD
544		mib[0] = CTL_HW;
545		mib[1] = HW_DISKCOUNT;
546
547		size = sizeof(diskcount);
548		if (sysctl(mib, MIBSIZE, &diskcount, &size, NULL, 0) < 0) {
549	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKCOUNT");
550		return NULL;
551		}
552
#	Line 350 | Line 554 | diskio_stat_t *get_diskio_stats(int *entries){
554		mib[1] = HW_DISKNAMES;
555
556		if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
557	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
558		return NULL;
559		}
560
561	<	disknames = malloc(size);
561	>	disknames = sg_malloc(size);
562		if (disknames == NULL) {
563		return NULL;
564		}
565
566		if (sysctl(mib, MIBSIZE, disknames, &size, NULL, 0) < 0) {
567	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
568		return NULL;
569		}
570
571	<	dk_name = calloc(diskcount, sizeof(char *));
571	>	dk_name = sg_malloc(diskcount * sizeof(char *));
572		bufpp = disknames;
573		for (i = 0; i < diskcount && (name = strsep(&bufpp, ",")) != NULL; i++) {
574		dk_name[i] = name;
#	Line 377 | Line 583 | diskio_stat_t *get_diskio_stats(int *entries){
583		#endif
584
585		if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
586	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
587		return NULL;
588		}
589
#	Line 386 | Line 593 | diskio_stat_t *get_diskio_stats(int *entries){
593		num_disks = size / sizeof(struct diskstats);
594		#endif
595
596	<	stats = malloc(size);
596	>	stats = sg_malloc(size);
597		if (stats == NULL) {
598		return NULL;
599		}
600
601		if (sysctl(mib, MIBSIZE, stats, &size, NULL, 0) < 0) {
602	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
603		return NULL;
604		}
605
606		for (i = 0; i < num_disks; i++) {
607	+	const char *name;
608		u_int64_t rbytes, wbytes;
609
610		#ifdef NETBSD
#	Line 403 | Line 612 | diskio_stat_t *get_diskio_stats(int *entries){
612		rbytes = stats[i].dk_rbytes;
613		wbytes = stats[i].dk_wbytes;
614		#else
615	<	/* Before 1.7, NetBSD merged reads and writes. */
615	>	/* Before 2.0, NetBSD merged reads and writes. */
616		rbytes = wbytes = stats[i].dk_bytes;
617		#endif
618		#else
619	+	#ifdef HAVE_DS_RBYTES
620	+	rbytes = stats[i].ds_rbytes;
621	+	wbytes = stats[i].ds_wbytes;
622	+	#else
623	+	/* Before 3.5, OpenBSD merged reads and writes */
624		rbytes = wbytes = stats[i].ds_bytes;
625		#endif
626	+	#endif
627
628		/* Don't keep stats for disks that have never been used. */
629		if (rbytes == 0 && wbytes == 0) {
#	Line 422 | Line 637 | diskio_stat_t *get_diskio_stats(int *entries){
637
638		diskio_stats_ptr->read_bytes = rbytes;
639		diskio_stats_ptr->write_bytes = wbytes;
425	–	if (diskio_stats_ptr->disk_name != NULL) {
426	–	free(diskio_stats_ptr->disk_name);
427	–	}
640		#ifdef NETBSD
641	<	diskio_stats_ptr->disk_name = strdup(stats[i].dk_name);
641	>	name = stats[i].dk_name;
642		#else
643	<	diskio_stats_ptr->disk_name = strdup(dk_name[i]);
643	>	name = dk_name[i];
644		#endif
645	+	if (sg_update_string(&diskio_stats_ptr->disk_name, name) < 0) {
646	+	return NULL;
647	+	}
648		diskio_stats_ptr->systime = time(NULL);
649
650		num_diskio++;
#	Line 444 | Line 659 | diskio_stat_t *get_diskio_stats(int *entries){
659
660		#if defined(FREEBSD) || defined(DFBSD)
661		if (!stats_init) {
662	<	stats.dinfo=malloc(sizeof(struct devinfo));
662	>	stats.dinfo=sg_malloc(sizeof(struct devinfo));
663		if(stats.dinfo==NULL) return NULL;
664		bzero(stats.dinfo, sizeof(struct devinfo));
665		stats_init = 1;
666		}
667		#ifdef FREEBSD5
668	<	if ((devstat_getdevs(NULL, &stats)) < 0) return NULL;
668	>	if ((devstat_getdevs(NULL, &stats)) < 0) {
669	>	/* FIXME devstat functions return a string error in
670	>	devstat_errbuf */
671	>	sg_set_error(SG_ERROR_DEVSTAT_GETDEVS, NULL);
672	>	return NULL;
673	>	}
674		/* Not aware of a get all devices, so i said 999. If we ever
675		* find a machine with more than 999 disks, then i'll change
676		* this number :)
677		*/
678	<	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;
678	>	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) {
679	>	sg_set_error(SG_ERROR_DEVSTAT_SELECTDEVS, NULL);
680	>	return NULL;
681	>	}
682		#else
683	<	if ((getdevs(&stats)) < 0) return NULL;
683	>	if ((getdevs(&stats)) < 0) {
684	>	sg_set_error(SG_ERROR_DEVSTAT_GETDEVS, NULL);
685	>	return NULL;
686	>	}
687		/* Not aware of a get all devices, so i said 999. If we ever
688		* find a machine with more than 999 disks, then i'll change
689		* this number :)
690		*/
691	<	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;
691	>	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) {
692	>	sg_set_error(SG_ERROR_DEVSTAT_SELECTDEVS, NULL);
693	>	return NULL;
694	>	}
695		#endif
696
697		for(counter=0;counter<stats.dinfo->numdevs;counter++){
#	Line 491 | Line 720 | diskio_stat_t *get_diskio_stats(int *entries){
720		diskio_stats_ptr->write_bytes=dev_ptr->bytes_written;
721		#endif
722		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
723	<	asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number);
723	>	if (asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number) == -1) {
724	>	sg_set_error_with_errno(SG_ERROR_ASPRINTF, NULL);
725	>	return NULL;
726	>	}
727		diskio_stats_ptr->systime=time(NULL);
728
729		num_diskio++;
#	Line 501 | Line 733 | diskio_stat_t *get_diskio_stats(int *entries){
733		#endif
734		#ifdef SOLARIS
735		if ((kc = kstat_open()) == NULL) {
736	<	return NULL;
737	<	}
736	>	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
737	>	return NULL;
738	>	}
739
740		for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
741	<	if (!strcmp(ksp->ks_class, "disk")) {
741	>	if (!strcmp(ksp->ks_class, "disk")) {
742
743		if(ksp->ks_type != KSTAT_TYPE_IO) continue;
744		/* We dont want metadevices appearins as num_diskio */
745		if(strcmp(ksp->ks_module, "md")==0) continue;
746	<	if((kstat_read(kc, ksp, &kios))==-1){
746	>	if((kstat_read(kc, ksp, &kios))==-1){
747		}
748
749		if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
#	Line 520 | Line 753 | diskio_stat_t *get_diskio_stats(int *entries){
753		diskio_stats_ptr=diskio_stats+num_diskio;
754
755		diskio_stats_ptr->read_bytes=kios.nread;
523	–
756		diskio_stats_ptr->write_bytes=kios.nwritten;
757	<
758	<	if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
759	<
760	<	diskio_stats_ptr->disk_name=strdup((char *) get_svr_from_bsd(ksp->ks_name));
757	>	if (sg_update_string(&diskio_stats_ptr->disk_name,
758	>	sg_get_svr_from_bsd(ksp->ks_name)) < 0) {
759	>	return NULL;
760	>	}
761		diskio_stats_ptr->systime=time(NULL);
762	+
763		num_diskio++;
764		}
765		}
#	Line 552 | Line 785 | diskio_stat_t *get_diskio_stats(int *entries){
785		if (f == NULL) goto out;
786		now = time(NULL);
787
788	<	while ((line_ptr = f_read_line(f, "")) != NULL) {
788	>	if (!re_compiled) {
789	>	if (regcomp(&part_re, "^(.*/)?[^/]*[0-9]$", REG_EXTENDED | REG_NOSUB) != 0) {
790	>	sg_set_error(SG_ERROR_PARSE, NULL);
791	>	goto out;
792	>	}
793	>	if (regcomp(&not_part_re, "^(.*/)?[^/0-9]+[0-9]+d[0-9]+$", REG_EXTENDED | REG_NOSUB) != 0) {
794	>	sg_set_error(SG_ERROR_PARSE, NULL);
795	>	goto out;
796	>	}
797	>	re_compiled = 1;
798	>	}
799	>
800	>	while ((line_ptr = sg_f_read_line(f, "")) != NULL) {
801		char name[100];
557	–	char *s;
802		long long rsect, wsect;
803
804		int nr = sscanf(line_ptr, format,
#	Line 562 | Line 806 | diskio_stat_t *get_diskio_stats(int *entries){
806		if (nr < 3) continue;
807
808		/* Skip device names ending in numbers, since they're
809	<	partitions. */
810	<	s = name;
811	<	while (*s != '\0') s++;
812	<	--s;
813	<	if (*s >= '0' && *s <= '9') continue;
809	>	partitions, unless they match the c0d0 pattern that some
810	>	RAID devices use. */
811	>	/* FIXME: For 2.6+, we should probably be using sysfs to detect
812	>	this... */
813	>	if ((regexec(&part_re, name, 0, NULL, 0) == 0)
814	>	&& (regexec(&not_part_re, name, 0, NULL, 0) != 0)) {
815	>	continue;
816	>	}
817
818		if (nr < 5) {
819		has_pp_stats = 0;
#	Line 577 | Line 824 | diskio_stat_t *get_diskio_stats(int *entries){
824		if (VECTOR_RESIZE(diskio_stats, n + 1) < 0) {
825		goto out;
826		}
827	<	if (n >= alloc_parts) {
828	<	alloc_parts += 16;
582	<	parts = realloc(parts, alloc_parts * sizeof *parts);
583	<	if (parts == NULL) {
584	<	alloc_parts = 0;
585	<	goto out;
586	<	}
827	>	if (VECTOR_RESIZE(parts, n + 1) < 0) {
828	>	goto out;
829		}
830
831	<	if (diskio_stats[n].disk_name != NULL)
832	<	free(diskio_stats[n].disk_name);
833	<	diskio_stats[n].disk_name = strdup(name);
831	>	if (sg_update_string(&diskio_stats[n].disk_name, name) < 0) {
832	>	goto out;
833	>	}
834		diskio_stats[n].read_bytes = rsect * 512;
835		diskio_stats[n].write_bytes = wsect * 512;
836		diskio_stats[n].systime = now;
#	Line 609 | Line 851 | diskio_stat_t *get_diskio_stats(int *entries){
851		f = fopen("/proc/stat", "r");
852		if (f == NULL) goto out;
853		now = time(NULL);
854	<
855	<	line_ptr = f_read_line(f, "disk_io:");
854	>
855	>	line_ptr = sg_f_read_line(f, "disk_io:");
856		if (line_ptr == NULL) goto out;
857	<
857	>
858		while((line_ptr=strchr(line_ptr, ' '))!=NULL){
859		long long rsect, wsect;
860
861		if (*++line_ptr == '\0') break;
862	<
862	>
863		if((sscanf(line_ptr,
864		"(%d,%d):(%*d, %*d, %lld, %*d, %lld)",
865		&major, &minor, &rsect, &wsect)) != 4) {
#	Line 674 | Line 916 | out:
916		#endif
917
918		#ifdef CYGWIN
919	+	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
920		return NULL;
921		#endif
922
923	+	#ifdef WIN32
924	+	sg_set_error(SG_ERROR_NONE, NULL);
925	+
926	+	while((name = get_diskio(num_diskio, &rbytes, &wbytes)) != NULL) {
927	+	if (VECTOR_RESIZE(diskio_stats, num_diskio+1)) {
928	+	return NULL;
929	+	}
930	+
931	+	diskio_stats_ptr = diskio_stats + num_diskio;
932	+
933	+	if (sg_update_string(&diskio_stats_ptr->disk_name, name) < 0) {
934	+	return NULL;
935	+	}
936	+	sg_update_string(&name, NULL);
937	+	diskio_stats_ptr->read_bytes = rbytes;
938	+	diskio_stats_ptr->write_bytes = wbytes;
939	+
940	+	diskio_stats_ptr->systime = 0;
941	+
942	+	num_diskio++;
943	+	}
944	+	#endif
945	+
946		*entries=num_diskio;
947
948		return diskio_stats;
949		}
950
951	<	diskio_stat_t *get_diskio_stats_diff(int *entries){
952	<	VECTOR_DECLARE_STATIC(diff, diskio_stat_t, 1,
953	<	diskio_stat_init, diskio_stat_destroy);
954	<	diskio_stat_t *src = NULL, *dest;
951	>	sg_disk_io_stats *sg_get_disk_io_stats_diff(int *entries){
952	>	#ifndef WIN32
953	>	VECTOR_DECLARE_STATIC(diff, sg_disk_io_stats, 1,
954	>	diskio_stat_init, diskio_stat_destroy);
955	>	sg_disk_io_stats *src = NULL, *dest;
956		int i, j, diff_count, new_count;
957
958		if (diskio_stats == NULL) {
959		/* No previous stats, so we can't calculate a difference. */
960	<	return get_diskio_stats(entries);
960	>	return sg_get_disk_io_stats(entries);
961		}
962
963		/* Resize the results array to match the previous stats. */
#	Line 704 | Line 971 | diskio_stat_t *get_diskio_stats_diff(int *entries){
971		src = &diskio_stats[i];
972		dest = &diff[i];
973
974	<	if (dest->disk_name != NULL) {
975	<	free(dest->disk_name);
974	>	if (sg_update_string(&dest->disk_name, src->disk_name) < 0) {
975	>	return NULL;
976		}
710	–	dest->disk_name = strdup(src->disk_name);
977		dest->read_bytes = src->read_bytes;
978		dest->write_bytes = src->write_bytes;
979		dest->systime = src->systime;
980		}
981
982		/* Get a new set of stats. */
983	<	if (get_diskio_stats(&new_count) == NULL) {
983	>	if (sg_get_disk_io_stats(&new_count) == NULL) {
984		return NULL;
985		}
986
#	Line 745 | Line 1011 | diskio_stat_t *get_diskio_stats_diff(int *entries){
1011
1012		*entries = diff_count;
1013		return diff;
1014	+	#else /* WIN32 */
1015	+	return sg_get_disk_io_stats(entries);
1016	+	#endif
1017	+	}
1018	+
1019	+	int sg_disk_io_compare_name(const void *va, const void *vb) {
1020	+	const sg_disk_io_stats *a = (const sg_disk_io_stats *)va;
1021	+	const sg_disk_io_stats *b = (const sg_disk_io_stats *)vb;
1022	+
1023	+	return strcmp(a->disk_name, b->disk_name);
1024		}
1025

Diff Legend

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