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.46 by ats, Sat Jan 10 16:12:34 2004 UTC vs.
Revision 1.58 by ats, Sun Apr 4 23:26:23 2004 UTC

#	Line 1 | Line 1
1	<	/*
1	>	/*
2		* i-scream central monitoring system
3		* http://www.i-scream.org
4	<	* Copyright (C) 2000-2003 i-scream
4	>	* Copyright (C) 2000-2004 i-scream
5		*
6	<	* This program is free software; you can redistribute it and/or
7	<	* modify it under the terms of the GNU General Public License
8	<	* as published by the Free Software Foundation; either version 2
9	<	* of the License, or (at your option) any later version.
6	>	* This library is free software; you can redistribute it and/or
7	>	* modify it under the terms of the GNU Lesser General Public
8	>	* License as published by the Free Software Foundation; either
9	>	* version 2.1 of the License, or (at your option) any later version.
10		*
11	<	* This program is distributed in the hope that it will be useful,
11	>	* This library is distributed in the hope that it will be useful,
12		* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	<	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	<	* GNU General Public License for more details.
13	>	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14	>	* Lesser General Public License for more details.
15		*
16	<	* You should have received a copy of the GNU General Public License
17	<	* along with this program; if not, write to the Free Software
18	<	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16	>	* You should have received a copy of the GNU Lesser General Public
17	>	* License along with this library; if not, write to the Free Software
18	>	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
19	>	* 02111-1307 USA
20	>	*
21	>	* $Id$
22		*/
23
24		#ifdef HAVE_CONFIG_H
#	Line 27 | Line 30
30		#include <string.h>
31		#include <time.h>
32		#include "statgrab.h"
33	+	#include "vector.h"
34
35		#ifdef SOLARIS
36		#include <sys/mnttab.h>
#	Line 58 | Line 62
62		#include <sys/ucred.h>
63		#include <sys/mount.h>
64		#endif
65	<	#ifdef FREEBSD
65	>	#if defined(FREEBSD) || defined(DFBSD)
66		#include <sys/dkstat.h>
67		#include <devstat.h>
68		#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \
69		"ufs", "mfs"}
70		#endif
71	<	#ifdef NETBSD
71	>	#if defined(NETBSD) || defined(OPENBSD)
72		#include <sys/param.h>
73		#include <sys/sysctl.h>
74		#include <sys/disk.h>
#	Line 72 | Line 76
76		"ntfs"}
77		#endif
78
79	<	#define START_VAL 1
79	>	static char *copy_string(char **dest, const char *src) {
80	>	char *new;
81
82	<	char *copy_string(char *orig_ptr, const char *newtext){
82	>	new = realloc(*dest, strlen(src) + 1);
83	>	if (new == NULL) {
84	>	return NULL;
85	>	}
86
87	<	/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */
88	<	orig_ptr=realloc(orig_ptr, (1+strlen(newtext)));
89	<	if(orig_ptr==NULL){
90	<	return NULL;
83	<	}
84	<	strcpy(orig_ptr, newtext);
87	>	strcpy(new, src);
88	>	*dest = new;
89	>	return new;
90	>	}
91
92	<	return orig_ptr;
92	>	static void disk_stat_init(disk_stat_t *d) {
93	>	d->device_name = NULL;
94	>	d->fs_type = NULL;
95	>	d->mnt_point = NULL;
96		}
97
98	<
99	<	void init_disk_stat(int start, int end, disk_stat_t *disk_stats){
100	<
101	<	for(disk_stats+=start; start<=end; start++){
93	<	disk_stats->device_name=NULL;
94	<	disk_stats->fs_type=NULL;
95	<	disk_stats->mnt_point=NULL;
96	<
97	<	disk_stats++;
98	<	}
98	>	static void disk_stat_destroy(disk_stat_t *d) {
99	>	free(d->device_name);
100	>	free(d->fs_type);
101	>	free(d->mnt_point);
102		}
103
104		int is_valid_fs_type(const char *type) {
#	Line 111 | Line 114 | int is_valid_fs_type(const char *type) {
114		}
115
116		disk_stat_t *get_disk_stats(int *entries){
117	+	VECTOR_DECLARE_STATIC(disk_stats, disk_stat_t, 10,
118	+	disk_stat_init, disk_stat_destroy);
119
115	–	static disk_stat_t *disk_stats;
116	–	static int watermark=-1;
117	–
120		int valid_type;
121		int num_disks=0;
122		#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN)
#	Line 136 | Line 138 | disk_stat_t *get_disk_stats(int *entries){
138		struct statfs *mp;
139		#endif
140
139	–	if(watermark==-1){
140	–	disk_stats=malloc(START_VAL * sizeof(disk_stat_t));
141	–	if(disk_stats==NULL){
142	–	return NULL;
143	–	}
144	–	watermark=START_VAL;
145	–	init_disk_stat(0, watermark-1, disk_stats);
146	–	}
141		#ifdef ALLBSD
142		nummnt=getmntinfo(&mp , MNT_LOCAL);
143		if (nummnt<=0){
#	Line 178 | Line 172 | disk_stat_t *get_disk_stats(int *entries){
172		#endif
173
174		if(valid_type){
175	<	if(num_disks>watermark-1){
176	<	disk_ptr=disk_stats;
183	<	if((disk_stats=realloc(disk_stats, (watermark*2 * sizeof(disk_stat_t))))==NULL){
184	<	disk_stats=disk_ptr;
185	<	return NULL;
186	<	}
187	<
188	<	watermark=watermark*2;
189	<	init_disk_stat(num_disks, watermark-1, disk_stats);
175	>	if (VECTOR_RESIZE(disk_stats, num_disks + 1) < 0) {
176	>	return NULL;
177		}
191	–
178		disk_ptr=disk_stats+num_disks;
179	+
180		#ifdef ALLBSD
181	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){
181	>	if (copy_string(&disk_ptr->device_name, mp->f_mntfromname) == NULL) {
182		return NULL;
183		}
184	<
198	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->f_fstypename))==NULL){
184	>	if (copy_string(&disk_ptr->fs_type, mp->f_fstypename) == NULL) {
185		return NULL;
186		}
187	<
202	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->f_mntonname))==NULL){
187	>	if (copy_string(&disk_ptr->mnt_point, mp->f_mntonname) == NULL) {
188		return NULL;
189		}
190
#	Line 213 | Line 198 | disk_stat_t *get_disk_stats(int *entries){
198		disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes;
199		#endif
200		#if defined(LINUX) || defined(CYGWIN)
201	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->mnt_fsname))==NULL){
201	>	if (copy_string(&disk_ptr->device_name, mp->mnt_fsname) == NULL) {
202		return NULL;
203		}
204
205	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->mnt_type))==NULL){
205	>	if (copy_string(&disk_ptr->fs_type, mp->mnt_type) == NULL) {
206		return NULL;
207		}
208
209	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->mnt_dir))==NULL){
209	>	if (copy_string(&disk_ptr->mnt_point, mp->mnt_dir) == NULL) {
210		return NULL;
211		}
212		disk_ptr->size = (long long)fs.f_bsize * (long long)fs.f_blocks;
#	Line 235 | Line 220 | disk_stat_t *get_disk_stats(int *entries){
220		#endif
221
222		#ifdef SOLARIS
238	–	/* Memory leak in event of realloc failing */
223		/* Maybe make this char[bigenough] and do strncpy's and put a null in the end?
224		* Downside is its a bit hungry for a lot of mounts, as MNT_MAX_SIZE would prob
225		* be upwards of a k each
226		*/
227	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp.mnt_special))==NULL){
227	>	if (copy_string(&disk_ptr->device_name, mp.mnt_special) == NULL) {
228		return NULL;
229		}
230
231	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp.mnt_fstype))==NULL){
231	>	if (copy_string(&disk_ptr->fs_type, mp.mnt_fstype) == NULL) {
232		return NULL;
233		}
234
235	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp.mnt_mountp))==NULL){
235	>	if (copy_string(&disk_ptr->mnt_point, mp.mnt_mountp) == NULL) {
236		return NULL;
237		}
238
#	Line 278 | Line 262 | disk_stat_t *get_disk_stats(int *entries){
262		return disk_stats;
263
264		}
281	–	void diskio_stat_init(int start, int end, diskio_stat_t *diskio_stats){
265
266	<	for(diskio_stats+=start; start<end; start++){
267	<	diskio_stats->disk_name=NULL;
285	<
286	<	diskio_stats++;
287	<	}
266	>	static void diskio_stat_init(diskio_stat_t *d) {
267	>	d->disk_name = NULL;
268		}
269
270	<	diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){
271	<
292	<	if(diskio_stats==NULL){
293	<
294	<	if((diskio_stats=malloc(needed_entries * sizeof(diskio_stat_t)))==NULL){
295	<	return NULL;
296	<	}
297	<	diskio_stat_init(0, needed_entries, diskio_stats);
298	<	*cur_entries=needed_entries;
299	<
300	<	return diskio_stats;
301	<	}
302	<
303	<
304	<	if(*cur_entries<needed_entries){
305	<	diskio_stats=realloc(diskio_stats, (sizeof(diskio_stat_t)*needed_entries));
306	<	if(diskio_stats==NULL){
307	<	return NULL;
308	<	}
309	<	diskio_stat_init(*cur_entries, needed_entries, diskio_stats);
310	<	*cur_entries=needed_entries;
311	<	}
312	<
313	<	return diskio_stats;
270	>	static void diskio_stat_destroy(diskio_stat_t *d) {
271	>	free(d->disk_name);
272		}
273
274	<	static diskio_stat_t *diskio_stats=NULL;
275	<	static int num_diskio=0;
274	>	VECTOR_DECLARE_STATIC(diskio_stats, diskio_stat_t, 10,
275	>	diskio_stat_init, diskio_stat_destroy);
276
277		#ifdef LINUX
278		typedef struct {
#	Line 324 | Line 282 | typedef struct {
282		#endif
283
284		diskio_stat_t *get_diskio_stats(int *entries){
285	<
328	<	static int sizeof_diskio_stats=0;
285	>	int num_diskio;
286		#ifndef LINUX
287		diskio_stat_t *diskio_stats_ptr;
288		#endif
#	Line 340 | Line 297 | diskio_stat_t *get_diskio_stats(int *entries){
297		char *line_ptr;
298		int major, minor;
299		int has_pp_stats = 1;
300	<	static partition *parts = NULL;
344	<	static int alloc_parts = 0;
300	>	VECTOR_DECLARE_STATIC(parts, partition, 16, NULL, NULL);
301		int i, n;
302		time_t now;
303		const char *format;
304		#endif
305	<	#ifdef FREEBSD
305	>	#if defined(FREEBSD) || defined(DFBSD)
306		static struct statinfo stats;
307		static int stats_init = 0;
308		int counter;
#	Line 357 | Line 313 | diskio_stat_t *get_diskio_stats(int *entries){
313		#endif
314		#ifdef NETBSD
315		struct disk_sysctl *stats;
316	+	#endif
317	+	#ifdef OPENBSD
318	+	int diskcount;
319	+	char *disknames, *name, *bufpp;
320	+	char **dk_name;
321	+	struct diskstats *stats;
322	+	#endif
323	+	#ifdef NETBSD
324	+	#define MIBSIZE 3
325	+	#endif
326	+	#ifdef OPENBSD
327	+	#define MIBSIZE 2
328	+	#endif
329	+	#if defined(NETBSD) || defined(OPENBSD)
330		int num_disks, i;
331	<	int mib[3];
331	>	int mib[MIBSIZE];
332		size_t size;
333		#endif
334
335		num_diskio=0;
336
337	<	#ifdef NETBSD
337	>	#ifdef OPENBSD
338		mib[0] = CTL_HW;
339	+	mib[1] = HW_DISKCOUNT;
340	+
341	+	size = sizeof(diskcount);
342	+	if (sysctl(mib, MIBSIZE, &diskcount, &size, NULL, 0) < 0) {
343	+	return NULL;
344	+	}
345	+
346	+	mib[0] = CTL_HW;
347	+	mib[1] = HW_DISKNAMES;
348	+
349	+	if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
350	+	return NULL;
351	+	}
352	+
353	+	disknames = malloc(size);
354	+	if (disknames == NULL) {
355	+	return NULL;
356	+	}
357	+
358	+	if (sysctl(mib, MIBSIZE, disknames, &size, NULL, 0) < 0) {
359	+	return NULL;
360	+	}
361	+
362	+	dk_name = calloc(diskcount, sizeof(char *));
363	+	bufpp = disknames;
364	+	for (i = 0; i < diskcount && (name = strsep(&bufpp, ",")) != NULL; i++) {
365	+	dk_name[i] = name;
366	+	}
367	+	#endif
368	+
369	+	#if defined(NETBSD) || defined(OPENBSD)
370	+	mib[0] = CTL_HW;
371		mib[1] = HW_DISKSTATS;
372	+	#ifdef NETBSD
373		mib[2] = sizeof(struct disk_sysctl);
374	+	#endif
375
376	<	if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
376	>	if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
377		return NULL;
378		}
379	+
380	+	#ifdef NETBSD
381		num_disks = size / sizeof(struct disk_sysctl);
382	+	#else
383	+	num_disks = size / sizeof(struct diskstats);
384	+	#endif
385
386		stats = malloc(size);
387		if (stats == NULL) {
388		return NULL;
389		}
390
391	<	if (sysctl(mib, 3, stats, &size, NULL, 0) < 0) {
391	>	if (sysctl(mib, MIBSIZE, stats, &size, NULL, 0) < 0) {
392		return NULL;
393		}
394
395		for (i = 0; i < num_disks; i++) {
396		u_int64_t rbytes, wbytes;
397
398	+	#ifdef NETBSD
399		#ifdef HAVE_DK_RBYTES
400		rbytes = stats[i].dk_rbytes;
401		wbytes = stats[i].dk_wbytes;
#	Line 393 | Line 403 | diskio_stat_t *get_diskio_stats(int *entries){
403		/* Before 1.7, NetBSD merged reads and writes. */
404		rbytes = wbytes = stats[i].dk_bytes;
405		#endif
406	+	#else
407	+	rbytes = wbytes = stats[i].ds_bytes;
408	+	#endif
409
410		/* Don't keep stats for disks that have never been used. */
411		if (rbytes == 0 && wbytes == 0) {
412		continue;
413		}
414
415	<	diskio_stats = diskio_stat_malloc(num_diskio + 1,
403	<	&sizeof_diskio_stats,
404	<	diskio_stats);
405	<	if (diskio_stats == NULL) {
415	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
416		return NULL;
417		}
418		diskio_stats_ptr = diskio_stats + num_diskio;
#	Line 412 | Line 422 | diskio_stat_t *get_diskio_stats(int *entries){
422		if (diskio_stats_ptr->disk_name != NULL) {
423		free(diskio_stats_ptr->disk_name);
424		}
425	+	#ifdef NETBSD
426		diskio_stats_ptr->disk_name = strdup(stats[i].dk_name);
427	+	#else
428	+	diskio_stats_ptr->disk_name = strdup(dk_name[i]);
429	+	#endif
430		diskio_stats_ptr->systime = time(NULL);
431
432		num_diskio++;
433		}
434
435		free(stats);
436	+	#ifdef OPENBSD
437	+	free(dk_name);
438	+	free(disknames);
439		#endif
440	+	#endif
441
442	<	#ifdef FREEBSD
442	>	#if defined(FREEBSD) || defined(DFBSD)
443		if (!stats_init) {
444		stats.dinfo=malloc(sizeof(struct devinfo));
445		if(stats.dinfo==NULL) return NULL;
#	Line 456 | Line 474 | diskio_stat_t *get_diskio_stats(int *entries){
474		#else
475		if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue;
476		#endif
477	<	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
477	>
478	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
479		return NULL;
480		}
481		diskio_stats_ptr=diskio_stats+num_diskio;
#	Line 491 | Line 510 | diskio_stat_t *get_diskio_stats(int *entries){
510		if((kstat_read(kc, ksp, &kios))==-1){
511		}
512
513	<	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
513	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
514		kstat_close(kc);
515		return NULL;
516		}
#	Line 522 | Line 541 | diskio_stat_t *get_diskio_stats(int *entries){
541		the same format. */
542
543		f = fopen("/proc/diskstats", "r");
544	<	format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld";
544	>	format = " %d %d %99s %*d %*d %lld %*d %*d %*d %lld";
545		if (f == NULL) {
546		f = fopen("/proc/partitions", "r");
547	<	format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld";
547	>	format = " %d %d %*d %99s %*d %*d %lld %*d %*d %*d %lld";
548		}
549		if (f == NULL) goto out;
550		now = time(NULL);
551
552		while ((line_ptr = f_read_line(f, "")) != NULL) {
553	<	char name[20];
553	>	char name[100];
554		char *s;
555		long long rsect, wsect;
556
#	Line 552 | Line 571 | diskio_stat_t *get_diskio_stats(int *entries){
571		wsect = 0;
572		}
573
574	<	diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats,
575	<	diskio_stats);
557	<	if (diskio_stats == NULL) goto out;
558	<	if (n >= alloc_parts) {
559	<	alloc_parts += 16;
560	<	parts = realloc(parts, alloc_parts * sizeof *parts);
561	<	if (parts == NULL) {
562	<	alloc_parts = 0;
563	<	goto out;
564	<	}
574	>	if (VECTOR_RESIZE(diskio_stats, n + 1) < 0) {
575	>	goto out;
576		}
577	+	if (VECTOR_RESIZE(parts, n + 1) < 0) {
578	+	goto out;
579	+	}
580
581		if (diskio_stats[n].disk_name != NULL)
582		free(diskio_stats[n].disk_name);
#	Line 661 | Line 675 | out:
675		}
676
677		diskio_stat_t *get_diskio_stats_diff(int *entries){
678	<	static diskio_stat_t *diskio_stats_diff=NULL;
679	<	static int sizeof_diskio_stats_diff=0;
680	<	diskio_stat_t *diskio_stats_diff_ptr, *diskio_stats_ptr;
681	<	int disks, x, y;
678	>	VECTOR_DECLARE_STATIC(diff, diskio_stat_t, 1,
679	>	diskio_stat_init, diskio_stat_destroy);
680	>	diskio_stat_t *src = NULL, *dest;
681	>	int i, j, diff_count, new_count;
682
683	<	if(diskio_stats==NULL){
684	<	diskio_stats_ptr=get_diskio_stats(&disks);
685	<	*entries=disks;
672	<	return diskio_stats_ptr;
683	>	if (diskio_stats == NULL) {
684	>	/* No previous stats, so we can't calculate a difference. */
685	>	return get_diskio_stats(entries);
686		}
687
688	<	diskio_stats_diff=diskio_stat_malloc(num_diskio, &sizeof_diskio_stats_diff, diskio_stats_diff);
689	<	if(diskio_stats_diff==NULL){
688	>	/* Resize the results array to match the previous stats. */
689	>	diff_count = VECTOR_SIZE(diskio_stats);
690	>	if (VECTOR_RESIZE(diff, diff_count) < 0) {
691		return NULL;
692		}
693
694	<	diskio_stats_diff_ptr=diskio_stats_diff;
695	<	diskio_stats_ptr=diskio_stats;
694	>	/* Copy the previous stats into the result. */
695	>	for (i = 0; i < diff_count; i++) {
696	>	src = &diskio_stats[i];
697	>	dest = &diff[i];
698
699	<	for(disks=0;disks<num_diskio;disks++){
700	<	if(diskio_stats_diff_ptr->disk_name!=NULL){
685	<	free(diskio_stats_diff_ptr->disk_name);
699	>	if (dest->disk_name != NULL) {
700	>	free(dest->disk_name);
701		}
702	<	diskio_stats_diff_ptr->disk_name=strdup(diskio_stats_ptr->disk_name);
703	<	diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes;
704	<	diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes;
705	<	diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime;
702	>	dest->disk_name = strdup(src->disk_name);
703	>	dest->read_bytes = src->read_bytes;
704	>	dest->write_bytes = src->write_bytes;
705	>	dest->systime = src->systime;
706	>	}
707
708	<	diskio_stats_diff_ptr++;
709	<	diskio_stats_ptr++;
708	>	/* Get a new set of stats. */
709	>	if (get_diskio_stats(&new_count) == NULL) {
710	>	return NULL;
711		}
712
713	<	diskio_stats_ptr=get_diskio_stats(&disks);
714	<	diskio_stats_diff_ptr=diskio_stats_diff;
713	>	/* For each previous stat... */
714	>	for (i = 0; i < diff_count; i++) {
715	>	dest = &diff[i];
716
717	<	for(x=0;x<sizeof_diskio_stats_diff;x++){
718	<
719	<	if((strcmp(diskio_stats_diff_ptr->disk_name, diskio_stats_ptr->disk_name))==0){
720	<	diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes-diskio_stats_diff_ptr->read_bytes;
721	<	diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes-diskio_stats_diff_ptr->write_bytes;
722	<	diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime-diskio_stats_diff_ptr->systime;
723	<	}else{
706	<	diskio_stats_ptr=diskio_stats;
707	<	for(y=0;y<disks;y++){
708	<	if((strcmp(diskio_stats_diff_ptr->disk_name, diskio_stats_ptr->disk_name))==0){
709	<	diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes-diskio_stats_diff_ptr->read_bytes;
710	<	diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes-diskio_stats_diff_ptr->write_bytes;
711	<	diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime-diskio_stats_diff_ptr->systime;
712	<
713	<	break;
714	<	}
715	<
716	<	diskio_stats_ptr++;
717	>	/* ... find the corresponding new stat ... */
718	>	for (j = 0; j < new_count; j++) {
719	>	/* Try the new stat in the same position first,
720	>	since that's most likely to be it. */
721	>	src = &diskio_stats[(i + j) % new_count];
722	>	if (strcmp(src->disk_name, dest->disk_name) == 0) {
723	>	break;
724		}
725		}
726	+	if (j == new_count) {
727	+	/* No match found. */
728	+	continue;
729	+	}
730
731	<	diskio_stats_ptr++;
732	<	diskio_stats_diff_ptr++;
733	<
731	>	/* ... and subtract the previous stat from it to get the
732	>	difference. */
733	>	dest->read_bytes = src->read_bytes - dest->read_bytes;
734	>	dest->write_bytes = src->write_bytes - dest->write_bytes;
735	>	dest->systime = src->systime - dest->systime;
736		}
737	<
738	<	*entries=sizeof_diskio_stats_diff;
739	<	return diskio_stats_diff;
737	>
738	>	*entries = diff_count;
739	>	return diff;
740		}
741	+

Diff Legend

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