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.54 by tdb, Mon Mar 8 13:48:00 2004 UTC vs.
Revision 1.60 by ats, Mon Apr 5 00:16:24 2004 UTC

#	Line 28 | Line 28
28		#include <stdlib.h>
29		#include <string.h>
30		#include "statgrab.h"
31	+	#include "vector.h"
32	+	#include "tools.h"
33		#include <time.h>
34		#ifdef SOLARIS
35		#include <kstat.h>
#	Line 47 | Line 49
49		#include <sys/socket.h>
50		#include <net/if.h>
51		#include <ctype.h>
50	–	#include "tools.h"
52		/* Stuff which could be defined by defining KERNEL, but
53		* that would be a bad idea, so we'll just declare it here
54		*/
#	Line 66 | Line 67 | typedef __uint64_t u64;
67		#include <net/if.h>
68		#include <net/if_media.h>
69		#include <sys/ioctl.h>
70	+	#include <unistd.h>
71		#endif
72
73	<	static network_stat_t *network_stats=NULL;
74	<	static int interfaces=0;
75	<
76	<	void network_stat_init(int start, int end, network_stat_t *net_stats){
77	<
78	<	for(net_stats+=start; start<end; start++){
79	<	net_stats->interface_name=NULL;
80	<	net_stats->tx=0;
81	<	net_stats->rx=0;
80	<	net_stats->ipackets=0;
81	<	net_stats->opackets=0;
82	<	net_stats->ierrors=0;
83	<	net_stats->oerrors=0;
84	<	net_stats->collisions=0;
85	<	net_stats++;
86	<	}
73	>	static void network_stat_init(network_stat_t *s) {
74	>	s->interface_name = NULL;
75	>	s->tx = 0;
76	>	s->rx = 0;
77	>	s->ipackets = 0;
78	>	s->opackets = 0;
79	>	s->ierrors = 0;
80	>	s->oerrors = 0;
81	>	s->collisions = 0;
82		}
83
84	<	network_stat_t *network_stat_malloc(int needed_entries, int *cur_entries, network_stat_t *net_stats){
85	<
91	<	if(net_stats==NULL){
92	<
93	<	if((net_stats=malloc(needed_entries * sizeof(network_stat_t)))==NULL){
94	<	return NULL;
95	<	}
96	<	network_stat_init(0, needed_entries, net_stats);
97	<	*cur_entries=needed_entries;
98	<
99	<	return net_stats;
100	<	}
101	<
102	<
103	<	if(*cur_entries<needed_entries){
104	<	net_stats=realloc(net_stats, (sizeof(network_stat_t)*needed_entries));
105	<	if(net_stats==NULL){
106	<	return NULL;
107	<	}
108	<	network_stat_init(*cur_entries, needed_entries, net_stats);
109	<	*cur_entries=needed_entries;
110	<	}
111	<
112	<	return net_stats;
84	>	static void network_stat_destroy(network_stat_t *s) {
85	>	free(s->interface_name);
86		}
87
88	+	VECTOR_DECLARE_STATIC(network_stats, network_stat_t, 5,
89	+	network_stat_init, network_stat_destroy);
90
91		network_stat_t *get_network_stats(int *entries){
92	<
118	<	static int sizeof_network_stats=0;
92	>	int interfaces;
93		network_stat_t *network_stat_ptr;
94
95		#ifdef SOLARIS
#	Line 145 | Line 119 | network_stat_t *get_network_stats(int *entries){
119
120		for(net_ptr=net;net_ptr!=NULL;net_ptr=net_ptr->ifa_next){
121		if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
122	<	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
123	<	if(network_stats==NULL){
122	>
123	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
124		return NULL;
125		}
126		network_stat_ptr=network_stats+interfaces;
127
128	<	if(network_stat_ptr->interface_name!=NULL) free(network_stat_ptr->interface_name);
129	<	network_stat_ptr->interface_name=strdup(net_ptr->ifa_name);
130	<	if(network_stat_ptr->interface_name==NULL) return NULL;
128	>	if (update_string(&network_stat_ptr->interface_name,
129	>	net_ptr->ifa_name) == NULL) {
130	>	return NULL;
131	>	}
132		net_data=(struct if_data *)net_ptr->ifa_data;
133		network_stat_ptr->rx=net_data->ifi_ibytes;
134		network_stat_ptr->tx=net_data->ifi_obytes;
#	Line 199 | Line 174 | network_stat_t *get_network_stats(int *entries){
174		* have the rbytes/obytes values; for instance,
175		* the loopback devices have this behaviour
176		* (although they do track packets in/out). */
177	+	/* FIXME: Show packet counts when byte counts
178	+	* not available. */
179		continue;
180		}
181
182		/* Create new network_stats */
183	<	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
207	<	if(network_stats==NULL){
183	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
184		return NULL;
185		}
186		network_stat_ptr=network_stats+interfaces;
#	Line 249 | Line 225 | network_stat_t *get_network_stats(int *entries){
225		network_stat_ptr->collisions=knp->value.ui32;
226
227		/* Read interface name */
228	<	if(network_stat_ptr->interface_name!=NULL){
229	<	free(network_stat_ptr->interface_name);
228	>	if (update_string(&network_stat_ptr->interface_name,
229	>	ksp->ks_name) == NULL) {
230	>	return NULL;
231		}
255	–	network_stat_ptr->interface_name=strdup(ksp->ks_name);
232
233		/* Store systime */
234		network_stat_ptr->systime=time(NULL);
#	Line 283 | Line 259 | network_stat_t *get_network_stats(int *entries){
259		if((regexec(&regex, line, 9, line_match, 0))!=0){
260		continue;
261		}
262	<	network_stats=network_stat_malloc((interfaces+1), &sizeof_network_stats, network_stats);
263	<	if(network_stats==NULL){
264	<	return NULL;
262	>
263	>	if (VECTOR_RESIZE(network_stats, interfaces + 1) < 0) {
264	>	return NULL;
265		}
266		network_stat_ptr=network_stats+interfaces;
267
#	Line 320 | Line 296 | network_stat_t *get_network_stats(int *entries){
296		}
297
298		long long transfer_diff(long long new, long long old){
299	<	#if defined(SOL7) || defined(LINUX) || defined(FREEBSD) || defined(DFBSD)
300	<	#define MAXVAL 0xffffffffLL
299	>	#if defined(SOL7) || defined(LINUX) || defined(FREEBSD) || defined(DFBSD) || defined(OPENBSD)
300	>	/* 32-bit quantities, so we must explicitly deal with wraparound. */
301	>	#define MAXVAL 0x100000000LL
302	>	if (new >= old) {
303	>	return new - old;
304	>	} else {
305	>	return MAXVAL + new - old;
306	>	}
307		#else
308	<	#define MAXVAL 0xffffffffffffffffLL
308	>	/* 64-bit quantities, so plain subtraction works. */
309	>	return new - old;
310		#endif
328	–	long long result;
329	–	if(new>=old){
330	–	result = (new-old);
331	–	}else{
332	–	result = (MAXVAL+(new-old));
333	–	}
334	–
335	–	return result;
336	–
311		}
312
313		network_stat_t *get_network_stats_diff(int *entries) {
314	<	static network_stat_t *diff = NULL;
315	<	static int diff_count = 0;
316	<	network_stat_t *src, *dest;
317	<	int i, j, new_count;
314	>	VECTOR_DECLARE_STATIC(diff, network_stat_t, 1,
315	>	network_stat_init, network_stat_destroy);
316	>	network_stat_t *src = NULL, *dest;
317	>	int i, j, diff_count, new_count;
318
319		if (network_stats == NULL) {
320		/* No previous stats, so we can't calculate a difference. */
#	Line 348 | Line 322 | network_stat_t *get_network_stats_diff(int *entries) {
322		}
323
324		/* Resize the results array to match the previous stats. */
325	<	diff = network_stat_malloc(interfaces, &diff_count, diff);
326	<	if (diff == NULL) {
325	>	diff_count = VECTOR_SIZE(network_stats);
326	>	if (VECTOR_RESIZE(diff, diff_count) < 0) {
327		return NULL;
328		}
329
#	Line 358 | Line 332 | network_stat_t *get_network_stats_diff(int *entries) {
332		src = &network_stats[i];
333		dest = &diff[i];
334
335	<	if (dest->interface_name != NULL) {
336	<	free(dest->interface_name);
335	>	if (update_string(&dest->interface_name,
336	>	src->interface_name) == NULL) {
337	>	return NULL;
338		}
364	–	dest->interface_name = strdup(src->interface_name);
339		dest->rx = src->rx;
340		dest->tx = src->tx;
341		dest->ipackets = src->ipackets;
#	Line 410 | Line 384 | network_stat_t *get_network_stats_diff(int *entries) {
384		*entries = diff_count;
385		return diff;
386		}
387	+
388		/* NETWORK INTERFACE STATS */
389
390	<	void network_iface_stat_init(int start, int end, network_iface_stat_t *net_stats){
391	<
392	<	for(net_stats+=start; start<end; start++){
393	<	net_stats->interface_name=NULL;
419	<	net_stats->speed=0;
420	<	net_stats->dup=UNKNOWN_DUPLEX;
421	<	net_stats++;
422	<	}
390	>	static void network_iface_stat_init(network_iface_stat_t *s) {
391	>	s->interface_name = NULL;
392	>	s->speed = 0;
393	>	s->dup = UNKNOWN_DUPLEX;
394		}
395
396	<	network_iface_stat_t *network_iface_stat_malloc(int needed_entries, int *cur_entries, network_iface_stat_t *net_stats){
397	<
427	<	if(net_stats==NULL){
428	<
429	<	if((net_stats=malloc(needed_entries * sizeof(network_iface_stat_t)))==NULL){
430	<	return NULL;
431	<	}
432	<	network_iface_stat_init(0, needed_entries, net_stats);
433	<	*cur_entries=needed_entries;
434	<
435	<	return net_stats;
436	<	}
437	<
438	<
439	<	if(*cur_entries<needed_entries){
440	<	net_stats=realloc(net_stats, (sizeof(network_iface_stat_t)*needed_entries));
441	<	if(net_stats==NULL){
442	<	return NULL;
443	<	}
444	<	network_iface_stat_init(*cur_entries, needed_entries, net_stats);
445	<	*cur_entries=needed_entries;
446	<	}
447	<
448	<	return net_stats;
396	>	static void network_iface_stat_destroy(network_iface_stat_t *s) {
397	>	free(s->interface_name);
398		}
399
400		network_iface_stat_t *get_network_iface_stats(int *entries){
401	<	static network_iface_stat_t *network_iface_stats;
401	>	VECTOR_DECLARE_STATIC(network_iface_stats, network_iface_stat_t, 5,
402	>	network_iface_stat_init, network_iface_stat_destroy);
403		network_iface_stat_t *network_iface_stat_ptr;
454	–	static int sizeof_network_iface_stats=0;
404		int ifaces = 0;
405
406		#ifdef SOLARIS
#	Line 483 | Line 432 | network_iface_stat_t *get_network_iface_stats(int *ent
432
433		for(net_ptr=net; net_ptr!=NULL; net_ptr=net_ptr->ifa_next){
434		if(net_ptr->ifa_addr->sa_family != AF_LINK) continue;
435	<	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
436	<	if(network_iface_stats==NULL){
435	>
436	>	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
437		return NULL;
438		}
439		network_iface_stat_ptr = network_iface_stats + ifaces;
#	Line 501 | Line 450 | network_iface_stat_t *get_network_iface_stats(int *ent
450		network_iface_stat_ptr->up = 0;
451		}
452
453	<	if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
454	<	network_iface_stat_ptr->interface_name = strdup(net_ptr->ifa_name);
455	<	if (network_iface_stat_ptr->interface_name == NULL) return NULL;
453	>	if (update_string(&network_iface_stat_ptr->interface_name,
454	>	net_ptr->ifa_name) == NULL) {
455	>	return NULL;
456	>	}
457
458		network_iface_stat_ptr->speed = 0;
459		network_iface_stat_ptr->dup = UNKNOWN_DUPLEX;
#	Line 596 | Line 546 | network_iface_stat_t *get_network_iface_stats(int *ent
546		continue;
547		}
548
549	<	network_iface_stats = network_iface_stat_malloc(ifaces + 1, &sizeof_network_iface_stats, network_iface_stats);
600	<	if (network_iface_stats == NULL) {
549	>	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
550		return NULL;
551		}
552		network_iface_stat_ptr = network_iface_stats + ifaces;
553		ifaces++;
554
555	<	if (network_iface_stat_ptr->interface_name != NULL) free(network_iface_stat_ptr->interface_name);
556	<	network_iface_stat_ptr->interface_name = strdup(ksp->ks_name);
557	<	if (network_iface_stat_ptr->interface_name == NULL) return NULL;
555	>	if (update_string(&network_iface_stat_ptr->interface_name,
556	>	ksp->ks_name) == NULL) {
557	>	return NULL;
558	>	}
559
560		if ((ifr.ifr_flags & IFF_UP) != 0) {
561		network_iface_stat_ptr->up = 1;
#	Line 674 | Line 624 | network_iface_stat_t *get_network_iface_stats(int *ent
624		}
625
626		/* We have a good interface to add */
627	<	network_iface_stats=network_iface_stat_malloc((ifaces+1), &sizeof_network_iface_stats, network_iface_stats);
678	<	if(network_iface_stats==NULL){
627	>	if (VECTOR_RESIZE(network_iface_stats, ifaces + 1) < 0) {
628		return NULL;
629		}
630		network_iface_stat_ptr = network_iface_stats + ifaces;
631	<	network_iface_stat_ptr->interface_name = strdup(name);
631	>
632	>	if (update_string(&network_iface_stat_ptr->interface_name,
633	>	name) == NULL) {
634	>	return NULL;
635	>	}
636		if ((ifr.ifr_flags & IFF_UP) != 0) {
637		network_iface_stat_ptr->up = 1;
638		} else {

Diff Legend

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