From f925011ea24991dded234d9a4781afd5986f7ce3 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 28 Jul 2020 14:03:44 +0800 Subject: [PATCH] kernel: fix multiple contexts test Signed-off-by: Sean Cross --- kernel/src/arch/hosted/process.rs | 10 +++++----- kernel/src/test.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/src/arch/hosted/process.rs b/kernel/src/arch/hosted/process.rs index ff103cdc3..8132cd51c 100644 --- a/kernel/src/arch/hosted/process.rs +++ b/kernel/src/arch/hosted/process.rs @@ -28,7 +28,7 @@ struct ProcessImpl { /// This enables the kernel to keep track of threads in the /// target process, and know which threads are ready to /// receive messages. - threads: [Thread; MAX_THREAD], + threads: [Thread; MAX_THREAD + 1], /// The currently-active thread for this process current_thread: TID, @@ -151,9 +151,9 @@ impl Process { pub fn setup_thread(&mut self, thread: TID, _setup: ThreadInit) -> Result<(), xous::Error> { // println!( - // "KERNEL({}): Setting up context {} @ {:?}", + // "KERNEL({}): Setting up thread {} @ {:?}", // self.pid, - // context, + // thread, // std::thread::current() // ); assert!(thread > 0); @@ -206,7 +206,7 @@ impl Process { let current_pid_idx = process_table.current.get() as usize - 1; let process = &mut process_table.table[current_pid_idx].as_mut().unwrap(); for (index, thread) in process.threads.iter().enumerate() { - if index != 0 && !thread.allocated { + if !thread.allocated { return Some(index as TID + 1); } } @@ -269,7 +269,7 @@ impl Process { key: init_data.key, memory_to_return: None, current_thread: INITIAL_TID, - threads: [Thread { allocated: false }; MAX_THREAD], + threads: [Thread { allocated: false }; MAX_THREAD + 1], }; if pid_idx >= process_table.table.len() { diff --git a/kernel/src/test.rs b/kernel/src/test.rs index c96d3b8c6..04f6217f1 100644 --- a/kernel/src/test.rs +++ b/kernel/src/test.rs @@ -486,7 +486,7 @@ fn multiple_contexts() { }; let mut server_threads = vec![]; - for _ in 0..30 { + for _ in 0..crate::arch::process::MAX_THREAD { server_threads.push( xous::create_thread(move || { let msg = xous::receive_message(server).expect("couldn't receive message");