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

bencher: remove chihaya GOMAXPROCS option

Browse source 
It makes no difference to performance
This commit is contained in:
Joakim Frostegård 2023-12-30 19:14:42 +01:00
parent 0f469ff725
commit 23fe6d4e20
1 changed files with 15 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

49
crates/bencher/src/protocols/udp.rs
View file

@ -86,8 +86,7 @@ impl UdpCommand {
OpenTrackerUdpRunner::new(2), OpenTrackerUdpRunner::new(2),
], ],
UdpTracker::Chihaya => vec![ UdpTracker::Chihaya => vec![
ChihayaUdpRunner::new(None), ChihayaUdpRunner::new(),
ChihayaUdpRunner::new(Some(2)),
], ],
}, },
load_test_runs: simple_load_test_runs(cpu_mode, &[1, 2, 4, 6]), load_test_runs: simple_load_test_runs(cpu_mode, &[1, 2, 4, 6]),
@ -104,8 +103,7 @@ impl UdpCommand {
OpenTrackerUdpRunner::new(4), OpenTrackerUdpRunner::new(4),
], ],
UdpTracker::Chihaya => vec![ UdpTracker::Chihaya => vec![
ChihayaUdpRunner::new(None), ChihayaUdpRunner::new(),
ChihayaUdpRunner::new(Some(4)),
], ],
}, },
load_test_runs: simple_load_test_runs(cpu_mode, &[1, 2, 4, 6]), load_test_runs: simple_load_test_runs(cpu_mode, &[1, 2, 4, 6]),
@ -122,8 +120,7 @@ impl UdpCommand {
OpenTrackerUdpRunner::new(6), OpenTrackerUdpRunner::new(6),
], ],
UdpTracker::Chihaya => vec![ UdpTracker::Chihaya => vec![
ChihayaUdpRunner::new(None), ChihayaUdpRunner::new(),
ChihayaUdpRunner::new(Some(6)),
], ],
}, },
load_test_runs: simple_load_test_runs(cpu_mode, &[4, 6, 8]), load_test_runs: simple_load_test_runs(cpu_mode, &[4, 6, 8]),
@ -140,8 +137,7 @@ impl UdpCommand {
OpenTrackerUdpRunner::new(8), OpenTrackerUdpRunner::new(8),
], ],
UdpTracker::Chihaya => vec![ UdpTracker::Chihaya => vec![
ChihayaUdpRunner::new(None), ChihayaUdpRunner::new(),
ChihayaUdpRunner::new(Some(8)),
], ],
}, },
load_test_runs: simple_load_test_runs(cpu_mode, &[4, 6, 8]), load_test_runs: simple_load_test_runs(cpu_mode, &[4, 6, 8]),
@ -160,8 +156,7 @@ impl UdpCommand {
OpenTrackerUdpRunner::new(12), OpenTrackerUdpRunner::new(12),
], ],
UdpTracker::Chihaya => vec![ UdpTracker::Chihaya => vec![
ChihayaUdpRunner::new(None), ChihayaUdpRunner::new(),
ChihayaUdpRunner::new(Some(12)),
], ],
}, },
load_test_runs: simple_load_test_runs(cpu_mode, &[4, 6, 8, 12]), load_test_runs: simple_load_test_runs(cpu_mode, &[4, 6, 8, 12]),
@ -180,8 +175,7 @@ impl UdpCommand {
OpenTrackerUdpRunner::new(16), OpenTrackerUdpRunner::new(16),
], ],
UdpTracker::Chihaya => vec![ UdpTracker::Chihaya => vec![
ChihayaUdpRunner::new(None), ChihayaUdpRunner::new(),
ChihayaUdpRunner::new(Some(16)),
], ],
}, },
load_test_runs: simple_load_test_runs(cpu_mode, &[4, 8, 12]), load_test_runs: simple_load_test_runs(cpu_mode, &[4, 8, 12]),
@ -202,8 +196,7 @@ impl UdpCommand {
OpenTrackerUdpRunner::new(24), OpenTrackerUdpRunner::new(24),
], ],
UdpTracker::Chihaya => vec![ UdpTracker::Chihaya => vec![
ChihayaUdpRunner::new(None), ChihayaUdpRunner::new(),
ChihayaUdpRunner::new(Some(24)),
], ],
}, },
load_test_runs: simple_load_test_runs(cpu_mode, &[4, 8, 12, 16]), load_test_runs: simple_load_test_runs(cpu_mode, &[4, 8, 12, 16]),
@ -225,8 +218,7 @@ impl UdpCommand {
OpenTrackerUdpRunner::new(32), OpenTrackerUdpRunner::new(32),
], ],
UdpTracker::Chihaya => vec![ UdpTracker::Chihaya => vec![
ChihayaUdpRunner::new(None), ChihayaUdpRunner::new(),
ChihayaUdpRunner::new(Some(32)),
], ],
}, },
load_test_runs: simple_load_test_runs(cpu_mode, &[4, 8, 12, 16]), load_test_runs: simple_load_test_runs(cpu_mode, &[4, 8, 12, 16]),
@ -336,13 +328,11 @@ impl ProcessRunner for OpenTrackerUdpRunner {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
struct ChihayaUdpRunner { struct ChihayaUdpRunner;
gomaxprocs: Option<usize>,
}
impl ChihayaUdpRunner { impl ChihayaUdpRunner {
fn new(gomaxprocs: Option<usize>) -> Rc<dyn ProcessRunner<Command = UdpCommand>> { fn new() -> Rc<dyn ProcessRunner<Command = UdpCommand>> {
Rc::new(Self { gomaxprocs }) Rc::new(Self)
} }
} }
@ -371,28 +361,19 @@ impl ProcessRunner for ChihayaUdpRunner {
"#, "#,
)?; )?;
let mut c = Command::new("taskset"); Ok(Command::new("taskset")
let mut c = c
.arg("--cpu-list") .arg("--cpu-list")
.arg(vcpus.as_cpu_list()) .arg(vcpus.as_cpu_list())
.arg(&command.chihaya) .arg(&command.chihaya)
.arg("--config") .arg("--config")
.arg(tmp_file.path()) .arg(tmp_file.path())
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.stderr(Stdio::piped()); .stderr(Stdio::piped())
.spawn()?)
if let Some(gomaxprocs) = self.gomaxprocs {
c = c.env("GOMAXPROCS", gomaxprocs.to_string());
}
Ok(c.spawn()?)
} }
fn keys(&self) -> IndexMap<String, String> { fn keys(&self) -> IndexMap<String, String> {
indexmap! { Default::default()
"GOMAXPROCS".to_string() => format!("{:?}", self.gomaxprocs),
}
} }
} }