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.21 by ats, Tue Sep 9 08:43:33 2003 UTC vs.
Revision 1.22 by pajs, Fri Sep 26 16:33:51 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>
38		#define VALID_FS_TYPES {"ufs", "tmpfs"}
39		#endif
40
#	Line 51 | Line 55
55		#endif
56		#define START_VAL 1
57
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	+
79		char *copy_string(char *orig_ptr, const char *newtext){
80
81		/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */
#	Line 267 | Line 292 | void diskio_stat_init(int start, int end, diskio_stat_
292		}
293		}
294
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	+
419		diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){
420
421		if(diskio_stats==NULL){
#	Line 399 | Line 548 | diskio_stat_t *get_diskio_stats(int *entries){
548
549		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
550
551	<	diskio_stats_ptr->disk_name=strdup(ksp->ks_name);
551	>	diskio_stats_ptr->disk_name=drive_map(ksp->ks_name);
552		diskio_stats_ptr->systime=time(NULL);
553		num_diskio++;
554		}

Diff Legend

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