YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 10:15:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_udp: move TorrentMap cleaning logic to TorrentMap impl

Browse source
This commit is contained in:
Joakim Frostegård 2021-10-15 02:53:33 +02:00
parent ec5d535ffc
commit 3bb6c1994c
2 changed files with 69 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

62
aquatic_udp/src/lib/common.rs
View file

@ -1,7 +1,9 @@
use std::hash::Hash;
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
use std::sync::{atomic::AtomicUsize, Arc};
use std::time::Instant;
use aquatic_common::AccessListType;
use hashbrown::HashMap;
use indexmap::IndexMap;
use parking_lot::Mutex;
@ -108,6 +110,66 @@ pub struct TorrentMaps {
pub ipv6: TorrentMap<Ipv6Addr>,
}
impl TorrentMaps {
/// Remove inactive torrents
pub fn clean(&mut self, now: Instant) {
self.ipv4
.retain(|_, torrent| Self::clean_torrent_and_peers(now, torrent));
self.ipv4.shrink_to_fit();
self.ipv6
.retain(|_, torrent| Self::clean_torrent_and_peers(now, torrent));
self.ipv6.shrink_to_fit();
}
/// Remove disallowed and inactive torrents
pub fn clean_with_access_list(
&mut self,
access_list_type: AccessListType,
access_list: &AccessList,
now: Instant,
) {
self.ipv4.retain(|info_hash, torrent| {
access_list.allows(access_list_type, &info_hash.0)
&& Self::clean_torrent_and_peers(now, torrent)
});
self.ipv4.shrink_to_fit();
self.ipv6.retain(|info_hash, torrent| {
access_list.allows(access_list_type, &info_hash.0)
&& Self::clean_torrent_and_peers(now, torrent)
});
self.ipv6.shrink_to_fit();
}
/// Returns true if torrent is to be kept
#[inline]
fn clean_torrent_and_peers<I: Ip>(now: Instant, torrent: &mut TorrentData<I>) -> bool {
let num_seeders = &mut torrent.num_seeders;
let num_leechers = &mut torrent.num_leechers;
torrent.peers.retain(|_, peer| {
let keep = peer.valid_until.0 > now;
if !keep {
match peer.status {
PeerStatus::Seeding => {
*num_seeders -= 1;
}
PeerStatus::Leeching => {
*num_leechers -= 1;
}
_ => (),
};
}
keep
});
!torrent.peers.is_empty()
}
}
#[derive(Default)]
pub struct Statistics {
pub requests_received: AtomicUsize,

59
aquatic_udp/src/lib/tasks.rs
View file

@ -19,70 +19,25 @@ pub fn clean_connections_and_torrents(config: &Config, state: &State) {
}
match config.access_list.list_type {
access_list_type @ (AccessListType::Allow | AccessListType::Deny) => {
AccessListType::Allow | AccessListType::Deny => {
let mut access_list = state.access_list.lock();
if let Err(err) = access_list.update_from_path(&config.access_list.path) {
::log::error!("Update access list from path: {:?}", err);
}
let mut torrents = state.torrents.lock();
torrents.ipv4.retain(|info_hash, torrent| {
access_list.allows(access_list_type, &info_hash.0)
&& clean_torrent_and_peers(now, torrent)
});
torrents.ipv4.shrink_to_fit();
torrents.ipv6.retain(|info_hash, torrent| {
access_list.allows(access_list_type, &info_hash.0)
&& clean_torrent_and_peers(now, torrent)
});
torrents.ipv6.shrink_to_fit();
state.torrents.lock().clean_with_access_list(
config.access_list.list_type,
&access_list,
now,
);
}
AccessListType::Ignore => {
let mut torrents = state.torrents.lock();
torrents
.ipv4
.retain(|_, torrent| clean_torrent_and_peers(now, torrent));
torrents.ipv4.shrink_to_fit();
torrents
.ipv6
.retain(|_, torrent| clean_torrent_and_peers(now, torrent));
torrents.ipv6.shrink_to_fit();
state.torrents.lock().clean(now);
}
}
}
/// Returns true if torrent is to be kept
#[inline]
fn clean_torrent_and_peers<I: Ip>(now: Instant, torrent: &mut TorrentData<I>) -> bool {
let num_seeders = &mut torrent.num_seeders;
let num_leechers = &mut torrent.num_leechers;
torrent.peers.retain(|_, peer| {
let keep = peer.valid_until.0 > now;
if !keep {
match peer.status {
PeerStatus::Seeding => {
*num_seeders -= 1;
}
PeerStatus::Leeching => {
*num_leechers -= 1;
}
_ => (),
};
}
keep
});
!torrent.peers.is_empty()
}
pub fn gather_and_print_statistics(state: &State, config: &Config) {
let interval = config.statistics.interval;