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.34 by ats, Sun Oct 19 12:04:05 2003 UTC vs.
Revision 1.49 by tdb, Mon Jan 19 16:49:21 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 25 | Line 28
28		#include <stdio.h>
29		#include <stdlib.h>
30		#include <string.h>
31	+	#include <time.h>
32		#include "statgrab.h"
33
34		#ifdef SOLARIS
#	Line 34 | Line 38
38		#define VALID_FS_TYPES {"ufs", "tmpfs"}
39		#endif
40
41	<	#ifdef LINUX
38	<	#include <time.h>
39	<	#include <sys/vfs.h>
41	>	#if defined(LINUX) || defined(CYGWIN)
42		#include <mntent.h>
43	+	#include <sys/vfs.h>
44		#include "tools.h"
45	+	#endif
46	+
47	+	#ifdef LINUX
48		#define VALID_FS_TYPES {"adfs", "affs", "befs", "bfs", "efs", "ext2", \
49		"ext3", "vxfs", "hfs", "hfsplus", "hpfs", "jffs", \
50		"jffs2", "minix", "msdos", "ntfs", "qnx4", "ramfs", \
#	Line 46 | Line 52
52		"umsdos", "vfat", "xfs", "jfs"}
53		#endif
54
55	+	#ifdef CYGWIN
56	+	#define VALID_FS_TYPES {"user"}
57	+	#endif
58	+
59		#ifdef ALLBSD
60		#include <sys/param.h>
61		#include <sys/ucred.h>
62		#include <sys/mount.h>
53	–	#define VALID_FS_TYPES {"ufs", "mfs", "ffs"}
63		#endif
64		#ifdef FREEBSD
65		#include <sys/dkstat.h>
66		#include <devstat.h>
67	+	#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \
68	+	"ufs", "mfs"}
69		#endif
70		#ifdef NETBSD
71		#include <sys/param.h>
72		#include <sys/sysctl.h>
73		#include <sys/disk.h>
74	+	#define VALID_FS_TYPES {"ffs", "mfs", "msdos", "lfs", "adosfs", "ext2fs", \
75	+	"ntfs"}
76		#endif
77
78		#define START_VAL 1
#	Line 88 | 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;
97	<	int x, valid_type;
121	>	int valid_type;
122		int num_disks=0;
123	<	#if defined(LINUX) || defined (SOLARIS)
123	>	#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN)
124		FILE *f;
125		#endif
126
#	Line 106 | Line 130 | disk_stat_t *get_disk_stats(int *entries){
130		struct mnttab mp;
131		struct statvfs fs;
132		#endif
133	<	#ifdef LINUX
133	>	#if defined(LINUX) || defined(CYGWIN)
134		struct mntent *mp;
135		struct statfs fs;
136		#endif
#	Line 129 | Line 153 | disk_stat_t *get_disk_stats(int *entries){
153		return NULL;
154		}
155		for(;nummnt--; mp++){
156	<	valid_type=0;
133	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
134	<	if(strcmp(mp->f_fstypename, fs_types[x]) ==0){
135	<	valid_type=1;
136	<	break;
137	<	}
138	<	}
156	>	valid_type = is_valid_fs_type(mp->f_fstypename);
157		#endif
158
159	<	#ifdef LINUX
159	>	#if defined(LINUX) || defined(CYGWIN)
160		if ((f=setmntent("/etc/mtab", "r" ))==NULL){
161		return NULL;
162		}
#	Line 148 | Line 166 | disk_stat_t *get_disk_stats(int *entries){
166		continue;
167		}
168
169	<	valid_type=0;
152	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
153	<	if(strcmp(mp->mnt_type, fs_types[x]) ==0){
154	<	valid_type=1;
155	<	break;
156	<	}
157	<	}
169	>	valid_type = is_valid_fs_type(mp->mnt_type);
170		#endif
171
172		#ifdef SOLARIS
#	Line 165 | 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;
169	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
170	<	if(strcmp(mp.mnt_fstype, fs_types[x]) ==0){
171	<	valid_type=1;
172	<	break;
173	<	}
174	<	}
180	>	valid_type = is_valid_fs_type(mp.mnt_fstype);
181		#endif
182
183		if(valid_type){
#	Line 209 | Line 215 | disk_stat_t *get_disk_stats(int *entries){
215		/* Freebsd doesn't have a "available" inodes */
216		disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes;
217		#endif
218	<	#ifdef LINUX
218	>	#if defined(LINUX) || defined(CYGWIN)
219		if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->mnt_fsname))==NULL){
220		return NULL;
221		}
#	Line 263 | Line 269 | disk_stat_t *get_disk_stats(int *entries){
269
270		*entries=num_disks;
271
272	<	/* If this fails, there is very little i can do about it, so i'll ignore it :) */
273	<	#if defined(LINUX) || defined(SOLARIS)
272	>	/* If this fails, there is very little i can do about it, so
273	>	I'll ignore it :) */
274	>	#if defined(LINUX) || defined(CYGWIN)
275	>	endmntent(f);
276	>	#endif
277	>	#if defined(SOLARIS)
278		fclose(f);
279		#endif
280
#	Line 319 | Line 329 | typedef struct {
329		diskio_stat_t *get_diskio_stats(int *entries){
330
331		static int sizeof_diskio_stats=0;
332	+	#ifndef LINUX
333		diskio_stat_t *diskio_stats_ptr;
334	+	#endif
335
336		#ifdef SOLARIS
337		kstat_ctl_t *kc;
#	Line 330 | Line 342 | diskio_stat_t *get_diskio_stats(int *entries){
342		FILE *f;
343		char *line_ptr;
344		int major, minor;
333	–	char dev_letter;
345		int has_pp_stats = 1;
346		static partition *parts = NULL;
347		static int alloc_parts = 0;
348		int i, n;
349		time_t now;
350	+	const char *format;
351		#endif
352		#ifdef FREEBSD
353		static struct statinfo stats;
#	Line 381 | Line 393 | diskio_stat_t *get_diskio_stats(int *entries){
393		rbytes = stats[i].dk_rbytes;
394		wbytes = stats[i].dk_wbytes;
395		#else
396	<	/* Before 1.6.1, NetBSD merged reads and writes. */
396	>	/* Before 1.7, NetBSD merged reads and writes. */
397		rbytes = wbytes = stats[i].dk_bytes;
398		#endif
399
#	Line 494 | Line 506 | diskio_stat_t *get_diskio_stats(int *entries){
506
507		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
508
509	<	diskio_stats_ptr->disk_name=strdup(ksp->ks_name);
509	>	diskio_stats_ptr->disk_name=strdup((char *) get_svr_from_bsd(ksp->ks_name));
510		diskio_stats_ptr->systime=time(NULL);
511		num_diskio++;
512		}
#	Line 508 | Line 520 | diskio_stat_t *get_diskio_stats(int *entries){
520		n = 0;
521
522		/* Read /proc/partitions to find what devices exist. Recent 2.4 kernels
523	<	have statistics in here too, so we can use those directly. */
523	>	have statistics in here too, so we can use those directly.
524	>	2.6 kernels have /proc/diskstats instead with almost (but not quite)
525	>	the same format. */
526
527	<	f = fopen("/proc/partitions", "r");
527	>	f = fopen("/proc/diskstats", "r");
528	>	format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld";
529	>	if (f == NULL) {
530	>	f = fopen("/proc/partitions", "r");
531	>	format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld";
532	>	}
533		if (f == NULL) goto out;
534		now = time(NULL);
535
#	Line 519 | Line 538 | diskio_stat_t *get_diskio_stats(int *entries){
538		char *s;
539		long long rsect, wsect;
540
541	<	int nr = sscanf(line_ptr,
523	<	" %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld",
541	>	int nr = sscanf(line_ptr, format,
542		&major, &minor, name, &rsect, &wsect);
543		if (nr < 3) continue;
526	–	if (nr < 5) {
527	–	has_pp_stats = 0;
528	–	rsect = 0;
529	–	wsect = 0;
530	–	}
544
545		/* Skip device names ending in numbers, since they're
546		partitions. */
#	Line 536 | Line 549 | diskio_stat_t *get_diskio_stats(int *entries){
549		--s;
550		if (*s >= '0' && *s <= '9') continue;
551
552	+	if (nr < 5) {
553	+	has_pp_stats = 0;
554	+	rsect = 0;
555	+	wsect = 0;
556	+	}
557	+
558		diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats,
559		diskio_stats);
560		if (diskio_stats == NULL) goto out;
#	Line 560 | Line 579 | diskio_stat_t *get_diskio_stats(int *entries){
579		n++;
580		}
581
582	+	fclose(f);
583	+	f = NULL;
584	+
585		if (!has_pp_stats) {
586	<	/* This is an older kernel without stats in /proc/partitions.
587	<	Read what we can from /proc/stat instead. */
586	>	/* This is an older kernel where /proc/partitions doesn't
587	>	contain stats. Read what we can from /proc/stat instead, and
588	>	fill in the appropriate bits of the list allocated above. */
589
590		f = fopen("/proc/stat", "r");
591		if (f == NULL) goto out;
#	Line 629 | Line 652 | diskio_stat_t *get_diskio_stats(int *entries){
652		num_diskio = n;
653		out:
654		if (f != NULL) fclose(f);
655	+	#endif
656
657	+	#ifdef CYGWIN
658	+	return NULL;
659		#endif
660	+
661		*entries=num_diskio;
662
663		return diskio_stats;
#	Line 670 | Line 697 | diskio_stat_t *get_diskio_stats_diff(int *entries){
697		}
698
699		diskio_stats_ptr=get_diskio_stats(&disks);
700	+	if (diskio_stats_ptr == NULL) {
701	+	return NULL;
702	+	}
703		diskio_stats_diff_ptr=diskio_stats_diff;
704
705		for(x=0;x<sizeof_diskio_stats_diff;x++){

Diff Legend

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