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.10 by pajs, Tue Mar 4 18:06:16 2003 UTC vs.
Revision 1.17 by pajs, Sat Apr 5 23:56:25 2003 UTC

#	Line 22 | Line 22
22		#include "config.h"
23		#endif
24
25	+	#include <stdio.h>
26		#include <stdlib.h>
27		#include <string.h>
28		#include "statgrab.h"
29
30		#ifdef SOLARIS
30	–	#include <stdio.h>
31		#include <sys/mnttab.h>
32		#include <sys/statvfs.h>
33		#include <kstat.h>
#	Line 35 | Line 35
35		#endif
36
37		#ifdef LINUX
38	–	#include <stdio.h>
38		#include <sys/vfs.h>
39		#include <mntent.h>
40		#include "tools.h"
41		#define VALID_FS_TYPES {"ext2", "ext3", "xfs", "reiserfs", "vfat", "tmpfs"}
42		#endif
43
44	+	#ifdef FREEBSD
45	+	#include <sys/param.h>
46	+	#include <sys/ucred.h>
47	+	#include <sys/mount.h>
48	+	#include <sys/dkstat.h>
49	+	#include <devstat.h>
50	+	#define VALID_FS_TYPES {"ufs", "mfs"}
51	+	#endif
52		#define START_VAL 1
53
54		char *copy_string(char *orig_ptr, const char *newtext){
#	Line 76 | Line 83 | disk_stat_t *get_disk_stats(int *entries){
83		char *fs_types[] = VALID_FS_TYPES;
84		int x, valid_type;
85		int num_disks=0;
86	+	#if defined(LINUX) || defined (SOLARIS)
87		FILE *f;
88	+	#endif
89
90		disk_stat_t *disk_ptr;
91
92		#ifdef SOLARIS
93	<	struct mnttab *mp;
93	>	struct mnttab mp;
94		struct statvfs fs;
95		#endif
96		#ifdef LINUX
97		struct mntent *mp;
98		struct statfs fs;
99		#endif
100	+	#ifdef FREEBSD
101	+	int nummnt;
102	+	struct statfs *mp;
103	+	#endif
104
105		if(watermark==-1){
106		disk_stats=malloc(START_VAL * sizeof(disk_stat_t));
#	Line 97 | Line 110 | disk_stat_t *get_disk_stats(int *entries){
110		watermark=START_VAL;
111		init_disk_stat(0, watermark-1, disk_stats);
112		}
113	+	#ifdef FREEBSD
114	+	nummnt=getmntinfo(&mp , MNT_LOCAL);
115	+	if (nummnt<=0){
116	+	return NULL;
117	+	}
118	+	for(;nummnt--; mp++){
119	+	valid_type=0;
120	+	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
121	+	if(strcmp(mp->f_fstypename, fs_types[x]) ==0){
122	+	valid_type=1;
123	+	break;
124	+	}
125	+	}
126	+	#endif
127	+
128		#ifdef LINUX
129		if ((f=setmntent("/etc/mtab", "r" ))==NULL){
130		return NULL;
#	Line 146 | Line 174 | disk_stat_t *get_disk_stats(int *entries){
174		}
175
176		disk_ptr=disk_stats+num_disks;
177	+	#ifdef FREEBSD
178	+	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){
179	+	return NULL;
180	+	}
181	+
182	+	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->f_fstypename))==NULL){
183	+	return NULL;
184	+	}
185	+
186	+	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->f_mntonname))==NULL){
187	+	return NULL;
188	+	}
189	+
190	+	disk_ptr->size = (long long)mp->f_bsize * (long long) mp->f_blocks;
191	+	disk_ptr->avail = (long long)mp->f_bsize * (long long) mp->f_bavail;
192	+	disk_ptr->used = (disk_ptr->size) - ((long long)mp->f_bsize * (long long)mp->f_bfree);
193	+
194	+	disk_ptr->total_inodes=(long long)mp->f_files;
195	+	disk_ptr->free_inodes=(long long)mp->f_ffree;
196	+	/* Freebsd doesn't have a "available" inodes */
197	+	disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes;
198	+	#endif
199		#ifdef LINUX
200		if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->mnt_fsname))==NULL){
201		return NULL;
#	Line 201 | Line 251 | disk_stat_t *get_disk_stats(int *entries){
251		*entries=num_disks;
252
253		/* If this fails, there is very little i can do about it, so i'll ignore it :) */
254	+	#if defined(LINUX) || defined(SOLARIS)
255		fclose(f);
256	+	#endif
257
258		return disk_stats;
259
#	Line 260 | Line 312 | diskio_stat_t *get_diskio_stats(int *entries){
312		int major, minor;
313		char dev_letter;
314		#endif
315	<
315	>	#ifdef FREEBSD
316	>	struct statinfo stats;
317	>	int counter;
318	>	struct device_selection *dev_sel = NULL;
319	>	int n_selected, n_selections;
320	>	long sel_gen;
321	>	struct devstat *dev_ptr;
322	>	#endif
323		num_diskio=0;
324
325	+	#ifdef FREEBSD
326	+	stats.dinfo=malloc(sizeof(struct devinfo));
327	+	if(stats.dinfo==NULL) return NULL;
328	+	if ((getdevs(&stats)) < 0) return NULL;
329	+	/* Not aware of a get all devices, so i said 999. If we ever
330	+	* find a machine with more than 999 disks, then i'll change
331	+	* this number :)
332	+	*/
333	+	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;
334	+
335	+	for(counter=0;counter<stats.dinfo->numdevs;counter++){
336	+	dev_ptr=&stats.dinfo->devices[dev_sel[counter].position];
337	+
338	+	/* Throw away devices that have done nothing, ever.. Eg "odd"
339	+	* devices.. like mem, proc.. and also doesn't report floppy
340	+	* drives etc unless they are doing stuff :)
341	+	*/
342	+	if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue;
343	+	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
344	+	return NULL;
345	+	}
346	+	diskio_stats_ptr=diskio_stats+num_diskio;
347	+
348	+	diskio_stats_ptr->read_bytes=dev_ptr->bytes_read;
349	+	diskio_stats_ptr->write_bytes=dev_ptr->bytes_written;
350	+	if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
351	+	asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number);
352	+	diskio_stats_ptr->systime=time(NULL);
353	+
354	+	num_diskio++;
355	+	}
356	+	free(dev_sel);
357	+	free(stats.dinfo);
358	+
359	+	#endif
360		#ifdef SOLARIS
361		if ((kc = kstat_open()) == NULL) {
362		return NULL;
#	Line 290 | Line 384 | diskio_stat_t *get_diskio_stats(int *entries){
384		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
385
386		diskio_stats_ptr->disk_name=strdup(ksp->ks_name);
387	+	diskio_stats_ptr->systime=time(NULL);
388		num_diskio++;
389		}
390		}
#	Line 300 | Line 395 | diskio_stat_t *get_diskio_stats(int *entries){
395		#ifdef LINUX
396		f=fopen("/proc/stat", "r");
397		if(f==NULL){
398	+	*entries=0;
399	+	fclose(f);
400		return NULL;
401		}
402		if((line_ptr=f_read_line(f, "disk_io:"))==NULL){
403	+	*entries=0;
404	+	fclose(f);
405		return NULL;
406		}
407		while((line_ptr=strchr(line_ptr, ' '))!=NULL){
408	+	line_ptr++;
409	+	if(*line_ptr=='\0'){
410	+	break;
411	+	}
412		if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
413		fclose(f);
414	+	*entries=0;
415		return NULL;
416		}
417		diskio_stats_ptr=diskio_stats+num_diskio;
418
419
420	<	sscanf(line_ptr, "(%d,%d):(%*d, %lld, %*d, %lld, %*d)", \
420	>	if((sscanf(line_ptr, "(%d,%d):(%*d, %*d, %lld, %*d, %lld)", \
421		&major, \
422		&minor, \
423		&diskio_stats_ptr->read_bytes, \
424	<	&diskio_stats_ptr->write_bytes);
424	>	&diskio_stats_ptr->write_bytes))!=4) {
425	>	continue;
426	>	}
427
428	+	/* We read the number of blocks. Blocks are stored in 512 bytes */
429	+	diskio_stats_ptr->read_bytes=diskio_stats_ptr->read_bytes*512;
430	+	diskio_stats_ptr->write_bytes=diskio_stats_ptr->write_bytes*512;
431	+
432		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
433
434		switch(major){
435	+	case 2:
436	+	if(minor==0){
437	+	diskio_stats_ptr->disk_name=strdup("fd0");
438	+	}
439	+	break;
440	+
441		case 3:
442		if(minor==0){
443		diskio_stats_ptr->disk_name=strdup("hda");
#	Line 336 | Line 452 | diskio_stat_t *get_diskio_stats(int *entries){
452		}else{
453		diskio_stats_ptr->disk_name=strdup("hdd");
454		}
455	+	break;
456		case 8:
457		dev_letter='a'+(minor/16);
458		diskio_stats_ptr->disk_name=malloc(4);
459		snprintf(diskio_stats_ptr->disk_name, 4, "sd%c", dev_letter);
460	+	break;
461		default:
462		/* I have no idea what it is then :) */
463		diskio_stats_ptr->disk_name=malloc(16);
464		snprintf(diskio_stats_ptr->disk_name, 16, "%d %d", major, minor);
465	+	break;
466		}
467
468	+	diskio_stats_ptr->systime=time(NULL);
469		num_diskio++;
470		}
471	+
472	+	fclose(f);
473
474		#endif
475		*entries=num_diskio;

Diff Legend

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