wanderer/fastnetmon-rewritten
1
0
Fork 0
mirror of https://github.com/pavel-odintsov/fastnetmon synced 2024-11-23 13:22:36 +01:00
Code Issues Releases Activity

Optimize speed calculation

Browse Source
This commit is contained in:
Pavel Odintsov 2014-12-05 16:31:55 +03:00
parent 0e0d85b365
commit 4b334741c7
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fastnetmon.cpp
View File

@ -1449,18 +1449,18 @@ void recalculate_speed_thread_handler() {
/* Calculate speed for all connnections */
void recalculate_speed() {
// TODO: WE SHOULD ZEROFY ALL ELEMETS IN TABLE SpeedCounter
// TODO: WE SHOULD ZEROFY ALL ELEMENTS IN TABLE SpeedCounter
double speed_calc_period = 1;
time_t current_time;
time(&current_time);
// IF we got 1+ seconds lag we should use new "delta" or skip this step
// If we got 1+ seconds lag we should use new "delta" or skip this step
double time_difference = difftime(current_time, last_call_of_traffic_recalculation);
if (time_difference < 1) {
// It could occur on programm start
logger<< log4cpp::Priority::INFO<<"We skip one iteration of speed_calc because it runs so early!";
logger<< log4cpp::Priority::INFO<<"We skip one iteration of speed_calc because it runs so early!";
return;
} else if (int(time_difference) == 1) {
// All fine, we run on time
@ -1469,8 +1469,6 @@ void recalculate_speed() {
speed_calc_period = time_difference;
}
//logger<< log4cpp::Priority::INFO<<"Difference: "<<time_difference;
map_element zero_map_element;
memset(&zero_map_element, 0, sizeof(zero_map_element));
@ -1576,15 +1574,17 @@ void recalculate_speed() {
}
speed_counters_mutex.lock();
map_element* current_speed_element = &SpeedCounter[client_ip];
// add speed values to speed struct
SpeedCounter[client_ip].in_bytes = in_bps;
SpeedCounter[client_ip].out_bytes = out_bps;
current_speed_element->in_bytes = in_bps;
current_speed_element->out_bytes = out_bps;
SpeedCounter[client_ip].in_packets = in_pps;
SpeedCounter[client_ip].out_packets = out_pps;
current_speed_element->in_packets = in_pps;
current_speed_element->out_packets = out_pps;
SpeedCounter[client_ip].in_flows = in_flows;
SpeedCounter[client_ip].out_flows = out_flows;
current_speed_element->in_flows = in_flows;
current_speed_element->out_flows = out_flows;
speed_counters_mutex.unlock();