mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
kernel: main: simplify process search
The process search now uses iterators properly. It's still not ideal because it needs to investigate every process, but it's better than it was. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
7f7142d948
commit
a75d030d77
1 changed files with 12 additions and 26 deletions
|
|
@ -49,7 +49,11 @@ fn handle_panic(_arg: &PanicInfo) -> ! {
|
||||||
/// # Safety
|
/// # Safety
|
||||||
///
|
///
|
||||||
/// This is safe to call only to initialize the kernel.
|
/// This is safe to call only to initialize the kernel.
|
||||||
pub unsafe extern "C" fn init(arg_offset: *const u32, init_offset: *const u32, rpt_offset: *mut u32) {
|
pub unsafe extern "C" fn init(
|
||||||
|
arg_offset: *const u32,
|
||||||
|
init_offset: *const u32,
|
||||||
|
rpt_offset: *mut u32,
|
||||||
|
) {
|
||||||
args::KernelArguments::init(arg_offset);
|
args::KernelArguments::init(arg_offset);
|
||||||
let args = args::KernelArguments::get();
|
let args = args::KernelArguments::get();
|
||||||
// Everything needs memory, so the first thing we should do is initialize the memory manager.
|
// Everything needs memory, so the first thing we should do is initialize the memory manager.
|
||||||
|
|
@ -79,33 +83,15 @@ fn next_pid_to_run(last_pid: Option<PID>) -> Option<PID> {
|
||||||
// PIDs are 1-indexed but arrays are 0-indexed. By not subtracting
|
// PIDs are 1-indexed but arrays are 0-indexed. By not subtracting
|
||||||
// 1 from the PID when we use it as an array index, we automatically
|
// 1 from the PID when we use it as an array index, we automatically
|
||||||
// pick the next process in the list.
|
// pick the next process in the list.
|
||||||
let current_pid = last_pid.unwrap_or(unsafe { PID::new_unchecked(1) }).get() as usize;
|
let next_pid = last_pid.map(|v| v.get() as usize).unwrap_or(1);
|
||||||
|
|
||||||
SystemServices::with(|system_services| {
|
SystemServices::with(|system_services| {
|
||||||
for test_idx in current_pid..system_services.processes.len() {
|
for process in system_services.processes[next_pid..]
|
||||||
if system_services.processes[test_idx].ppid.get() == 1 {
|
.iter()
|
||||||
// print!("PID {} is owned by PID1... ", test_idx + 1);
|
.chain(system_services.processes[..next_pid].iter())
|
||||||
if system_services.processes[test_idx].runnable() {
|
{
|
||||||
// println!(" and is runnable");
|
if process.runnable() {
|
||||||
return match pid_from_usize(test_idx + 1) {
|
return Some(process.pid);
|
||||||
Ok(x) => Some(x),
|
|
||||||
Err(_) => None,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
// println!(" and is NOT RUNNABLE");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for test_idx in 0..current_pid {
|
|
||||||
if system_services.processes[test_idx].ppid.get() == 1 {
|
|
||||||
// print!("PID {} is owned by PID1... ", test_idx + 1);
|
|
||||||
if system_services.processes[test_idx].runnable() {
|
|
||||||
// println!(" and is runnable");
|
|
||||||
return match pid_from_usize(test_idx + 1) {
|
|
||||||
Ok(x) => Some(x),
|
|
||||||
Err(_) => None,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
// println!(" and is NOT RUNNABLE");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
None
|
None
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue