mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
debug cleanup
This commit is contained in:
parent
2a1552b628
commit
fb502a8073
2 changed files with 6 additions and 5 deletions
|
|
@ -452,7 +452,7 @@ impl Swap {
|
||||||
self.oom_thread_backing =
|
self.oom_thread_backing =
|
||||||
Some(crate::arch::process::Process::with_current(|p| p.current_thread().clone()));
|
Some(crate::arch::process::Process::with_current(|p| p.current_thread().clone()));
|
||||||
|
|
||||||
println!("Entering inline hard OOM handler");
|
#[cfg(feature = "debug-swap")]
|
||||||
crate::arch::process::Process::with_current(|p| {
|
crate::arch::process::Process::with_current(|p| {
|
||||||
println!(
|
println!(
|
||||||
"BEF HARD OOM HANDLER {}.{} sepc: {:x} sstatus: {:x?} satp: {:x?}",
|
"BEF HARD OOM HANDLER {}.{} sepc: {:x} sstatus: {:x?} satp: {:x?}",
|
||||||
|
|
@ -486,7 +486,7 @@ impl Swap {
|
||||||
current_sp = out(reg) current_sp,
|
current_sp = out(reg) current_sp,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
println!(" --> SP extent d'{} bytes", EXCEPTION_STACK_TOP - current_sp);
|
println!(" --> HARD OOM SP extent d'{} bytes", EXCEPTION_STACK_TOP - current_sp);
|
||||||
// make a backup copy of the stack
|
// make a backup copy of the stack
|
||||||
let backup_stack_ptr: usize = self.oom_stack_backing.as_ptr() as usize;
|
let backup_stack_ptr: usize = self.oom_stack_backing.as_ptr() as usize;
|
||||||
let working_stack_end: usize = EXCEPTION_STACK_TOP;
|
let working_stack_end: usize = EXCEPTION_STACK_TOP;
|
||||||
|
|
@ -545,6 +545,7 @@ impl Swap {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "debug-swap")]
|
||||||
crate::arch::process::Process::with_current(|p| {
|
crate::arch::process::Process::with_current(|p| {
|
||||||
println!(
|
println!(
|
||||||
"AFT HARD OOM HANDLER {}.{} sepc: {:x} sstatus: {:x?} satp: {:x?}",
|
"AFT HARD OOM HANDLER {}.{} sepc: {:x} sstatus: {:x?} satp: {:x?}",
|
||||||
|
|
@ -558,7 +559,6 @@ impl Swap {
|
||||||
|
|
||||||
// then restore the smashed thread backing state on return from the syscall
|
// then restore the smashed thread backing state on return from the syscall
|
||||||
crate::arch::process::Process::with_current_mut(|p| {
|
crate::arch::process::Process::with_current_mut(|p| {
|
||||||
println!("Returned from hard OOM handler, current pid {}/tid {}", p.pid().get(), p.current_tid());
|
|
||||||
*p.current_thread_mut() =
|
*p.current_thread_mut() =
|
||||||
self.oom_thread_backing.take().expect("No thread backing was set prior to OOM handler")
|
self.oom_thread_backing.take().expect("No thread backing was set prior to OOM handler")
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1042,10 +1042,11 @@ pub fn handle_inner(pid: PID, tid: TID, in_irq: bool, call: SysCall) -> SysCallR
|
||||||
vaddr,
|
vaddr,
|
||||||
) {
|
) {
|
||||||
Ok(ptr) => Ok(xous_kernel::Result::Scalar5(ptr, 0, 0, 0, 0)),
|
Ok(ptr) => Ok(xous_kernel::Result::Scalar5(ptr, 0, 0, 0, 0)),
|
||||||
Err(e) => {
|
Err(_e) => {
|
||||||
|
#[cfg(feature = "debug-swap")]
|
||||||
println!(
|
println!(
|
||||||
"steal_page rejecting request for pid{}/{:x}: {:?}",
|
"steal_page rejecting request for pid{}/{:x}: {:?}",
|
||||||
target_pid, vaddr, e
|
target_pid, vaddr, _e
|
||||||
);
|
);
|
||||||
Err(xous_kernel::Error::BadAddress)
|
Err(xous_kernel::Error::BadAddress)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue