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.9 by pajs, Tue Mar 4 12:55:14 2003 UTC vs.
Revision 1.12 by pajs, Wed Mar 5 17:11:22 2003 UTC

#	Line 38 | Line 38
38		#include <stdio.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"}
43		#endif
44
#	Line 205 | Line 206 | disk_stat_t *get_disk_stats(int *entries){
206		return disk_stats;
207
208		}
208	–	#ifdef SOLARIS
209		void diskio_stat_init(int start, int end, diskio_stat_t *diskio_stats){
210
211		for(diskio_stats+=start; start<end; start++){
#	Line 249 | Line 249 | diskio_stat_t *get_diskio_stats(int *entries){
249		static int sizeof_diskio_stats=0;
250		diskio_stat_t *diskio_stats_ptr;
251
252	+	#ifdef SOLARIS
253		kstat_ctl_t *kc;
254		kstat_t *ksp;
255		kstat_io_t kios;
256	+	#endif
257	+	#ifdef LINUX
258	+	FILE *f;
259	+	char *line_ptr;
260	+	int major, minor;
261	+	char dev_letter;
262	+	#endif
263	+	num_diskio=0;
264
265	+	#ifdef SOLARIS
266		if ((kc = kstat_open()) == NULL) {
267		return NULL;
268		}
269
260	–	num_diskio=0;
261	–
270		for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
271		if (!strcmp(ksp->ks_class, "disk")) {
272
#	Line 286 | Line 294 | diskio_stat_t *get_diskio_stats(int *entries){
294		}
295
296		kstat_close(kc);
297	+	#endif
298
299	+	#ifdef LINUX
300	+	f=fopen("/proc/stat", "r");
301	+	if(f==NULL){
302	+	*entries=0;
303	+	fclose(f);
304	+	return NULL;
305	+	}
306	+	if((line_ptr=f_read_line(f, "disk_io:"))==NULL){
307	+	*entries=0;
308	+	fclose(f);
309	+	return NULL;
310	+	}
311	+	while((line_ptr=strchr(line_ptr, ' '))!=NULL){
312	+	line_ptr++;
313	+	if(*line_ptr=='\0'){
314	+	break;
315	+	}
316	+	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
317	+	fclose(f);
318	+	*entries=0;
319	+	return NULL;
320	+	}
321	+	diskio_stats_ptr=diskio_stats+num_diskio;
322	+
323	+
324	+	if((sscanf(line_ptr, "(%d,%d):(%*d, %*d, %lld, %*d, %lld)", \
325	+	&major, \
326	+	&minor, \
327	+	&diskio_stats_ptr->read_bytes, \
328	+	&diskio_stats_ptr->write_bytes))!=4) {
329	+	continue;
330	+	}
331	+
332	+	/* We read the number of blocks. Blocks are stored in 512 bytes */
333	+	diskio_stats_ptr->read_bytes=diskio_stats_ptr->read_bytes*512;
334	+	diskio_stats_ptr->write_bytes=diskio_stats_ptr->write_bytes*512;
335	+
336	+	if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
337	+
338	+	switch(major){
339	+	case 2:
340	+	if(minor==0){
341	+	diskio_stats_ptr->disk_name=strdup("fd0");
342	+	}
343	+	break;
344	+
345	+	case 3:
346	+	if(minor==0){
347	+	diskio_stats_ptr->disk_name=strdup("hda");
348	+	}else{
349	+	diskio_stats_ptr->disk_name=strdup("hdb");
350	+	}
351	+	break;
352	+
353	+	case 22:
354	+	if(minor==0){
355	+	diskio_stats_ptr->disk_name=strdup("hdc");
356	+	}else{
357	+	diskio_stats_ptr->disk_name=strdup("hdd");
358	+	}
359	+	break;
360	+	case 8:
361	+	dev_letter='a'+(minor/16);
362	+	diskio_stats_ptr->disk_name=malloc(4);
363	+	snprintf(diskio_stats_ptr->disk_name, 4, "sd%c", dev_letter);
364	+	break;
365	+	default:
366	+	/* I have no idea what it is then :) */
367	+	diskio_stats_ptr->disk_name=malloc(16);
368	+	snprintf(diskio_stats_ptr->disk_name, 16, "%d %d", major, minor);
369	+	break;
370	+	}
371	+
372	+	num_diskio++;
373	+	}
374	+
375	+	#endif
376		*entries=num_diskio;
377
378		return diskio_stats;
#	Line 357 | Line 443 | diskio_stat_t *get_diskio_stats_diff(int *entries){
443		*entries=sizeof_diskio_stats_diff;
444		return diskio_stats_diff;
445		}
360	–	#endif

Diff Legend

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