YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

udp: make tracker-side statistics more accurate

Browse source
This commit is contained in:
Joakim Frostegård 2021-11-21 20:39:27 +01:00
parent 3a4056058b
commit 2f15b2cc8e
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
aquatic_udp/src/lib/workers/statistics.rs
View file

@ -1,5 +1,5 @@
use std::sync::atomic::{AtomicUsize, Ordering};
use std::time::Duration;
use std::time::{Duration, Instant};
use crate::common::*;
use crate::config::Config;
@ -8,6 +8,9 @@ pub fn run_statistics_worker(config: Config, state: State) {
let ipv4_active = config.network.address.is_ipv4() || !config.network.only_ipv6;
let ipv6_active = config.network.address.is_ipv6();
let mut last_ipv4 = Instant::now();
let mut last_ipv6 = Instant::now();
loop {
::std::thread::sleep(Duration::from_secs(config.statistics.interval));
@ -16,29 +19,33 @@ pub fn run_statistics_worker(config: Config, state: State) {
if ipv4_active {
println!("IPv4:");
gather_and_print_for_protocol(&config, &state.statistics_ipv4);
gather_and_print_for_protocol(&config, &state.statistics_ipv4, &mut last_ipv4);
}
if ipv6_active {
println!("IPv6:");
gather_and_print_for_protocol(&config, &state.statistics_ipv6);
gather_and_print_for_protocol(&config, &state.statistics_ipv6, &mut last_ipv6);
}
println!();
}
}
fn gather_and_print_for_protocol(config: &Config, statistics: &Statistics) {
let interval = config.statistics.interval;
fn gather_and_print_for_protocol(config: &Config, statistics: &Statistics, last: &mut Instant) {
let requests_received: f64 = statistics.requests_received.fetch_and(0, Ordering::AcqRel) as f64;
let responses_sent: f64 = statistics.responses_sent.fetch_and(0, Ordering::AcqRel) as f64;
let bytes_received: f64 = statistics.bytes_received.fetch_and(0, Ordering::AcqRel) as f64;
let bytes_sent: f64 = statistics.bytes_sent.fetch_and(0, Ordering::AcqRel) as f64;
let requests_per_second = requests_received / interval as f64;
let responses_per_second: f64 = responses_sent / interval as f64;
let bytes_received_per_second: f64 = bytes_received / interval as f64;
let bytes_sent_per_second: f64 = bytes_sent / interval as f64;
let now = Instant::now();
let elapsed = (now - *last).as_secs_f64();
*last = now;
let requests_per_second = requests_received / elapsed;
let responses_per_second: f64 = responses_sent / elapsed;
let bytes_received_per_second: f64 = bytes_received / elapsed;
let bytes_sent_per_second: f64 = bytes_sent / elapsed;
let num_torrents: usize = sum_atomic_usizes(&statistics.torrents);
let num_peers = sum_atomic_usizes(&statistics.peers);