25 |
|
#include <stdlib.h> |
26 |
|
#include <string.h> |
27 |
|
#include "statgrab.h" |
28 |
< |
#include "time.h" |
28 |
> |
#include <time.h> |
29 |
|
#ifdef SOLARIS |
30 |
|
#include <kstat.h> |
31 |
|
#include <sys/sysinfo.h> |
90 |
|
|
91 |
|
#ifdef LINUX |
92 |
|
FILE *f; |
93 |
< |
/* Horrible big enough, but it should be quite easily */ |
93 |
> |
/* Horrible big enough, but it should be easily big enough */ |
94 |
|
char line[8096]; |
95 |
|
regex_t regex; |
96 |
|
regmatch_t line_match[4]; |
183 |
|
|
184 |
|
interfaces++; |
185 |
|
} |
186 |
+ |
fclose(f); |
187 |
+ |
regfree(®ex); |
188 |
|
|
189 |
|
#endif |
190 |
|
*entries=interfaces; |
199 |
|
#define MAXVAL 18446744073709551616 |
200 |
|
#endif |
201 |
|
long long result; |
202 |
< |
if(new>old){ |
202 |
> |
if(new>=old){ |
203 |
|
result = (new-old); |
204 |
|
}else{ |
205 |
|
result = (MAXVAL+(new-old)); |
247 |
|
for(x=0;x<sizeof_net_stats_diff;x++){ |
248 |
|
|
249 |
|
if((strcmp(network_stats_diff_ptr->interface_name, network_stats_ptr->interface_name))==0){ |
250 |
< |
network_stats_diff_ptr->tx = network_stats_ptr->tx - network_stats_diff_ptr->tx; |
251 |
< |
network_stats_diff_ptr->rx = network_stats_ptr->rx - network_stats_diff_ptr->rx; |
250 |
> |
network_stats_diff_ptr->tx = transfer_diff(network_stats_ptr->tx, network_stats_diff_ptr->tx); |
251 |
> |
network_stats_diff_ptr->rx = transfer_diff(network_stats_ptr->rx, network_stats_diff_ptr->rx); |
252 |
|
network_stats_diff_ptr->systime = network_stats_ptr->systime - network_stats_diff_ptr->systime; |
253 |
|
}else{ |
254 |
|
|
255 |
|
network_stats_ptr=network_stats; |
256 |
|
for(y=0;y<ifaces;y++){ |
257 |
|
if((strcmp(network_stats_diff_ptr->interface_name, network_stats_ptr->interface_name))==0){ |
258 |
< |
network_stats_diff_ptr->tx = network_stats_ptr->tx - network_stats_diff_ptr->tx; |
259 |
< |
network_stats_diff_ptr->rx = network_stats_ptr->rx - network_stats_diff_ptr->rx; |
258 |
> |
network_stats_diff_ptr->tx = transfer_diff(network_stats_ptr->tx, network_stats_diff_ptr->tx); |
259 |
> |
network_stats_diff_ptr->rx = transfer_diff(network_stats_ptr->rx, network_stats_diff_ptr->rx); |
260 |
|
network_stats_diff_ptr->systime = network_stats_ptr->systime - network_stats_diff_ptr->systime; |
261 |
|
break; |
262 |
|
} |