Skip to content
This repository was archived by the owner on Jul 17, 2025. It is now read-only.

Commit bf21ea1

Browse files
committed
tests: apply formatter
Signed-off-by: Reto Achermann <achreto@gmail.com>
1 parent 0b5cad5 commit bf21ea1

File tree

2 files changed

+21
-25
lines changed

2 files changed

+21
-25
lines changed

kernel/tests/s11_rackscale_benchmarks.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ fn rackscale_memcached_benchmark_sharded(is_shmem: bool) {
812812
// stuff has been built, now we can run the benchmark
813813
let mut config = if is_smoke {
814814
MemcachedShardedConfig {
815-
num_servers:1,
815+
num_servers: 1,
816816
num_queries: 100_000,
817817
mem_size: 16,
818818
protocol: "tcp",
@@ -823,7 +823,7 @@ fn rackscale_memcached_benchmark_sharded(is_shmem: bool) {
823823
} else {
824824
// keep in sync with the s10_memcached_benchmark_internal configuration
825825
MemcachedShardedConfig {
826-
num_servers:1,
826+
num_servers: 1,
827827
num_queries: 100_000_000,
828828
mem_size: 128 * 1024,
829829
protocol: "tcp",
@@ -886,7 +886,6 @@ fn rackscale_memcached_benchmark_sharded(is_shmem: bool) {
886886
let ip = 10 + i;
887887
servers.push_str(format!("tcp://172.31.0.{}:{}", ip, 11211).as_str());
888888
}
889-
890889
} else {
891890
servers.push_str(format!("unix://memcached{}.sock", i).as_str());
892891
}
@@ -947,7 +946,8 @@ fn rackscale_memcached_benchmark_sharded(is_shmem: bool) {
947946
spawn_memcached(i.to_string().as_str(), &config, timeout_ms);
948947
}
949948

950-
let mut pty = spawn_loadbalancer(Some(&config), timeout_ms).expect("failed to spawn load balancer");
949+
let mut pty = spawn_loadbalancer(Some(&config), timeout_ms)
950+
.expect("failed to spawn load balancer");
951951
let mut output = String::new();
952952
let res = parse_memcached_output(&mut pty, &mut output);
953953

@@ -1037,7 +1037,7 @@ fn rackscale_memcached_benchmark_sharded(is_shmem: bool) {
10371037
8192
10381038
} else {
10391039
// Memory must also be divisible by number of nodes, which could be 1, 2, 3, or 4
1040-
256*1024 //2048 * (((((num_cores + 1) / 2) + 3 - 1) / 3) * 3)
1040+
256 * 1024 //2048 * (((((num_cores + 1) / 2) + 3 - 1) / 3) * 3)
10411041
}
10421042
}
10431043

kernel/testutils/src/rackscale_runner.rs

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ type RackscaleMatchFn<T> = fn(
4747
arg: Option<T>,
4848
) -> Result<()>;
4949

50-
type ControllerRunFn<T> = fn(
51-
config: Option<&T>,
52-
timeout_ms: u64,
53-
) -> Result<PtySession>;
50+
type ControllerRunFn<T> = fn(config: Option<&T>, timeout_ms: u64) -> Result<PtySession>;
5451

5552
#[derive(Clone)]
5653
pub struct RackscaleRun<T>
@@ -532,12 +529,12 @@ impl<T: Clone + Send + 'static> RackscaleRun<T> {
532529
.lock()
533530
.expect("Failed to get build timer lock");
534531
send_signal(&tx);
535-
}
532+
}
536533

537534
if state.wait_for_client {
538535
let tx = client_tx.lock().expect("Failed to get rx lock");
539536
send_signal(&tx);
540-
}
537+
}
541538

542539
client_output_array
543540
.lock()
@@ -599,19 +596,19 @@ impl<T: Clone + Send + 'static> RackscaleRun<T> {
599596
qemu_run()
600597
} else {
601598
let mut cmdline_controller =
602-
RunnerArgs::new_with_build(&controller_kernel_test, &state.built)
603-
.timeout(state.controller_timeout)
604-
.transport(state.transport)
605-
.mode(RackscaleMode::Controller)
606-
.tap("tap0")
607-
.no_network_setup()
608-
.workers(state.num_clients + 1)
609-
.use_vmxnet3()
610-
.memory(state.memory)
611-
.nodes(1)
612-
.cores(controller_cores)
613-
.node_offset(controller_placement_cores[0].0)
614-
.setaffinity(controller_placement_cores[0].1.clone());
599+
RunnerArgs::new_with_build(&controller_kernel_test, &state.built)
600+
.timeout(state.controller_timeout)
601+
.transport(state.transport)
602+
.mode(RackscaleMode::Controller)
603+
.tap("tap0")
604+
.no_network_setup()
605+
.workers(state.num_clients + 1)
606+
.use_vmxnet3()
607+
.memory(state.memory)
608+
.nodes(1)
609+
.cores(controller_cores)
610+
.node_offset(controller_placement_cores[0].0)
611+
.setaffinity(controller_placement_cores[0].1.clone());
615612

616613
if use_large_pages {
617614
cmdline_controller = cmdline_controller.large_pages().prealloc();
@@ -684,7 +681,6 @@ impl<T: Clone + Send + 'static> RackscaleRun<T> {
684681
})
685682
.expect("Controller thread failed to spawn");
686683

687-
688684
let mut client_rets = Vec::new();
689685
for client in client_procs {
690686
client_rets.push(client.join());

0 commit comments

Comments
 (0)