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.24 by tdb, Tue Oct 7 19:58:37 2003 UTC vs.
Revision 1.38 by ats, Fri Oct 24 17:46:44 2003 UTC

#	Line 31 | Line 31
31		#include <sys/mnttab.h>
32		#include <sys/statvfs.h>
33		#include <kstat.h>
34	–	#include <sys/types.h>
35	–	#include <dirent.h>
36	–	#include <limits.h>
37	–	#include <unistd.h>
34		#define VALID_FS_TYPES {"ufs", "tmpfs"}
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	<	#define START_VAL 1
61	<
62	<	/* Solaris kernel stores the disk names in the old BSD format
63	<	* and we would prefer it in th modern format.
64	<	*/
65	<	#ifdef SOLARIS
62	<	/* Lines from the path_to_inst file */
63	<	typedef struct {
64	<	/* unlikely to get a line that long */
65	<	char line[256];
66	<	}file_line_t;
67	<
68	<	/* Linked list of the mappings from the older bsd-based sunos names
69	<	* to the modern solaris names
70	<	*/
71	<	struct disk_mapping_ent_t{
72	<	char *sunos_name;
73	<	char *solaris_name;
74	<	struct disk_mapping_ent_t *next;
75	<	};
76	<	typedef struct disk_mapping_ent_t disk_mapping_t;
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){
71
72		/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */
#	Line 122 | 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 135 | 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 199 | 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 292 | Line 283 | void diskio_stat_init(int start, int end, diskio_stat_
283		}
284		}
285
295	–	#ifdef SOLARIS
296	–	char *drive_map(char *sunos_name){
297	–	file_line_t *file_lines = NULL;
298	–	file_line_t *f_ptr;
299	–	static disk_mapping_t *disk_mapping = NULL;
300	–	disk_mapping_t *d_ptr;
301	–	int x = 0;
302	–	int y = 256;
303	–	FILE *f;
304	–	DIR *dsk;
305	–	struct dirent *dsk_ent;
306	–	char linkpointer[PATH_MAX];
307	–	char link_path[PATH_MAX];
308	–	char *p, *r, *q;
309	–
310	–	int dev_num;
311	–	char dev_name[51];
312	–
313	–	if(disk_mapping == NULL){
314	–	/* Read in the path_to_inst file into memory */
315	–	file_lines = malloc(sizeof(file_line_t) * y);
316	–	f_ptr = file_lines;
317	–	if(file_lines == NULL) return NULL;
318	–	f = fopen("/etc/path_to_inst", "r");
319	–	if (f == NULL){
320	–	free(file_lines);
321	–	return NULL;
322	–	}
323	–	for(x=0;fgets(f_ptr->line, sizeof(f_ptr->line), f);x++){
324	–	if ((x+1) >= y){
325	–	y = y*2;
326	–	file_lines = realloc(file_lines, sizeof(file_line_t) * y);
327	–	if (file_lines == NULL) return NULL;
328	–	f_ptr=file_lines+x;
329	–	}
330	–	f_ptr++;
331	–	}
332	–	f_ptr = NULL;
333	–	fclose(f);
334	–
335	–	dsk = opendir("/dev/dsk");
336	–	if (dsk == NULL){
337	–	free(file_lines);
338	–	return NULL;
339	–	}
340	–
341	–	while((dsk_ent = readdir(dsk)) != NULL){
342	–	snprintf(link_path, sizeof(link_path), "/dev/dsk/%s", dsk_ent->d_name);
343	–	/* Ignore the non symlinks, e.g. ".." and "." */
344	–	if((readlink(link_path, linkpointer, PATH_MAX)) == -1) continue;
345	–	/* We are only intrested in the string past the ../../devices/ part */
346	–	p = strstr(linkpointer, "devices");
347	–	p+=8;
348	–
349	–	/* We are not intrested in the :a etc slices */
350	–	q = strrchr(p, ':');
351	–	*q = '\0';
352	–
353	–	/* char *p should not contain the info we need to look up in the
354	–	* path_to_inst file.
355	–	*/
356	–
357	–	for(f_ptr = file_lines; f_ptr != NULL; f_ptr++){
358	–	r = strstr(f_ptr->line, p);
359	–	if (r != NULL) break;
360	–	}
361	–
362	–	if(r == NULL){
363	–	free(file_lines);
364	–	closedir(dsk);
365	–	return NULL;
366	–	}
367	–
368	–	/* f_ptr should be pointing to the line of path_to_inst we are intrested in now */
369	–
370	–	sscanf(r, "%*s %d \"%50s", &dev_num, dev_name);
371	–	q = strrchr(dev_name, '"');
372	–	if (q == NULL){
373	–	free(file_lines);
374	–	closedir(dsk);
375	–	return NULL;
376	–	}
377	–	*q = '\0';
378	–
379	–	/* Nasty... Add the number to the end of the string.. This means
380	–	* dev_name now contains the sunos name.. E.g. ssd1
381	–	*/
382	–	snprintf(dev_name, 50, "%s%d", dev_name, dev_num);
383	–	if (disk_mapping == NULL){
384	–	disk_mapping = malloc(sizeof(disk_mapping_t));
385	–	d_ptr = disk_mapping;
386	–	}else{
387	–	d_ptr->next = malloc(sizeof(disk_mapping_t));
388	–	d_ptr = d_ptr->next;
389	–	}
390	–
391	–	if (d_ptr == NULL){
392	–	free(file_lines);
393	–	closedir(dsk);
394	–	return NULL;
395	–	}
396	–
397	–	if( ((d_ptr->sunos_name = strdup(dev_name)) == NULL) ||
398	–	((d_ptr->solaris_name = strdup(dsk_ent->d_name))==NULL) ){
399	–	free(file_lines);
400	–	closedir(dsk);
401	–	return NULL;
402	–	}
403	–	}
404	–	free(file_lines);
405	–	closedir(dsk);
406	–	}
407	–
408	–	for(d_ptr = disk_mapping; d_ptr !=NULL; d_ptr=d_ptr->next){
409	–	if(!strcmp(sunos_name, d_ptr->sunos_name)){
410	–	return (strdup(d_ptr->solaris_name));
411	–	}
412	–	}
413	–
414	–	/* If we really fail to find it.. Return the original name back */
415	–	return strdup(sunos_name);
416	–	}
417	–
418	–	#endif
419	–
286		diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){
287
288		if(diskio_stats==NULL){
#	Line 456 | Line 322 | typedef struct {
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 467 | Line 335 | diskio_stat_t *get_diskio_stats(int *entries){
335		FILE *f;
336		char *line_ptr;
337		int major, minor;
470	–	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		static struct statinfo stats;
#	Line 483 | Line 351 | diskio_stat_t *get_diskio_stats(int *entries){
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		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 505 | 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 548 | Line 499 | diskio_stat_t *get_diskio_stats(int *entries){
499
500		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
501
502	<	diskio_stats_ptr->disk_name=drive_map(ksp->ks_name);
502	>	diskio_stats_ptr->disk_name=strdup(ksp->ks_name);
503		diskio_stats_ptr->systime=time(NULL);
504		num_diskio++;
505		}
#	Line 562 | Line 513 | diskio_stat_t *get_diskio_stats(int *entries){
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. */
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/partitions", "r");
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 (f == NULL) goto out;
527		now = time(NULL);
528
#	Line 573 | Line 531 | diskio_stat_t *get_diskio_stats(int *entries){
531		char *s;
532		long long rsect, wsect;
533
534	<	int nr = sscanf(line_ptr,
577	<	" %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld",
534	>	int nr = sscanf(line_ptr, format,
535		&major, &minor, name, &rsect, &wsect);
536		if (nr < 3) continue;
580	–	if (nr < 5) {
581	–	has_pp_stats = 0;
582	–	rsect = 0;
583	–	wsect = 0;
584	–	}
537
538		/* Skip device names ending in numbers, since they're
539		partitions. */
#	Line 589 | Line 541 | diskio_stat_t *get_diskio_stats(int *entries){
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		diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats,
552		diskio_stats);

Diff Legend

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