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.25 by tdb, Tue Oct 7 20:32:50 2003 UTC vs.
Revision 1.27 by pajs, Thu Oct 9 14:59:52 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
#	Line 55 | Line 51
51		#endif
52		#define START_VAL 1
53
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	–
54		char *copy_string(char *orig_ptr, const char *newtext){
55
56		/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */
#	Line 292 | Line 267 | void diskio_stat_init(int start, int end, diskio_stat_
267		}
268		}
269
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	–
270		diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){
271
272		if(diskio_stats==NULL){
#	Line 497 | Line 347 | diskio_stat_t *get_diskio_stats(int *entries){
347		* find a machine with more than 999 disks, then i'll change
348		* this number :)
349		*/
350	+	#ifdef FREEBSD5
351	+	if ((devstat_getdevs(NULL, &stats)) < 0) return NULL;
352	+	#else
353		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;
354	+	#endif
355
356		for(counter=0;counter<stats.dinfo->numdevs;counter++){
357		dev_ptr=&stats.dinfo->devices[dev_sel[counter].position];
#	Line 506 | Line 360 | diskio_stat_t *get_diskio_stats(int *entries){
360		* devices.. like mem, proc.. and also doesn't report floppy
361		* drives etc unless they are doing stuff :)
362		*/
363	+	#ifdef FREEBSD5
364	+	if((dev_ptr->bytes[DEVSTAT_READ]==0) && (dev_ptr->bytes[DEVSTAT_WRITE]==0)) continue;
365	+	#else
366		if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue;
367	+	#endif
368		if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
369		return NULL;
370		}
371		diskio_stats_ptr=diskio_stats+num_diskio;
372	<
372	>
373	>	#ifdef FREEBSD5
374	>	diskio_stats_ptr->read_bytes=dev_ptr->bytes[DEVSTAT_READ];
375	>	diskio_stats_ptr->write_bytes=dev_ptr->bytes[DEVSTAT_WRITE];
376	>	#else
377		diskio_stats_ptr->read_bytes=dev_ptr->bytes_read;
378		diskio_stats_ptr->write_bytes=dev_ptr->bytes_written;
379	+	#endif
380		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
381		asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number);
382		diskio_stats_ptr->systime=time(NULL);
#	Line 549 | Line 412 | diskio_stat_t *get_diskio_stats(int *entries){
412
413		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
414
415	<	diskio_stats_ptr->disk_name=drive_map(ksp->ks_name);
415	>	diskio_stats_ptr->disk_name=strdup(ksp->ks_name);
416		diskio_stats_ptr->systime=time(NULL);
417		num_diskio++;
418		}

Diff Legend

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