kernel: fix hanging shutdown thread and warnings

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-07-21 16:23:21 +08:00
parent 4130ce7bd1
commit 68691a757d
3 changed files with 20 additions and 23 deletions

View file

@ -166,11 +166,13 @@ fn listen_thread(
let pid1_thread = spawn(move || { let pid1_thread = spawn(move || {
let mut client = TcpStream::connect(client_addr).expect("couldn't connect to xous server"); let mut client = TcpStream::connect(client_addr).expect("couldn't connect to xous server");
client.set_nonblocking(true).expect("pid1: couldn't set nonblocking mode");
let mut buffer = [0; 32]; let mut buffer = [0; 32];
// println!("KERNEL(1): Started PID1 idle thread"); // println!("KERNEL(1): Started PID1 idle thread");
loop { loop {
match client.read(&mut buffer) { match client.read(&mut buffer) {
Ok(0) => return, Ok(0) => return,
Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => std::thread::sleep(Duration::from_millis(100)),
Err(e) => panic!("KERNEL(1): Unable to read buffer: {}", e), Err(e) => panic!("KERNEL(1): Unable to read buffer: {}", e),
Ok(x) => println!("KERNEL(1): Read {} bytes", x), Ok(x) => println!("KERNEL(1): Read {} bytes", x),
} }

View file

@ -718,7 +718,6 @@ impl SystemServices {
new_pid: PID, new_pid: PID,
mut new_tid: TID, mut new_tid: TID,
can_resume: bool, can_resume: bool,
advance_thread: bool,
) -> Result<TID, xous::Error> { ) -> Result<TID, xous::Error> {
// println!("Activating PID {}, context {}", new_pid, new_context); // println!("Activating PID {}, context {}", new_pid, new_context);
let previous_pid = self.current_pid(); let previous_pid = self.current_pid();
@ -859,7 +858,7 @@ impl SystemServices {
// } // }
// return Ok(new_tid); // return Ok(new_tid);
// } // }
let new = self.get_process_mut(new_pid)?; let new = self.get_process_mut(new_pid)?;/*
new.state = match new.state { new.state = match new.state {
ProcessState::Running(x) if (x & 1 << new_tid) == 0 => { ProcessState::Running(x) if (x & 1 << new_tid) == 0 => {
return Err(xous::Error::ProcessNotFound) return Err(xous::Error::ProcessNotFound)
@ -871,11 +870,11 @@ impl SystemServices {
// ProcessState::Running(x | (1 << previous_tid)) // ProcessState::Running(x | (1 << previous_tid))
// } // }
// } // }
other => panic!( other => */panic!(
"PID {} invalid process state (not Running): {:?}", "PID {} invalid process state (not Running): {:?}",
previous_pid, other previous_pid, new.state
), )/*,
}; }*/;
// if advance_thread { // if advance_thread {
// new.current_thread += 1; // new.current_thread += 1;
// if new.current_thread as TID > arch::process::MAX_CONTEXT { // if new.current_thread as TID > arch::process::MAX_CONTEXT {

View file

@ -132,7 +132,7 @@ fn send_message(pid: PID, thread: TID, cid: CID, message: Message) -> SysCallRes
if blocking && cfg!(baremetal) { if blocking && cfg!(baremetal) {
// println!("Activating Server context and switching away from Client"); // println!("Activating Server context and switching away from Client");
ss.activate_process_thread(server_pid, server_tid, !blocking, blocking) ss.activate_process_thread(server_pid, server_tid, !blocking)
.map(|_| Ok(xous::Result::Message(envelope))) .map(|_| Ok(xous::Result::Message(envelope)))
.unwrap_or(Err(xous::Error::ProcessNotFound)) .unwrap_or(Err(xous::Error::ProcessNotFound))
} else if blocking && !cfg!(baremetal) { } else if blocking && !cfg!(baremetal) {
@ -166,7 +166,7 @@ fn send_message(pid: PID, thread: TID, cid: CID, message: Message) -> SysCallRes
let process = ss.get_process(pid).expect("Can't get current process"); let process = ss.get_process(pid).expect("Can't get current process");
let ppid = process.ppid; let ppid = process.ppid;
unsafe { SWITCHTO_CALLER = None }; unsafe { SWITCHTO_CALLER = None };
ss.activate_process_thread(ppid, 0, !blocking, blocking) ss.activate_process_thread(ppid, 0, !blocking)
.map(|_| Ok(xous::Result::ResumeProcess)) .map(|_| Ok(xous::Result::ResumeProcess))
.unwrap_or(Err(xous::Error::ProcessNotFound)) .unwrap_or(Err(xous::Error::ProcessNotFound))
} else { } else {
@ -293,7 +293,8 @@ fn receive_message(pid: PID, tid: TID, sid: SID) -> SysCallResult {
if cfg!(baremetal) { if cfg!(baremetal) {
unsafe { SWITCHTO_CALLER = None }; unsafe { SWITCHTO_CALLER = None };
let ppid = ss.get_process(pid).expect("Can't get current process").ppid; let ppid = ss.get_process(pid).expect("Can't get current process").ppid;
ss.activate_process_thread(ppid, 0, false, true) // TODO: Advance thread
ss.activate_process_thread(ppid, 0, false)
.map(|_| Ok(xous::Result::ResumeProcess)) .map(|_| Ok(xous::Result::ResumeProcess))
.unwrap_or(Err(xous::Error::ProcessNotFound)) .unwrap_or(Err(xous::Error::ProcessNotFound))
} }
@ -306,22 +307,14 @@ fn receive_message(pid: PID, tid: TID, sid: SID) -> SysCallResult {
}) })
} }
pub fn handle( pub fn handle(pid: PID, tid: TID, call: SysCall) -> SysCallResult {
pid: PID,
tid: TID,
call: SysCall,
) -> SysCallResult {
// print!("KERNEL({}:{}): Syscall {:?}", pid, tid, call); // print!("KERNEL({}:{}): Syscall {:?}", pid, tid, call);
let result = handle_inner(pid, tid, call); let result = handle_inner(pid, tid, call);
// println!(" -> {:?}", result); // println!(" -> {:?}", result);
result result
} }
pub fn handle_inner( pub fn handle_inner(pid: PID, tid: TID, call: SysCall) -> SysCallResult {
pid: PID,
tid: TID,
call: SysCall,
) -> SysCallResult {
// let pid = arch::current_pid(); // let pid = arch::current_pid();
match call { match call {
@ -454,7 +447,7 @@ pub fn handle_inner(
); );
SWITCHTO_CALLER = Some((pid, tid)); SWITCHTO_CALLER = Some((pid, tid));
} }
ss.activate_process_thread(new_pid, new_context, true, false) ss.activate_process_thread(new_pid, new_context, true)
.map(|_ctx| { .map(|_ctx| {
// println!("switchto ({}, {})", pid, _ctx); // println!("switchto ({}, {})", pid, _ctx);
xous::Result::ResumeProcess xous::Result::ResumeProcess
@ -476,7 +469,8 @@ pub fn handle_inner(
.expect("yielded when no parent context was present") .expect("yielded when no parent context was present")
}; };
SystemServices::with_mut(|ss| { SystemServices::with_mut(|ss| {
ss.activate_process_thread(parent_pid, parent_ctx, true, true) // TODO: Advance thread
ss.activate_process_thread(parent_pid, parent_ctx, true)
.map(|_| Ok(xous::Result::ResumeProcess)) .map(|_| Ok(xous::Result::ResumeProcess))
.unwrap_or(Err(xous::Error::ProcessNotFound)) .unwrap_or(Err(xous::Error::ProcessNotFound))
}) })
@ -498,7 +492,8 @@ pub fn handle_inner(
let process = ss.get_process(pid).expect("Can't get current process"); let process = ss.get_process(pid).expect("Can't get current process");
let ppid = process.ppid; let ppid = process.ppid;
unsafe { SWITCHTO_CALLER = None }; unsafe { SWITCHTO_CALLER = None };
ss.activate_process_thread(ppid, 0, false, true) // TODO: Advance thread
ss.activate_process_thread(ppid, 0, false)
.map(|_| Ok(xous::Result::ResumeProcess)) .map(|_| Ok(xous::Result::ResumeProcess))
.unwrap_or(Err(xous::Error::ProcessNotFound)) .unwrap_or(Err(xous::Error::ProcessNotFound))
}), }),
@ -506,7 +501,8 @@ pub fn handle_inner(
#[allow(clippy::unit_arg)] #[allow(clippy::unit_arg)]
ss.create_thread(pid, thread_init).map(|new_tid| { ss.create_thread(pid, thread_init).map(|new_tid| {
if !cfg!(baremetal) { if !cfg!(baremetal) {
ss.switch_to_thread(pid, Some(new_tid)).expect("couldn't activate new thread"); ss.switch_to_thread(pid, Some(new_tid))
.expect("couldn't activate new thread");
} }
xous::Result::ThreadID(new_tid) xous::Result::ThreadID(new_tid)
}) })