Skip to content

Commit f6f9c39

Browse files
hunhoffehunhoffe
committed
Fix bug in how features are parsed
1 parent 0091044 commit f6f9c39

File tree

4 files changed

+32
-28
lines changed

4 files changed

+32
-28
lines changed

‎kernel/tests/s03_kernel_high_tests.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ fn s03_phys_alloc() {
175175
#[test]
176176
fn s03_ivshmem_write_and_read() {
177177
let build = BuildArgs::default().build();
178-
let (shmem_socket, shmem_file) = get_shmem_names(None);
178+
let (shmem_socket, shmem_file) = get_shmem_names(None, false);
179179
let shmem_sockets = vec![shmem_socket.clone()];
180180
let shmem_size = 2; // in MB
181181

@@ -222,8 +222,8 @@ fn s03_ivshmem_interrupt() {
222222
use std::time::Duration;
223223

224224
let build = Arc::new(BuildArgs::default().kernel_feature("test-shmem").build());
225-
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0));
226-
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1));
225+
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0), false);
226+
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1), false);
227227
let shmem_size = 2; // in MB
228228

229229
let mut shmem_server0 = spawn_shmem_server(&shmem_socket0, &shmem_file0, shmem_size, None)
@@ -296,8 +296,8 @@ fn s03_ivshmem_interrupt() {
296296
#[test]
297297
fn s03_ivshmem_read_and_write_multi() {
298298
let build = BuildArgs::default().build();
299-
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0));
300-
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1));
299+
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0), false);
300+
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1), false);
301301
let shmem_size = 2; // in MB
302302

303303
let shmem_sizes = vec![shmem_size; 2];

