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: move some TorrentMap cleaning code to TorrentData impl

Browse source
This commit is contained in:
Joakim Frostegård 2022-04-16 00:52:34 +02:00
parent 29f97e881e
commit 78266fd3e7
1 changed files with 32 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

67
aquatic_udp/src/workers/request/storage.rs
View file

@ -38,6 +38,36 @@ pub struct TorrentData<I: Ip> {
pub num_leechers: usize,
}
impl<I: Ip> TorrentData<I> {
fn clean_and_check_if_has_peers(&mut self, now: Instant) -> bool {
self.peers.retain(|_, peer| {
if peer.valid_until.0 > now {
true
} else {
match peer.status {
PeerStatus::Seeding => {
self.num_seeders -= 1;
}
PeerStatus::Leeching => {
self.num_leechers -= 1;
}
_ => (),
};
false
}
});
if self.peers.is_empty() {
false
} else {
self.peers.shrink_to_fit();
true
}
}
}
impl<I: Ip> Default for TorrentData<I> {
fn default() -> Self {
Self {
@ -68,7 +98,7 @@ impl TorrentMaps {
access_list_cache
.load()
.allows(access_list_mode, &info_hash.0)
&& Self::clean_torrent_and_peers(now, torrent)
&& torrent.clean_and_check_if_has_peers(now)
});
self.ipv4.shrink_to_fit();
@ -76,41 +106,8 @@ impl TorrentMaps {
access_list_cache
.load()
.allows(access_list_mode, &info_hash.0)
&& Self::clean_torrent_and_peers(now, torrent)
&& torrent.clean_and_check_if_has_peers(now)
});
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| {
if peer.valid_until.0 > now {
true
} else {
match peer.status {
PeerStatus::Seeding => {
*num_seeders -= 1;
}
PeerStatus::Leeching => {
*num_leechers -= 1;
}
_ => (),
};
false
}
});
if torrent.peers.is_empty() {
false
} else {
torrent.peers.shrink_to_fit();
true
}
}
}