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.40 by ats, Mon Nov 10 23:25:45 2003 UTC vs.
Revision 1.51 by tdb, Thu Feb 12 23:04:52 2004 UTC

#	Line 1 | Line 1
1	<	/*
1	>	/*
2		* i-scream central monitoring system
3		* http://www.i-scream.org
4	<	* Copyright (C) 2000-2003 i-scream
4	>	* Copyright (C) 2000-2004 i-scream
5		*
6	<	* This program is free software; you can redistribute it and/or
7	<	* modify it under the terms of the GNU General Public License
8	<	* as published by the Free Software Foundation; either version 2
9	<	* of the License, or (at your option) any later version.
6	>	* This library is free software; you can redistribute it and/or
7	>	* modify it under the terms of the GNU Lesser General Public
8	>	* License as published by the Free Software Foundation; either
9	>	* version 2.1 of the License, or (at your option) any later version.
10		*
11	<	* This program is distributed in the hope that it will be useful,
11	>	* This library is distributed in the hope that it will be useful,
12		* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	<	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	<	* GNU General Public License for more details.
13	>	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14	>	* Lesser General Public License for more details.
15		*
16	<	* You should have received a copy of the GNU General Public License
17	<	* along with this program; if not, write to the Free Software
18	<	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16	>	* You should have received a copy of the GNU Lesser General Public
17	>	* License along with this library; if not, write to the Free Software
18	>	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
19	>	* 02111-1307 USA
20	>	*
21	>	* $Id$
22		*/
23
24		#ifdef HAVE_CONFIG_H
#	Line 64 | Line 67
67		#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \
68		"ufs", "mfs"}
69		#endif
70	<	#ifdef NETBSD
70	>	#if defined(NETBSD) || defined(OPENBSD)
71		#include <sys/param.h>
72		#include <sys/sysctl.h>
73		#include <sys/disk.h>
#	Line 98 | Line 101 | void init_disk_stat(int start, int end, disk_stat_t *d
101		}
102		}
103
104	+	int is_valid_fs_type(const char *type) {
105	+	const char *types[] = VALID_FS_TYPES;
106	+	int i;
107	+
108	+	for (i = 0; i < (sizeof types / sizeof *types); i++) {
109	+	if (strcmp(types[i], type) == 0) {
110	+	return 1;
111	+	}
112	+	}
113	+	return 0;
114	+	}
115	+
116		disk_stat_t *get_disk_stats(int *entries){
117
118		static disk_stat_t *disk_stats;
119		static int watermark=-1;
120
121	<	char *fs_types[] = VALID_FS_TYPES;
107	<	int x, valid_type;
121	>	int valid_type;
122		int num_disks=0;
123		#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN)
124		FILE *f;
#	Line 139 | Line 153 | disk_stat_t *get_disk_stats(int *entries){
153		return NULL;
154		}
155		for(;nummnt--; mp++){
156	<	valid_type=0;
143	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
144	<	if(strcmp(mp->f_fstypename, fs_types[x]) ==0){
145	<	valid_type=1;
146	<	break;
147	<	}
148	<	}
156	>	valid_type = is_valid_fs_type(mp->f_fstypename);
157		#endif
158
159		#if defined(LINUX) || defined(CYGWIN)
#	Line 158 | Line 166 | disk_stat_t *get_disk_stats(int *entries){
166		continue;
167		}
168
169	<	valid_type=0;
162	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
163	<	if(strcmp(mp->mnt_type, fs_types[x]) ==0){
164	<	valid_type=1;
165	<	break;
166	<	}
167	<	}
169	>	valid_type = is_valid_fs_type(mp->mnt_type);
170		#endif
171
172		#ifdef SOLARIS
#	Line 175 | Line 177 | disk_stat_t *get_disk_stats(int *entries){
177		if ((statvfs(mp.mnt_mountp, &fs)) !=0){
178		continue;
179		}
180	<	valid_type=0;
179	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
180	<	if(strcmp(mp.mnt_fstype, fs_types[x]) ==0){
181	<	valid_type=1;
182	<	break;
183	<	}
184	<	}
180	>	valid_type = is_valid_fs_type(mp.mnt_fstype);
181		#endif
182
183		if(valid_type){
#	Line 364 | Line 360 | diskio_stat_t *get_diskio_stats(int *entries){
360		#endif
361		#ifdef NETBSD
362		struct disk_sysctl *stats;
363	+	#endif
364	+	#ifdef OPENBSD
365	+	struct diskstats *stats;
366	+	#endif
367	+	#ifdef NETBSD
368	+	#define MIBSIZE 3
369	+	#endif
370	+	#ifdef OPENBSD
371	+	#define MIBSIZE 2
372	+	#endif
373	+	#if defined(NETBSD) || defined(OPENBSD)
374		int num_disks, i;
375	<	int mib[3];
375	>	int mib[MIBSIZE];
376		size_t size;
377		#endif
378
379		num_diskio=0;
380
381	<	#ifdef NETBSD
381	>	#if defined(NETBSD) || defined(OPENBSD)
382		mib[0] = CTL_HW;
383		mib[1] = HW_DISKSTATS;
384	+	#ifdef NETBSD
385		mib[2] = sizeof(struct disk_sysctl);
386	+	#endif
387
388	<	if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
388	>	if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
389		return NULL;
390		}
391	+
392	+	#ifdef NETBSD
393		num_disks = size / sizeof(struct disk_sysctl);
394	+	#else
395	+	num_disks = size / sizeof(struct diskstats);
396	+	#endif
397
398		stats = malloc(size);
399		if (stats == NULL) {
400		return NULL;
401		}
402
403	<	if (sysctl(mib, 3, stats, &size, NULL, 0) < 0) {
403	>	if (sysctl(mib, MIBSIZE, stats, &size, NULL, 0) < 0) {
404		return NULL;
405		}
406
407		for (i = 0; i < num_disks; i++) {
408		u_int64_t rbytes, wbytes;
409
410	+	#ifdef NETBSD
411		#ifdef HAVE_DK_RBYTES
412		rbytes = stats[i].dk_rbytes;
413		wbytes = stats[i].dk_wbytes;
#	Line 400 | Line 415 | diskio_stat_t *get_diskio_stats(int *entries){
415		/* Before 1.7, NetBSD merged reads and writes. */
416		rbytes = wbytes = stats[i].dk_bytes;
417		#endif
418	+	#else
419	+	rbytes = wbytes = stats[i].ds_bytes;
420	+	#endif
421
422		/* Don't keep stats for disks that have never been used. */
423		if (rbytes == 0 && wbytes == 0) {
#	Line 419 | Line 437 | diskio_stat_t *get_diskio_stats(int *entries){
437		if (diskio_stats_ptr->disk_name != NULL) {
438		free(diskio_stats_ptr->disk_name);
439		}
440	+	#ifdef NETBSD
441		diskio_stats_ptr->disk_name = strdup(stats[i].dk_name);
442	+	#else
443	+	asprintf((&diskio_stats_ptr->disk_name), "%s%d", "disk", i);
444	+	#endif
445		diskio_stats_ptr->systime = time(NULL);
446
447		num_diskio++;
#	Line 510 | Line 532 | diskio_stat_t *get_diskio_stats(int *entries){
532
533		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
534
535	<	diskio_stats_ptr->disk_name=strdup(ksp->ks_name);
535	>	diskio_stats_ptr->disk_name=strdup((char *) get_svr_from_bsd(ksp->ks_name));
536		diskio_stats_ptr->systime=time(NULL);
537		num_diskio++;
538		}
#	Line 583 | Line 605 | diskio_stat_t *get_diskio_stats(int *entries){
605		n++;
606		}
607
608	+	fclose(f);
609	+	f = NULL;
610	+
611		if (!has_pp_stats) {
612	<	/* This is an older kernel without stats in /proc/partitions.
613	<	Read what we can from /proc/stat instead. */
612	>	/* This is an older kernel where /proc/partitions doesn't
613	>	contain stats. Read what we can from /proc/stat instead, and
614	>	fill in the appropriate bits of the list allocated above. */
615
616		f = fopen("/proc/stat", "r");
617		if (f == NULL) goto out;
#	Line 652 | Line 678 | diskio_stat_t *get_diskio_stats(int *entries){
678		num_diskio = n;
679		out:
680		if (f != NULL) fclose(f);
681	+	#endif
682
683	+	#ifdef CYGWIN
684	+	return NULL;
685		#endif
686	+
687		*entries=num_diskio;
688
689		return diskio_stats;
690		}
691
692		diskio_stat_t *get_diskio_stats_diff(int *entries){
693	<	static diskio_stat_t *diskio_stats_diff=NULL;
694	<	static int sizeof_diskio_stats_diff=0;
695	<	diskio_stat_t *diskio_stats_diff_ptr, *diskio_stats_ptr;
696	<	int disks, x, y;
693	>	static diskio_stat_t *diff = NULL;
694	>	static int diff_count = 0;
695	>	diskio_stat_t *src, *dest;
696	>	int i, j, new_count;
697
698	<	if(diskio_stats==NULL){
699	<	diskio_stats_ptr=get_diskio_stats(&disks);
700	<	*entries=disks;
671	<	return diskio_stats_ptr;
698	>	if (diskio_stats == NULL) {
699	>	/* No previous stats, so we can't calculate a difference. */
700	>	return get_diskio_stats(entries);
701		}
702
703	<	diskio_stats_diff=diskio_stat_malloc(num_diskio, &sizeof_diskio_stats_diff, diskio_stats_diff);
704	<	if(diskio_stats_diff==NULL){
703	>	/* Resize the results array to match the previous stats. */
704	>	diff = diskio_stat_malloc(num_diskio, &diff_count, diff);
705	>	if (diff == NULL) {
706		return NULL;
707		}
708
709	<	diskio_stats_diff_ptr=diskio_stats_diff;
710	<	diskio_stats_ptr=diskio_stats;
709	>	/* Copy the previous stats into the result. */
710	>	for (i = 0; i < diff_count; i++) {
711	>	src = &diskio_stats[i];
712	>	dest = &diff[i];
713
714	<	for(disks=0;disks<num_diskio;disks++){
715	<	if(diskio_stats_diff_ptr->disk_name!=NULL){
684	<	free(diskio_stats_diff_ptr->disk_name);
714	>	if (dest->disk_name != NULL) {
715	>	free(dest->disk_name);
716		}
717	<	diskio_stats_diff_ptr->disk_name=strdup(diskio_stats_ptr->disk_name);
718	<	diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes;
719	<	diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes;
720	<	diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime;
717	>	dest->disk_name = strdup(src->disk_name);
718	>	dest->read_bytes = src->read_bytes;
719	>	dest->write_bytes = src->write_bytes;
720	>	dest->systime = src->systime;
721	>	}
722
723	<	diskio_stats_diff_ptr++;
724	<	diskio_stats_ptr++;
723	>	/* Get a new set of stats. */
724	>	if (get_diskio_stats(&new_count) == NULL) {
725	>	return NULL;
726		}
727
728	<	diskio_stats_ptr=get_diskio_stats(&disks);
729	<	diskio_stats_diff_ptr=diskio_stats_diff;
728	>	/* For each previous stat... */
729	>	for (i = 0; i < diff_count; i++) {
730	>	dest = &diff[i];
731
732	<	for(x=0;x<sizeof_diskio_stats_diff;x++){
733	<
734	<	if((strcmp(diskio_stats_diff_ptr->disk_name, diskio_stats_ptr->disk_name))==0){
735	<	diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes-diskio_stats_diff_ptr->read_bytes;
736	<	diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes-diskio_stats_diff_ptr->write_bytes;
737	<	diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime-diskio_stats_diff_ptr->systime;
738	<	}else{
705	<	diskio_stats_ptr=diskio_stats;
706	<	for(y=0;y<disks;y++){
707	<	if((strcmp(diskio_stats_diff_ptr->disk_name, diskio_stats_ptr->disk_name))==0){
708	<	diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes-diskio_stats_diff_ptr->read_bytes;
709	<	diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes-diskio_stats_diff_ptr->write_bytes;
710	<	diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime-diskio_stats_diff_ptr->systime;
711	<
712	<	break;
713	<	}
714	<
715	<	diskio_stats_ptr++;
732	>	/* ... find the corresponding new stat ... */
733	>	for (j = 0; j < new_count; j++) {
734	>	/* Try the new stat in the same position first,
735	>	since that's most likely to be it. */
736	>	src = &diskio_stats[(i + j) % new_count];
737	>	if (strcmp(src->disk_name, dest->disk_name) == 0) {
738	>	break;
739		}
740		}
741	+	if (j == new_count) {
742	+	/* No match found. */
743	+	continue;
744	+	}
745
746	<	diskio_stats_ptr++;
747	<	diskio_stats_diff_ptr++;
748	<
746	>	/* ... and subtract the previous stat from it to get the
747	>	difference. */
748	>	dest->read_bytes = src->read_bytes - dest->read_bytes;
749	>	dest->write_bytes = src->write_bytes - dest->write_bytes;
750	>	dest->systime = src->systime - dest->systime;
751		}
752	<
753	<	*entries=sizeof_diskio_stats_diff;
754	<	return diskio_stats_diff;
752	>
753	>	*entries = diff_count;
754	>	return diff;
755		}
756	+

Diff Legend

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