‎kernel/tests/s06_rackscale_tests.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ fn rackscale_userspace_smoke_test(is_shmem: bool) {
4949

5050
setup_network(2);
5151

52-
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0));
53-
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1));
52+
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0), false);
53+
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1), false);
5454
let mut shmem_server0 = spawn_shmem_server(&shmem_socket0, &shmem_file0, SHMEM_SIZE, None)
5555
.expect("Failed to start shmem server 0");
5656
let mut shmem_server1 = spawn_shmem_server(&shmem_socket1, &shmem_file1, SHMEM_SIZE, None)
@@ -205,8 +205,8 @@ fn s06_rackscale_phys_alloc_test() {
205205

206206
setup_network(2);
207207

208-
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0));
209-
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1));
208+
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0), false);
209+
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1), false);
210210
let mut shmem_server0 = spawn_shmem_server(&shmem_socket0, &shmem_file0, SHMEM_SIZE, None)
211211
.expect("Failed to start shmem server 0");
212212
let mut shmem_server1 = spawn_shmem_server(&shmem_socket1, &shmem_file1, SHMEM_SIZE, None)
@@ -348,8 +348,8 @@ fn rackscale_fs_test(is_shmem: bool) {
348348

349349
setup_network(2);
350350

351-
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0));
352-
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1));
351+
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0), false);
352+
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1), false);
353353
let mut shmem_server0 = spawn_shmem_server(&shmem_socket0, &shmem_file0, SHMEM_SIZE, None)
354354
.expect("Failed to start shmem server 0");
355355
let mut shmem_server1 = spawn_shmem_server(&shmem_socket1, &shmem_file1, SHMEM_SIZE, None)
@@ -490,8 +490,8 @@ fn s06_rackscale_shmem_fs_prop_test() {
490490

491491
setup_network(2);
492492

493-
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0));
494-
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1));
493+
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0), false);
494+
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1), false);
495495
let mut shmem_server0 = spawn_shmem_server(&shmem_socket0, &shmem_file0, shmem_size, None)
496496
.expect("Failed to start shmem server 0");
497497
let mut shmem_server1 = spawn_shmem_server(&shmem_socket1, &shmem_file1, shmem_size, None)
@@ -625,7 +625,7 @@ fn s06_rackscale_shmem_shootdown_test() {
625625
let mut shmem_servers = Vec::new();
626626
let mut shmem_sockets = Vec::new();
627627
for i in 0..(clients + 1) {
628-
let (shmem_socket, shmem_file) = get_shmem_names(Some(i));
628+
let (shmem_socket, shmem_file) = get_shmem_names(Some(i), false);
629629
let shmem_server = spawn_shmem_server(&shmem_socket, &shmem_file, SHMEM_SIZE, None)
630630
.expect("Failed to start shmem server");
631631
shmem_servers.push(shmem_server);
@@ -800,8 +800,8 @@ fn rackscale_userspace_multicore_test(is_shmem: bool) {
800800
setup_network(2);
801801

802802
// Setup ivshmem
803-
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0));
804-
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1));
803+
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0), false);
804+
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1), false);
805805
let mut shmem_server0 = spawn_shmem_server(&shmem_socket0, &shmem_file0, SHMEM_SIZE, None)
806806
.expect("Failed to start shmem server 0");
807807
let mut shmem_server1 = spawn_shmem_server(&shmem_socket1, &shmem_file1, SHMEM_SIZE, None)
@@ -958,9 +958,9 @@ fn s06_rackscale_shmem_userspace_multicore_multiclient() {
958958
let (tx2, rx2) = channel();
959959
let all_outputs = Arc::new(Mutex::new(Vec::new()));
960960

961-
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0));
962-
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1));
963-
let (shmem_socket2, shmem_file2) = get_shmem_names(Some(2));
961+
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0), false);
962+
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1), false);
963+
let (shmem_socket2, shmem_file2) = get_shmem_names(Some(2), false);
964964
let mut shmem_server0 = spawn_shmem_server(&shmem_socket0, &shmem_file0, SHMEM_SIZE, None)
965965
.expect("Failed to start shmem server 0");
966966
let mut shmem_server1 = spawn_shmem_server(&shmem_socket1, &shmem_file1, SHMEM_SIZE, None)
@@ -1195,8 +1195,8 @@ fn rackscale_userspace_rumprt_fs(is_shmem: bool) {
11951195
setup_network(2);
11961196

11971197
// Setup ivshmem file
1198-
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0));
1199-
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1));
1198+
let (shmem_socket0, shmem_file0) = get_shmem_names(Some(0), false);
1199+
let (shmem_socket1, shmem_file1) = get_shmem_names(Some(1), false);
12001200
let mut shmem_server0 = spawn_shmem_server(&shmem_socket0, &shmem_file0, SHMEM_SIZE, None)
12011201
.expect("Failed to start shmem server 0");
12021202
let mut shmem_server1 = spawn_shmem_server(&shmem_socket1, &shmem_file1, SHMEM_SIZE, None)
@@ -1342,7 +1342,7 @@ fn s06_rackscale_controller_shmem_alloc() {
13421342
let mut shmem_servers = Vec::new();
13431343
let mut shmem_sockets = Vec::new();
13441344
for i in 0..(clients + 1) {
1345-
let (shmem_socket, shmem_file) = get_shmem_names(Some(i));
1345+
let (shmem_socket, shmem_file) = get_shmem_names(Some(i), false);
13461346
let shmem_server = spawn_shmem_server(&shmem_socket, &shmem_file, SHMEM_SIZE, None)
13471347
.expect("Failed to start shmem server");
13481348
shmem_servers.push(shmem_server);

‎kernel/tests/s11_rackscale_benchmarks.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ fn rackscale_fxmark_benchmark(is_shmem: bool) {
147147
benchmark
148148
);
149149

150-
let (shmem_socket, shmem_file) = get_shmem_names(None);
150+
let (shmem_socket, shmem_file) =
151+
get_shmem_names(None, cfg!(feature = "affinity-shmem"));
151152
let shmem_affinity = if cfg!(feature = "affinity-shmem") {
152153
Some(0)
153154
} else {
@@ -285,7 +286,8 @@ fn rackscale_fxmark_benchmark(is_shmem: bool) {
285286
} else {
286287
None
287288
};
288-
let (shmem_socket, shmem_file) = get_shmem_names(Some(i));
289+
let (shmem_socket, shmem_file) =
290+
get_shmem_names(Some(i), cfg!(feature = "affinity-shmem"));
289291
let shmem_server =
290292
spawn_shmem_server(&shmem_socket, &shmem_file, shmem_size, shmem_affinity)
291293
.expect("Failed to start shmem server");
@@ -623,7 +625,8 @@ fn rackscale_vmops_benchmark(is_shmem: bool, benchtype: VMOpsBench) {
623625
cores, num_nodes
624626
);
625627

626-
let (shmem_socket, shmem_file) = get_shmem_names(None);
628+
let (shmem_socket, shmem_file) =
629+
get_shmem_names(None, cfg!(feature = "affinity-shmem"));
627630
let shmem_affinity = if cfg!(feature = "affinity-shmem") {
628631
Some(0)
629632
} else {
@@ -784,7 +787,8 @@ fn rackscale_vmops_benchmark(is_shmem: bool, benchtype: VMOpsBench) {
784787
} else {
785788
None
786789
};
787-
let (shmem_socket, shmem_file) = get_shmem_names(Some(i));
790+
let (shmem_socket, shmem_file) =
791+
get_shmem_names(Some(i), cfg!(feature = "affinity-shmem"));
788792
let shmem_server =
789793
spawn_shmem_server(&shmem_socket, &shmem_file, shmem_size, shmem_affinity)
790794
.expect("Failed to start shmem server");

‎kernel/testutils/src/helpers.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ pub fn setup_network(num_nodes: usize) {
5151
network_setup().unwrap();
5252
}
5353

54-
pub fn get_shmem_names(id: Option<usize>) -> (String, String) {
55-
let shmem_path = if cfg!(feature = "affinity-shmem") {
54+
pub fn get_shmem_names(id: Option<usize>, is_affinity: bool) -> (String, String) {
55+
let shmem_path = if is_affinity {
5656
SHMEM_AFFINITY_PATH
5757
} else {
5858
"."

0 commit comments

Comments
 (0)