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.50 by ats, Wed Jan 21 23:46:54 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 661 | Line 664 | out:
664		}
665
666		diskio_stat_t *get_diskio_stats_diff(int *entries){
667	<	static diskio_stat_t *diskio_stats_diff=NULL;
668	<	static int sizeof_diskio_stats_diff=0;
669	<	diskio_stat_t *diskio_stats_diff_ptr, *diskio_stats_ptr;
670	<	int disks, x, y;
667	>	static diskio_stat_t *diff = NULL;
668	>	static int diff_count = 0;
669	>	diskio_stat_t *src, *dest;
670	>	int i, j, new_count;
671
672	<	if(diskio_stats==NULL){
673	<	diskio_stats_ptr=get_diskio_stats(&disks);
674	<	*entries=disks;
672	<	return diskio_stats_ptr;
672	>	if (diskio_stats == NULL) {
673	>	/* No previous stats, so we can't calculate a difference. */
674	>	return get_diskio_stats(entries);
675		}
676
677	<	diskio_stats_diff=diskio_stat_malloc(num_diskio, &sizeof_diskio_stats_diff, diskio_stats_diff);
678	<	if(diskio_stats_diff==NULL){
677	>	/* Resize the results array to match the previous stats. */
678	>	diff = diskio_stat_malloc(num_diskio, &diff_count, diff);
679	>	if (diff == NULL) {
680		return NULL;
681		}
682
683	<	diskio_stats_diff_ptr=diskio_stats_diff;
684	<	diskio_stats_ptr=diskio_stats;
683	>	/* Copy the previous stats into the result. */
684	>	for (i = 0; i < diff_count; i++) {
685	>	src = &diskio_stats[i];
686	>	dest = &diff[i];
687
688	<	for(disks=0;disks<num_diskio;disks++){
689	<	if(diskio_stats_diff_ptr->disk_name!=NULL){
685	<	free(diskio_stats_diff_ptr->disk_name);
688	>	if (dest->disk_name != NULL) {
689	>	free(dest->disk_name);
690		}
691	<	diskio_stats_diff_ptr->disk_name=strdup(diskio_stats_ptr->disk_name);
692	<	diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes;
693	<	diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes;
694	<	diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime;
691	>	dest->disk_name = strdup(src->disk_name);
692	>	dest->read_bytes = src->read_bytes;
693	>	dest->write_bytes = src->write_bytes;
694	>	dest->systime = src->systime;
695	>	}
696
697	<	diskio_stats_diff_ptr++;
698	<	diskio_stats_ptr++;
697	>	/* Get a new set of stats. */
698	>	if (get_diskio_stats(&new_count) == NULL) {
699	>	return NULL;
700		}
701
702	<	diskio_stats_ptr=get_diskio_stats(&disks);
703	<	diskio_stats_diff_ptr=diskio_stats_diff;
702	>	/* For each previous stat... */
703	>	for (i = 0; i < diff_count; i++) {
704	>	dest = &diff[i];
705
706	<	for(x=0;x<sizeof_diskio_stats_diff;x++){
707	<
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	<	}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++;
706	>	/* ... find the corresponding new stat ... */
707	>	for (j = 0; j < new_count; j++) {
708	>	/* Try the new stat in the same position first,
709	>	since that's most likely to be it. */
710	>	src = &diskio_stats[(i + j) % new_count];
711	>	if (strcmp(src->disk_name, dest->disk_name) == 0) {
712	>	break;
713		}
714		}
715	+	if (j == new_count) {
716	+	/* No match found. */
717	+	continue;
718	+	}
719
720	<	diskio_stats_ptr++;
721	<	diskio_stats_diff_ptr++;
722	<
720	>	/* ... and subtract the previous stat from it to get the
721	>	difference. */
722	>	dest->read_bytes = src->read_bytes - dest->read_bytes;
723	>	dest->write_bytes = src->write_bytes - dest->write_bytes;
724	>	dest->systime = src->systime - dest->systime;
725		}
726	<
727	<	*entries=sizeof_diskio_stats_diff;
728	<	return diskio_stats_diff;
726	>
727	>	*entries = diff_count;
728	>	return diff;
729		}
730	+

Diff Legend

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