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 load test: remove ThreadId newtype, use poll token 0 in all workers

Browse source
This commit is contained in:
Joakim Frostegård 2021-11-28 22:33:55 +01:00
parent f068d86e0d
commit 9d8f9d8f7c
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
aquatic_udp_load_test/src/common.rs
View file

@ -4,9 +4,6 @@ use hashbrown::HashMap;
use aquatic_udp_protocol::*; use aquatic_udp_protocol::*;
#[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)]
pub struct ThreadId(pub u8);
#[derive(PartialEq, Eq, Clone)] #[derive(PartialEq, Eq, Clone)]
pub struct TorrentPeer { pub struct TorrentPeer {
pub info_hash: InfoHash, pub info_hash: InfoHash,

3
aquatic_udp_load_test/src/main.rs
View file

@ -62,7 +62,6 @@ fn run(config: Config) -> ::anyhow::Result<()> {
// Start workers // Start workers
for i in 0..config.workers { for i in 0..config.workers {
let thread_id = ThreadId(i);
let port = config.network.first_port + (i as u16); let port = config.network.first_port + (i as u16);
let ip = if config.server_address.is_ipv6() { let ip = if config.server_address.is_ipv6() {
@ -87,7 +86,7 @@ fn run(config: Config) -> ::anyhow::Result<()> {
WorkerIndex::SocketWorker(i as usize), WorkerIndex::SocketWorker(i as usize),
); );
run_worker_thread(state, pareto, &config, addr, thread_id) run_worker_thread(state, pareto, &config, addr)
}); });
} }

3
aquatic_udp_load_test/src/worker/mod.rs
View file

@ -24,7 +24,6 @@ pub fn run_worker_thread(
pareto: Pareto<f64>, pareto: Pareto<f64>,
config: &Config, config: &Config,
addr: SocketAddr, addr: SocketAddr,
thread_id: ThreadId,
) { ) {
let mut socket = UdpSocket::from_std(create_socket(config, addr)); let mut socket = UdpSocket::from_std(create_socket(config, addr));
let mut buffer = [0u8; MAX_PACKET_SIZE]; let mut buffer = [0u8; MAX_PACKET_SIZE];
@ -32,7 +31,7 @@ pub fn run_worker_thread(
let mut rng = SmallRng::from_rng(thread_rng()).expect("create SmallRng from thread_rng()"); let mut rng = SmallRng::from_rng(thread_rng()).expect("create SmallRng from thread_rng()");
let mut torrent_peers = TorrentPeerMap::default(); let mut torrent_peers = TorrentPeerMap::default();
let token = Token(thread_id.0 as usize); let token = Token(0);
let interests = Interest::READABLE; let interests = Interest::READABLE;
let timeout = Duration::from_micros(config.network.poll_timeout); let timeout = Duration::from_micros(config.network.poll_timeout);