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: remove unused config var max_requests_per_iter

Browse source
This commit is contained in:
Joakim Frostegård 2021-11-16 23:09:13 +01:00
parent 7afaa2702a
commit 5ef0935c97
4 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aquatic_udp/src/lib/config.rs
View file

@ -72,9 +72,6 @@ pub struct ProtocolConfig {
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(default)] #[serde(default)]
pub struct HandlerConfig { pub struct HandlerConfig {
/// Maximum number of requests to receive from channel before locking
/// mutex and starting work
pub max_requests_per_iter: usize,
pub channel_recv_timeout_ms: u64, pub channel_recv_timeout_ms: u64,
} }
@ -142,7 +139,6 @@ impl Default for ProtocolConfig {
impl Default for HandlerConfig { impl Default for HandlerConfig {
fn default() -> Self { fn default() -> Self {
Self { Self {
max_requests_per_iter: 10000,
channel_recv_timeout_ms: 100, channel_recv_timeout_ms: 100,
} }
} }

4
aquatic_udp_bench/src/announce.rs
View file

@ -7,7 +7,6 @@ use rand::Rng;
use rand_distr::Pareto; use rand_distr::Pareto;
use aquatic_udp::common::*; use aquatic_udp::common::*;
use aquatic_udp::config::Config;
use aquatic_udp_protocol::*; use aquatic_udp_protocol::*;
use crate::common::*; use crate::common::*;
@ -15,7 +14,6 @@ use crate::config::BenchConfig;
pub fn bench_announce_handler( pub fn bench_announce_handler(
bench_config: &BenchConfig, bench_config: &BenchConfig,
aquatic_config: &Config,
request_sender: &Sender<(SocketWorkerIndex, ConnectedRequest, SocketAddr)>, request_sender: &Sender<(SocketWorkerIndex, ConnectedRequest, SocketAddr)>,
response_receiver: &Receiver<(ConnectedResponse, SocketAddr)>, response_receiver: &Receiver<(ConnectedResponse, SocketAddr)>,
rng: &mut impl Rng, rng: &mut impl Rng,
@ -23,7 +21,7 @@ pub fn bench_announce_handler(
) -> (usize, Duration) { ) -> (usize, Duration) {
let requests = create_requests(rng, info_hashes, bench_config.num_announce_requests); let requests = create_requests(rng, info_hashes, bench_config.num_announce_requests);
let p = aquatic_config.handlers.max_requests_per_iter * bench_config.num_threads; let p = 10_000 * bench_config.num_threads; // FIXME: adjust to sharded workers
let mut num_responses = 0usize; let mut num_responses = 0usize;
let mut dummy: u16 = rng.gen(); let mut dummy: u16 = rng.gen();

2
aquatic_udp_bench/src/main.rs
View file

@ -59,7 +59,6 @@ pub fn run(bench_config: BenchConfig) -> ::anyhow::Result<()> {
let a = announce::bench_announce_handler( let a = announce::bench_announce_handler(
&bench_config, &bench_config,
&aquatic_config,
&request_sender, &request_sender,
&response_receiver, &response_receiver,
&mut rng, &mut rng,
@ -68,7 +67,6 @@ pub fn run(bench_config: BenchConfig) -> ::anyhow::Result<()> {
let s = scrape::bench_scrape_handler( let s = scrape::bench_scrape_handler(
&bench_config, &bench_config,
&aquatic_config,
&request_sender, &request_sender,
&response_receiver, &response_receiver,
&mut rng, &mut rng,

4
aquatic_udp_bench/src/scrape.rs
View file

@ -7,7 +7,6 @@ use rand::Rng;
use rand_distr::Pareto; use rand_distr::Pareto;
use aquatic_udp::common::*; use aquatic_udp::common::*;
use aquatic_udp::config::Config;
use aquatic_udp_protocol::*; use aquatic_udp_protocol::*;
use crate::common::*; use crate::common::*;
@ -15,7 +14,6 @@ use crate::config::BenchConfig;
pub fn bench_scrape_handler( pub fn bench_scrape_handler(
bench_config: &BenchConfig, bench_config: &BenchConfig,
aquatic_config: &Config,
request_sender: &Sender<(SocketWorkerIndex, ConnectedRequest, SocketAddr)>, request_sender: &Sender<(SocketWorkerIndex, ConnectedRequest, SocketAddr)>,
response_receiver: &Receiver<(ConnectedResponse, SocketAddr)>, response_receiver: &Receiver<(ConnectedResponse, SocketAddr)>,
rng: &mut impl Rng, rng: &mut impl Rng,
@ -28,7 +26,7 @@ pub fn bench_scrape_handler(
bench_config.num_hashes_per_scrape_request, bench_config.num_hashes_per_scrape_request,
); );
let p = aquatic_config.handlers.max_requests_per_iter * bench_config.num_threads; let p = 10_000 * bench_config.num_threads; // FIXME: adjust to sharded workers
let mut num_responses = 0usize; let mut num_responses = 0usize;
let mut dummy: i32 = rng.gen(); let mut dummy: i32 = rng.gen();