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

Merge pull request #91 from greatest-ape/work-2022-09-18_2

Browse source 
udp: fix num_seeders/num_leechers counting error, remove some casts; improve shell scripts
This commit is contained in:
Joakim Frostegård 2022-09-18 18:22:47 +02:00 • committed by GitHub
commit 3dcf53e0eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
aquatic_udp/src/workers/swarm/mod.rs
View file

@ -136,11 +136,11 @@ fn handle_announce_request<I: Ip>(
peer_ip: I, peer_ip: I,
peer_valid_until: ValidUntil, peer_valid_until: ValidUntil,
) -> AnnounceResponse<I> { ) -> AnnounceResponse<I> {
let max_num_peers_to_take = if request.peers_wanted.0 <= 0 { let max_num_peers_to_take: usize = if request.peers_wanted.0 <= 0 {
config.protocol.max_response_peers as usize config.protocol.max_response_peers
} else { } else {
::std::cmp::min( ::std::cmp::min(
config.protocol.max_response_peers as usize, config.protocol.max_response_peers,
request.peers_wanted.0.try_into().unwrap(), request.peers_wanted.0.try_into().unwrap(),
) )
}; };
@ -163,8 +163,8 @@ fn handle_announce_request<I: Ip>(
AnnounceResponse { AnnounceResponse {
transaction_id: request.transaction_id, transaction_id: request.transaction_id,
announce_interval: AnnounceInterval(config.protocol.peer_announce_interval), announce_interval: AnnounceInterval(config.protocol.peer_announce_interval),
leechers: NumberOfPeers(torrent_data.num_leechers() as i32), leechers: NumberOfPeers(torrent_data.num_leechers().try_into().unwrap_or(i32::MAX)),
seeders: NumberOfPeers(torrent_data.num_seeders() as i32), seeders: NumberOfPeers(torrent_data.num_seeders().try_into().unwrap_or(i32::MAX)),
peers: response_peers, peers: response_peers,
} }
} }

4
aquatic_udp/src/workers/swarm/storage.rs
View file

@ -83,10 +83,10 @@ impl<I: Ip> TorrentData<I> {
match opt_removed_peer.map(|peer| peer.is_seeder) { match opt_removed_peer.map(|peer| peer.is_seeder) {
Some(true) => { Some(true) => {
self.num_leechers -= 1; self.num_seeders -= 1;
} }
Some(false) => { Some(false) => {
self.num_seeders -= 1; self.num_leechers -= 1;
} }
None => {} None => {}
} }

2
scripts/bench-udp-handlers.sh
View file

@ -2,4 +2,4 @@
. ./scripts/env-native-cpu-without-avx-512 . ./scripts/env-native-cpu-without-avx-512
cargo run --release --bin aquatic_udp_bench -- $@ cargo run --release -p aquatic_udp_bench -- $@

2
scripts/run-aquatic-http-private.sh
View file

@ -2,4 +2,4 @@
. ./scripts/env-native-cpu-without-avx-512 . ./scripts/env-native-cpu-without-avx-512
cargo run --profile "release-debug" --bin aquatic_http_private -- $@ cargo run --profile "release-debug" -p aquatic_http_private -- $@

2
scripts/run-aquatic-http.sh
View file

@ -2,4 +2,4 @@
. ./scripts/env-native-cpu-without-avx-512 . ./scripts/env-native-cpu-without-avx-512
cargo run --profile "release-debug" --bin aquatic_http -- $@ cargo run --profile "release-debug" -p aquatic_http -- $@

2
scripts/run-aquatic-udp.sh
View file

@ -2,4 +2,4 @@
. ./scripts/env-native-cpu-without-avx-512 . ./scripts/env-native-cpu-without-avx-512
cargo run --profile "release-debug" --bin aquatic_udp -- $@ cargo run --profile "release-debug" -p aquatic_udp -- $@

2
scripts/run-aquatic-ws.sh
View file

@ -2,4 +2,4 @@
. ./scripts/env-native-cpu-without-avx-512 . ./scripts/env-native-cpu-without-avx-512
cargo run --profile "release-debug" --bin aquatic_ws -- $@ cargo run --profile "release-debug" -p aquatic_ws -- $@

2
scripts/run-load-test-http.sh
View file

@ -2,4 +2,4 @@
. ./scripts/env-native-cpu-without-avx-512 . ./scripts/env-native-cpu-without-avx-512
cargo run --profile "release-debug" --bin aquatic_http_load_test -- $@ cargo run --profile "release-debug" -p aquatic_http_load_test -- $@

2
scripts/run-load-test-udp.sh
View file

@ -2,4 +2,4 @@
. ./scripts/env-native-cpu-without-avx-512 . ./scripts/env-native-cpu-without-avx-512
cargo run --profile "release-debug" --bin aquatic_udp_load_test -- $@ cargo run --profile "release-debug" -p aquatic_udp_load_test -- $@

2
scripts/run-load-test-ws.sh
View file

@ -2,4 +2,4 @@
. ./scripts/env-native-cpu-without-avx-512 . ./scripts/env-native-cpu-without-avx-512
cargo run --profile "release-debug" --bin aquatic_ws_load_test -- $@ cargo run --profile "release-debug" -p aquatic_ws_load_test -- $@