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.22 by pajs, Fri Sep 26 16:33:51 2003 UTC vs.
Revision 1.30 by ats, Sun Oct 19 00:10:30 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"
#	Line 55 | Line 52
52		#endif
53		#define START_VAL 1
54
58	–	/* Solaris kernel stores the disk names in the old BSD format
59	–	* and we would prefer it in th modern format.
60	–	*/
61	–	#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;
77	–	#endif
78	–
55		char *copy_string(char *orig_ptr, const char *newtext){
56
57		/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */
#	Line 292 | Line 268 | void diskio_stat_init(int start, int end, diskio_stat_
268		}
269		}
270
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	–	}
329	–	f_ptr++;
330	–	}
331	–	f_ptr = NULL;
332	–	fclose(f);
333	–
334	–	dsk = opendir("/dev/dsk");
335	–	if (dsk == NULL){
336	–	free(file_lines);
337	–	return NULL;
338	–	}
339	–
340	–	while((dsk_ent = readdir(dsk)) != NULL){
341	–	snprintf(link_path, sizeof(link_path), "/dev/dsk/%s", dsk_ent->d_name);
342	–	/* Ignore the non symlinks, e.g. ".." and "." */
343	–	if((readlink(link_path, linkpointer, PATH_MAX)) == -1) continue;
344	–	/* We are only intrested in the string past the ../../devices/ part */
345	–	p = strstr(linkpointer, "devices");
346	–	p+=8;
347	–
348	–	/* We are not intrested in the :a etc slices */
349	–	q = strrchr(p, ':');
350	–	*q = '\0';
351	–
352	–	/* char *p should not contain the info we need to look up in the
353	–	* path_to_inst file.
354	–	*/
355	–
356	–	for(f_ptr = file_lines; f_ptr != NULL; f_ptr++){
357	–	r = strstr(f_ptr->line, p);
358	–	if (r != NULL) break;
359	–	}
360	–
361	–	if(r == NULL){
362	–	free(file_lines);
363	–	closedir(dsk);
364	–	return NULL;
365	–	}
366	–
367	–	/* f_ptr should be pointing to the line of path_to_inst we are intrested in now */
368	–
369	–	sscanf(r, "%*s %d \"%50s", &dev_num, dev_name);
370	–	q = strrchr(dev_name, '"');
371	–	if (q == NULL){
372	–	free(file_lines);
373	–	closedir(dsk);
374	–	return NULL;
375	–	}
376	–	*q = '\0';
377	–
378	–	/* Nasty... Add the number to the end of the string.. This means
379	–	* dev_name now contains the sunos name.. E.g. ssd1
380	–	*/
381	–	snprintf(dev_name, 50, "%s%d", dev_name, dev_num);
382	–	if (disk_mapping == NULL){
383	–	disk_mapping = malloc(sizeof(disk_mapping_t));
384	–	d_ptr = disk_mapping;
385	–	}else{
386	–	d_ptr->next = malloc(sizeof(disk_mapping_t));
387	–	d_ptr = d_ptr->next;
388	–	}
389	–
390	–	if (d_ptr == NULL){
391	–	free(file_lines);
392	–	closedir(dsk);
393	–	return NULL;
394	–	}
395	–
396	–	if( ((d_ptr->sunos_name = strdup(dev_name)) == NULL) ||
397	–	((d_ptr->solaris_name = strdup(dsk_ent->d_name))==NULL) ){
398	–	free(file_lines);
399	–	closedir(dsk);
400	–	return NULL;
401	–	}
402	–	}
403	–	free(file_lines);
404	–	closedir(dsk);
405	–	}
406	–
407	–	for(d_ptr = disk_mapping; d_ptr !=NULL; d_ptr=d_ptr->next){
408	–	if(!strcmp(sunos_name, d_ptr->sunos_name)){
409	–	return (strdup(d_ptr->solaris_name));
410	–	}
411	–	}
412	–
413	–	/* If we really fail to find it.. Return the original name back */
414	–	return strdup(sunos_name);
415	–	}
416	–
417	–	#endif
418	–
271		diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){
272
273		if(diskio_stats==NULL){
#	Line 487 | Line 339 | diskio_stat_t *get_diskio_stats(int *entries){
339		#ifdef FREEBSD
340		if (!stats_init) {
341		stats.dinfo=malloc(sizeof(struct devinfo));
342	+	bzero(stats.dinfo, sizeof(struct devinfo));
343		if(stats.dinfo==NULL) return NULL;
344		stats_init = 1;
345		}
346	+	#ifdef FREEBSD5
347	+	if ((devstat_getdevs(NULL, &stats)) < 0) return NULL;
348	+	/* Not aware of a get all devices, so i said 999. If we ever
349	+	* find a machine with more than 999 disks, then i'll change
350	+	* this number :)
351	+	*/
352	+	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;
353	+	#else
354		if ((getdevs(&stats)) < 0) return NULL;
355		/* Not aware of a get all devices, so i said 999. If we ever
356		* find a machine with more than 999 disks, then i'll change
357		* this number :)
358		*/
359		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;
360	+	#endif
361
362		for(counter=0;counter<stats.dinfo->numdevs;counter++){
363		dev_ptr=&stats.dinfo->devices[dev_sel[counter].position];
#	Line 504 | Line 366 | diskio_stat_t *get_diskio_stats(int *entries){
366		* devices.. like mem, proc.. and also doesn't report floppy
367		* drives etc unless they are doing stuff :)
368		*/
369	+	#ifdef FREEBSD5
370	+	if((dev_ptr->bytes[DEVSTAT_READ]==0) && (dev_ptr->bytes[DEVSTAT_WRITE]==0)) continue;
371	+	#else
372		if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue;
373	+	#endif
374		if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
375		return NULL;
376		}
377		diskio_stats_ptr=diskio_stats+num_diskio;
378	<
378	>
379	>	#ifdef FREEBSD5
380	>	diskio_stats_ptr->read_bytes=dev_ptr->bytes[DEVSTAT_READ];
381	>	diskio_stats_ptr->write_bytes=dev_ptr->bytes[DEVSTAT_WRITE];
382	>	#else
383		diskio_stats_ptr->read_bytes=dev_ptr->bytes_read;
384		diskio_stats_ptr->write_bytes=dev_ptr->bytes_written;
385	+	#endif
386		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
387		asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number);
388		diskio_stats_ptr->systime=time(NULL);
#	Line 519 | Line 390 | diskio_stat_t *get_diskio_stats(int *entries){
390		num_diskio++;
391		}
392		free(dev_sel);
522	–	free(stats.dinfo);
393
394		#endif
395		#ifdef SOLARIS
#	Line 548 | Line 418 | diskio_stat_t *get_diskio_stats(int *entries){
418
419		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
420
421	<	diskio_stats_ptr->disk_name=drive_map(ksp->ks_name);
421	>	diskio_stats_ptr->disk_name=strdup(ksp->ks_name);
422		diskio_stats_ptr->systime=time(NULL);
423		num_diskio++;
424		}

Diff Legend

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