aquatic_http, aquatic_ws: add option for printing statistics

statistics are on number of peers per torrent
This commit is contained in:
Joakim Frostegård 2020-08-13 03:58:28 +02:00
parent 23a562c1e5
commit 88423976c4
9 changed files with 150 additions and 1 deletions

View file

@ -21,6 +21,7 @@ aquatic_http_protocol = { path = "../aquatic_http_protocol" }
crossbeam-channel = "0.4"
either = "1"
hashbrown = "0.8"
histogram = "0.6"
indexmap = "1"
itoa = "0.4"
log = "0.4"

View file

@ -20,6 +20,7 @@ pub struct Config {
pub protocol: ProtocolConfig,
pub handlers: HandlerConfig,
pub cleaning: CleaningConfig,
pub statistics: StatisticsConfig,
pub privileges: PrivilegeConfig,
}
@ -66,7 +67,6 @@ pub struct ProtocolConfig {
}
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(default)]
pub struct HandlerConfig {
@ -89,6 +89,14 @@ pub struct CleaningConfig {
}
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(default)]
pub struct StatisticsConfig {
/// Print statistics this often (seconds). Don't print when set to zero.
pub interval: u64,
}
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(default)]
pub struct PrivilegeConfig {
@ -111,6 +119,7 @@ impl Default for Config {
protocol: ProtocolConfig::default(),
handlers: HandlerConfig::default(),
cleaning: CleaningConfig::default(),
statistics: StatisticsConfig::default(),
privileges: PrivilegeConfig::default(),
}
}
@ -163,6 +172,15 @@ impl Default for CleaningConfig {
}
impl Default for StatisticsConfig {
fn default() -> Self {
Self {
interval: 0,
}
}
}
impl Default for PrivilegeConfig {
fn default() -> Self {
Self {

View file

@ -125,6 +125,21 @@ pub fn start_workers(config: Config, state: State) -> anyhow::Result<()> {
})?;
}
if config.statistics.interval != 0 {
let state = state.clone();
let config = config.clone();
Builder::new().name("statistics".to_string()).spawn(move ||
loop {
::std::thread::sleep(Duration::from_secs(
config.statistics.interval
));
tasks::print_statistics(&state);
}
).expect("spawn statistics thread");
}
Ok(())
}

View file

@ -1,5 +1,7 @@
use std::time::Instant;
use histogram::Histogram;
use crate::common::*;
@ -26,4 +28,41 @@ fn clean_torrent_map<I: Ip>(
});
torrent_map.shrink_to_fit();
}
pub fn print_statistics(state: &State){
let mut peers_per_torrent = Histogram::new();
{
let torrents = &mut state.torrent_maps.lock();
for torrent in torrents.ipv4.values(){
let num_peers = (torrent.num_seeders + torrent.num_leechers) as u64;
if let Err(err) = peers_per_torrent.increment(num_peers){
eprintln!("error incrementing peers_per_torrent histogram: {}", err)
}
}
for torrent in torrents.ipv6.values(){
let num_peers = (torrent.num_seeders + torrent.num_leechers) as u64;
if let Err(err) = peers_per_torrent.increment(num_peers){
eprintln!("error incrementing peers_per_torrent histogram: {}", err)
}
}
}
if peers_per_torrent.entries() != 0 {
println!(
"peers per torrent: min: {}, p50: {}, p75: {}, p90: {}, p99: {}, p999: {}, max: {}",
peers_per_torrent.minimum().unwrap(),
peers_per_torrent.percentile(50.0).unwrap(),
peers_per_torrent.percentile(75.0).unwrap(),
peers_per_torrent.percentile(90.0).unwrap(),
peers_per_torrent.percentile(99.0).unwrap(),
peers_per_torrent.percentile(99.9).unwrap(),
peers_per_torrent.maximum().unwrap(),
);
}
}