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.19 by ats, Thu Aug 28 21:33:42 2003 UTC vs.
Revision 1.38 by ats, Fri Oct 24 17:46:44 2003 UTC

#	Line 35 | Line 35
35		#endif
36
37		#ifdef LINUX
38	+	#include <time.h>
39		#include <sys/vfs.h>
40		#include <mntent.h>
41		#include "tools.h"
42	<	#define VALID_FS_TYPES {"ext2", "ext3", "xfs", "reiserfs", "vfat", "tmpfs"}
42	>	#define VALID_FS_TYPES {"adfs", "affs", "befs", "bfs", "efs", "ext2", \
43	>	"ext3", "vxfs", "hfs", "hfsplus", "hpfs", "jffs", \
44	>	"jffs2", "minix", "msdos", "ntfs", "qnx4", "ramfs", \
45	>	"rootfs", "reiserfs", "sysv", "v7", "udf", "ufs", \
46	>	"umsdos", "vfat", "xfs", "jfs"}
47		#endif
48
49	<	#ifdef FREEBSD
49	>	#ifdef ALLBSD
50		#include <sys/param.h>
51		#include <sys/ucred.h>
52		#include <sys/mount.h>
53	+	#endif
54	+	#ifdef FREEBSD
55		#include <sys/dkstat.h>
56		#include <devstat.h>
57	<	#define VALID_FS_TYPES {"ufs", "mfs"}
57	>	#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \
58	>	"ufs", "mfs"}
59		#endif
60	+	#ifdef NETBSD
61	+	#include <sys/param.h>
62	+	#include <sys/sysctl.h>
63	+	#include <sys/disk.h>
64	+	#define VALID_FS_TYPES {"ffs", "mfs", "msdos", "lfs", "adosfs", "ext2fs", \
65	+	"ntfs"}
66	+	#endif
67	+
68		#define START_VAL 1
69
70		char *copy_string(char *orig_ptr, const char *newtext){
#	Line 97 | Line 113 | disk_stat_t *get_disk_stats(int *entries){
113		struct mntent *mp;
114		struct statfs fs;
115		#endif
116	<	#ifdef FREEBSD
116	>	#ifdef ALLBSD
117		int nummnt;
118		struct statfs *mp;
119		#endif
#	Line 110 | Line 126 | disk_stat_t *get_disk_stats(int *entries){
126		watermark=START_VAL;
127		init_disk_stat(0, watermark-1, disk_stats);
128		}
129	<	#ifdef FREEBSD
129	>	#ifdef ALLBSD
130		nummnt=getmntinfo(&mp , MNT_LOCAL);
131		if (nummnt<=0){
132		return NULL;
#	Line 174 | Line 190 | disk_stat_t *get_disk_stats(int *entries){
190		}
191
192		disk_ptr=disk_stats+num_disks;
193	<	#ifdef FREEBSD
193	>	#ifdef ALLBSD
194		if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){
195		return NULL;
196		}
#	Line 296 | Line 312 | diskio_stat_t *diskio_stat_malloc(int needed_entries,
312		static diskio_stat_t *diskio_stats=NULL;
313		static int num_diskio=0;
314
315	+	#ifdef LINUX
316	+	typedef struct {
317	+	int major;
318	+	int minor;
319	+	} partition;
320	+	#endif
321	+
322		diskio_stat_t *get_diskio_stats(int *entries){
323
324		static int sizeof_diskio_stats=0;
325	+	#ifndef LINUX
326		diskio_stat_t *diskio_stats_ptr;
327	+	#endif
328
329		#ifdef SOLARIS
330		kstat_ctl_t *kc;
#	Line 310 | Line 335 | diskio_stat_t *get_diskio_stats(int *entries){
335		FILE *f;
336		char *line_ptr;
337		int major, minor;
338	<	char dev_letter;
338	>	int has_pp_stats = 1;
339	>	static partition *parts = NULL;
340	>	static int alloc_parts = 0;
341	>	int i, n;
342	>	time_t now;
343	>	const char *format;
344		#endif
345		#ifdef FREEBSD
346	<	struct statinfo stats;
346	>	static struct statinfo stats;
347	>	static int stats_init = 0;
348		int counter;
349		struct device_selection *dev_sel = NULL;
350		int n_selected, n_selections;
351		long sel_gen;
352		struct devstat *dev_ptr;
353		#endif
354	+	#ifdef NETBSD
355	+	struct disk_sysctl *stats;
356	+	int num_disks, i;
357	+	int mib[3];
358	+	size_t size;
359	+	#endif
360	+
361		num_diskio=0;
362
363	+	#ifdef NETBSD
364	+	mib[0] = CTL_HW;
365	+	mib[1] = HW_DISKSTATS;
366	+	mib[2] = sizeof(struct disk_sysctl);
367	+
368	+	if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
369	+	return NULL;
370	+	}
371	+	num_disks = size / sizeof(struct disk_sysctl);
372	+
373	+	stats = malloc(size);
374	+	if (stats == NULL) {
375	+	return NULL;
376	+	}
377	+
378	+	if (sysctl(mib, 3, stats, &size, NULL, 0) < 0) {
379	+	return NULL;
380	+	}
381	+
382	+	for (i = 0; i < num_disks; i++) {
383	+	u_int64_t rbytes, wbytes;
384	+
385	+	#ifdef HAVE_DK_RBYTES
386	+	rbytes = stats[i].dk_rbytes;
387	+	wbytes = stats[i].dk_wbytes;
388	+	#else
389	+	/* Before 1.7, NetBSD merged reads and writes. */
390	+	rbytes = wbytes = stats[i].dk_bytes;
391	+	#endif
392	+
393	+	/* Don't keep stats for disks that have never been used. */
394	+	if (rbytes == 0 && wbytes == 0) {
395	+	continue;
396	+	}
397	+
398	+	diskio_stats = diskio_stat_malloc(num_diskio + 1,
399	+	&sizeof_diskio_stats,
400	+	diskio_stats);
401	+	if (diskio_stats == NULL) {
402	+	return NULL;
403	+	}
404	+	diskio_stats_ptr = diskio_stats + num_diskio;
405	+
406	+	diskio_stats_ptr->read_bytes = rbytes;
407	+	diskio_stats_ptr->write_bytes = wbytes;
408	+	if (diskio_stats_ptr->disk_name != NULL) {
409	+	free(diskio_stats_ptr->disk_name);
410	+	}
411	+	diskio_stats_ptr->disk_name = strdup(stats[i].dk_name);
412	+	diskio_stats_ptr->systime = time(NULL);
413	+
414	+	num_diskio++;
415	+	}
416	+
417	+	free(stats);
418	+	#endif
419	+
420		#ifdef FREEBSD
421	<	stats.dinfo=malloc(sizeof(struct devinfo));
422	<	if(stats.dinfo==NULL) return NULL;
421	>	if (!stats_init) {
422	>	stats.dinfo=malloc(sizeof(struct devinfo));
423	>	if(stats.dinfo==NULL) return NULL;
424	>	bzero(stats.dinfo, sizeof(struct devinfo));
425	>	stats_init = 1;
426	>	}
427	>	#ifdef FREEBSD5
428	>	if ((devstat_getdevs(NULL, &stats)) < 0) return NULL;
429	>	/* Not aware of a get all devices, so i said 999. If we ever
430	>	* find a machine with more than 999 disks, then i'll change
431	>	* this number :)
432	>	*/
433	>	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;
434	>	#else
435		if ((getdevs(&stats)) < 0) return NULL;
436		/* Not aware of a get all devices, so i said 999. If we ever
437		* find a machine with more than 999 disks, then i'll change
438		* this number :)
439		*/
440		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;
441	+	#endif
442
443		for(counter=0;counter<stats.dinfo->numdevs;counter++){
444		dev_ptr=&stats.dinfo->devices[dev_sel[counter].position];
#	Line 339 | Line 447 | diskio_stat_t *get_diskio_stats(int *entries){
447		* devices.. like mem, proc.. and also doesn't report floppy
448		* drives etc unless they are doing stuff :)
449		*/
450	+	#ifdef FREEBSD5
451	+	if((dev_ptr->bytes[DEVSTAT_READ]==0) && (dev_ptr->bytes[DEVSTAT_WRITE]==0)) continue;
452	+	#else
453		if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue;
454	+	#endif
455		if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
456		return NULL;
457		}
458		diskio_stats_ptr=diskio_stats+num_diskio;
459	<
459	>
460	>	#ifdef FREEBSD5
461	>	diskio_stats_ptr->read_bytes=dev_ptr->bytes[DEVSTAT_READ];
462	>	diskio_stats_ptr->write_bytes=dev_ptr->bytes[DEVSTAT_WRITE];
463	>	#else
464		diskio_stats_ptr->read_bytes=dev_ptr->bytes_read;
465		diskio_stats_ptr->write_bytes=dev_ptr->bytes_written;
466	+	#endif
467		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
468		asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number);
469		diskio_stats_ptr->systime=time(NULL);
#	Line 354 | Line 471 | diskio_stat_t *get_diskio_stats(int *entries){
471		num_diskio++;
472		}
473		free(dev_sel);
357	–	free(stats.dinfo);
474
475		#endif
476		#ifdef SOLARIS
#	Line 393 | Line 509 | diskio_stat_t *get_diskio_stats(int *entries){
509		#endif
510
511		#ifdef LINUX
512	<	f=fopen("/proc/stat", "r");
513	<	if(f==NULL){
514	<	*entries=0;
515	<	return NULL;
512	>	num_diskio = 0;
513	>	n = 0;
514	>
515	>	/* Read /proc/partitions to find what devices exist. Recent 2.4 kernels
516	>	have statistics in here too, so we can use those directly.
517	>	2.6 kernels have /proc/diskstats instead with almost (but not quite)
518	>	the same format. */
519	>
520	>	f = fopen("/proc/diskstats", "r");
521	>	format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld";
522	>	if (f == NULL) {
523	>	f = fopen("/proc/partitions", "r");
524	>	format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld";
525		}
526	<	if((line_ptr=f_read_line(f, "disk_io:"))==NULL){
527	<	*entries=0;
403	<	fclose(f);
404	<	return NULL;
405	<	}
406	<	while((line_ptr=strchr(line_ptr, ' '))!=NULL){
407	<	line_ptr++;
408	<	if(*line_ptr=='\0'){
409	<	break;
410	<	}
411	<	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
412	<	fclose(f);
413	<	*entries=0;
414	<	return NULL;
415	<	}
416	<	diskio_stats_ptr=diskio_stats+num_diskio;
526	>	if (f == NULL) goto out;
527	>	now = time(NULL);
528
529	+	while ((line_ptr = f_read_line(f, "")) != NULL) {
530	+	char name[20];
531	+	char *s;
532	+	long long rsect, wsect;
533
534	<	if((sscanf(line_ptr, "(%d,%d):(%*d, %*d, %lld, %*d, %lld)", \
535	<	&major, \
536	<	&minor, \
537	<	&diskio_stats_ptr->read_bytes, \
538	<	&diskio_stats_ptr->write_bytes))!=4) {
539	<	continue;
534	>	int nr = sscanf(line_ptr, format,
535	>	&major, &minor, name, &rsect, &wsect);
536	>	if (nr < 3) continue;
537	>
538	>	/* Skip device names ending in numbers, since they're
539	>	partitions. */
540	>	s = name;
541	>	while (*s != '\0') s++;
542	>	--s;
543	>	if (*s >= '0' && *s <= '9') continue;
544	>
545	>	if (nr < 5) {
546	>	has_pp_stats = 0;
547	>	rsect = 0;
548	>	wsect = 0;
549		}
550
551	<	/* We read the number of blocks. Blocks are stored in 512 bytes */
552	<	diskio_stats_ptr->read_bytes=diskio_stats_ptr->read_bytes*512;
553	<	diskio_stats_ptr->write_bytes=diskio_stats_ptr->write_bytes*512;
551	>	diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats,
552	>	diskio_stats);
553	>	if (diskio_stats == NULL) goto out;
554	>	if (n >= alloc_parts) {
555	>	alloc_parts += 16;
556	>	parts = realloc(parts, alloc_parts * sizeof *parts);
557	>	if (parts == NULL) {
558	>	alloc_parts = 0;
559	>	goto out;
560	>	}
561	>	}
562
563	<	if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
563	>	if (diskio_stats[n].disk_name != NULL)
564	>	free(diskio_stats[n].disk_name);
565	>	diskio_stats[n].disk_name = strdup(name);
566	>	diskio_stats[n].read_bytes = rsect * 512;
567	>	diskio_stats[n].write_bytes = wsect * 512;
568	>	diskio_stats[n].systime = now;
569	>	parts[n].major = major;
570	>	parts[n].minor = minor;
571
572	<	switch(major){
573	<	case 2:
435	<	if(minor==0){
436	<	diskio_stats_ptr->disk_name=strdup("fd0");
437	<	}
438	<	break;
572	>	n++;
573	>	}
574
575	<	case 3:
576	<	if(minor==0){
577	<	diskio_stats_ptr->disk_name=strdup("hda");
443	<	}else{
444	<	diskio_stats_ptr->disk_name=strdup("hdb");
445	<	}
446	<	break;
575	>	if (!has_pp_stats) {
576	>	/* This is an older kernel without stats in /proc/partitions.
577	>	Read what we can from /proc/stat instead. */
578
579	+	f = fopen("/proc/stat", "r");
580	+	if (f == NULL) goto out;
581	+	now = time(NULL);
582	+
583	+	line_ptr = f_read_line(f, "disk_io:");
584	+	if (line_ptr == NULL) goto out;
585	+
586	+	while((line_ptr=strchr(line_ptr, ' '))!=NULL){
587	+	long long rsect, wsect;
588	+
589	+	if (*++line_ptr == '\0') break;
590	+
591	+	if((sscanf(line_ptr,
592	+	"(%d,%d):(%*d, %*d, %lld, %*d, %lld)",
593	+	&major, &minor, &rsect, &wsect)) != 4) {
594	+	continue;
595	+	}
596	+
597	+	/* Find the corresponding device from earlier.
598	+	Just to add to the fun, "minor" is actually the disk
599	+	number, not the device minor, so we need to figure
600	+	out the real minor number based on the major!
601	+	This list is not exhaustive; if you're running
602	+	an older kernel you probably don't have fancy
603	+	I2O hardware anyway... */
604	+	switch (major) {
605	+	case 3:
606	+	case 21:
607		case 22:
608	<	if(minor==0){
609	<	diskio_stats_ptr->disk_name=strdup("hdc");
610	<	}else{
611	<	diskio_stats_ptr->disk_name=strdup("hdd");
612	<	}
608	>	case 33:
609	>	case 34:
610	>	case 36:
611	>	case 56:
612	>	case 57:
613	>	case 88:
614	>	case 89:
615	>	case 90:
616	>	case 91:
617	>	minor *= 64;
618		break;
619	<	case 8:
620	<	dev_letter='a'+(minor/16);
457	<	diskio_stats_ptr->disk_name=malloc(4);
458	<	snprintf(diskio_stats_ptr->disk_name, 4, "sd%c", dev_letter);
619	>	case 9:
620	>	case 43:
621		break;
622		default:
623	<	/* I have no idea what it is then :) */
462	<	diskio_stats_ptr->disk_name=malloc(16);
463	<	snprintf(diskio_stats_ptr->disk_name, 16, "%d %d", major, minor);
623	>	minor *= 16;
624		break;
625	<	}
625	>	}
626	>	for (i = 0; i < n; i++) {
627	>	if (major == parts[i].major
628	>	&& minor == parts[i].minor)
629	>	break;
630	>	}
631	>	if (i == n) continue;
632
633	<	diskio_stats_ptr->systime=time(NULL);
634	<	num_diskio++;
633	>	/* We read the number of blocks. Blocks are stored in
634	>	512 bytes */
635	>	diskio_stats[i].read_bytes = rsect * 512;
636	>	diskio_stats[i].write_bytes = wsect * 512;
637	>	diskio_stats[i].systime = now;
638	>	}
639		}
640
641	<	fclose(f);
641	>	num_diskio = n;
642	>	out:
643	>	if (f != NULL) fclose(f);
644
645		#endif
646		*entries=num_diskio;

Diff Legend

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