ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/network_stats.c

Comparing projects/libstatgrab/src/libstatgrab/network_stats.c (file contents):
Revision 1.20 by ats, Wed Nov 12 01:36:19 2003 UTC vs.
Revision 1.24 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 251 | Line 254 | long long transfer_diff(long long new, long long old){
254
255		}
256
257	<	network_stat_t *get_network_stats_diff(int *entries){
258	<	static network_stat_t *network_stats_diff=NULL;
259	<	static int sizeof_net_stats_diff=0;
260	<	network_stat_t *network_stats_ptr, *network_stats_diff_ptr;
261	<	int ifaces, x, y;
257	>	network_stat_t *get_network_stats_diff(int *entries) {
258	>	static network_stat_t *diff = NULL;
259	>	static int diff_count = 0;
260	>	network_stat_t *src, *dest;
261	>	int i, j, new_count;
262
263	<	if(network_stats==NULL){
264	<	network_stats_ptr=get_network_stats(&ifaces);
265	<	*entries=ifaces;
263	<	return network_stats_ptr;
263	>	if (network_stats == NULL) {
264	>	/* No previous stats, so we can't calculate a difference. */
265	>	return get_network_stats(entries);
266		}
267
268	<	network_stats_diff=network_stat_malloc(interfaces, &sizeof_net_stats_diff, network_stats_diff);
269	<	if(network_stats_diff==NULL){
268	>	/* Resize the results array to match the previous stats. */
269	>	diff = network_stat_malloc(interfaces, &diff_count, diff);
270	>	if (diff == NULL) {
271		return NULL;
272		}
273
274	<	network_stats_ptr=network_stats;
275	<	network_stats_diff_ptr=network_stats_diff;
274	>	/* Copy the previous stats into the result. */
275	>	for (i = 0; i < diff_count; i++) {
276	>	src = &network_stats[i];
277	>	dest = &diff[i];
278
279	<	for(ifaces=0;ifaces<interfaces;ifaces++){
280	<	if(network_stats_diff_ptr->interface_name!=NULL){
276	<	free(network_stats_diff_ptr->interface_name);
279	>	if (dest->interface_name != NULL) {
280	>	free(dest->interface_name);
281		}
282	<	network_stats_diff_ptr->interface_name=strdup(network_stats_ptr->interface_name);
283	<	network_stats_diff_ptr->tx=network_stats_ptr->tx;
284	<	network_stats_diff_ptr->rx=network_stats_ptr->rx;
285	<	network_stats_diff_ptr->systime=network_stats->systime;
282	>	dest->interface_name = strdup(src->interface_name);
283	>	dest->rx = src->rx;
284	>	dest->tx = src->tx;
285	>	dest->systime = src->systime;
286	>	}
287
288	<	network_stats_ptr++;
289	<	network_stats_diff_ptr++;
288	>	/* Get a new set of stats. */
289	>	if (get_network_stats(&new_count) == NULL) {
290	>	return NULL;
291		}
286	–	network_stats_ptr=get_network_stats(&ifaces);
287	–	network_stats_diff_ptr=network_stats_diff;
292
293	<	for(x=0;x<sizeof_net_stats_diff;x++){
293	>	/* For each previous stat... */
294	>	for (i = 0; i < diff_count; i++) {
295	>	dest = &diff[i];
296
297	<	if((strcmp(network_stats_diff_ptr->interface_name, network_stats_ptr->interface_name))==0){
298	<	network_stats_diff_ptr->tx = transfer_diff(network_stats_ptr->tx, network_stats_diff_ptr->tx);
299	<	network_stats_diff_ptr->rx = transfer_diff(network_stats_ptr->rx, network_stats_diff_ptr->rx);
300	<	network_stats_diff_ptr->systime = network_stats_ptr->systime - network_stats_diff_ptr->systime;
301	<	}else{
302	<
303	<	network_stats_ptr=network_stats;
304	<	for(y=0;y<ifaces;y++){
299	<	if((strcmp(network_stats_diff_ptr->interface_name, network_stats_ptr->interface_name))==0){
300	<	network_stats_diff_ptr->tx = transfer_diff(network_stats_ptr->tx, network_stats_diff_ptr->tx);
301	<	network_stats_diff_ptr->rx = transfer_diff(network_stats_ptr->rx, network_stats_diff_ptr->rx);
302	<	network_stats_diff_ptr->systime = network_stats_ptr->systime - network_stats_diff_ptr->systime;
303	<	break;
304	<	}
305	<
306	<	network_stats_ptr++;
307	<	}
297	>	/* ... find the corresponding new stat ... */
298	>	for (j = 0; j < new_count; j++) {
299	>	/* Try the new stat in the same position first,
300	>	since that's most likely to be it. */
301	>	src = &network_stats[(i + j) % new_count];
302	>	if (strcmp(src->interface_name, dest->interface_name) == 0) {
303	>	break;
304	>	}
305		}
306	+	if (j == new_count) {
307	+	/* No match found. */
308	+	continue;
309	+	}
310
311	<	network_stats_ptr++;
312	<	network_stats_diff_ptr++;
311	>	/* ... and subtract the previous stat from it to get the
312	>	difference. */
313	>	dest->rx = transfer_diff(src->rx, dest->rx);
314	>	dest->tx = transfer_diff(src->tx, dest->tx);
315	>	dest->systime = src->systime - dest->systime;
316		}
317
318	<	*entries=sizeof_net_stats_diff;
319	<	return network_stats_diff;
320	<	}
317	<
318	>	*entries = diff_count;
319	>	return diff;
320	>	}

Diff Legend

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