1 files changed, 45 insertions, 1 deletions

diff --git a/rsnix/src/sched.rs b/rsnix/src/sched.rs
index 0c4938e..107dba6 100644
--- a/rsnix/src/sched.rs
+++ b/rsnix/src/sched.rs
@@ -396,6 +396,31 @@ pub fn spawn(entry: fn(), name: &str) -> Option<usize> {
     if ok { Some(id) } else { None }
 }
 
+/// Reserve an empty task slot without installing a frame.  The slot is
+/// marked Ready-with-no-frame is NOT valid to schedule — callers must
+/// follow with `launch_at` before yielding (exec does both back-to-back
+/// under the preemption lock window of the caller).
+pub fn reserve_slot() -> Option<usize> {
+    lock();
+    let id = unsafe {
+        let mut slot = None;
+        for i in 2..MAX_TASKS {
+            if TASKS[i].state == TaskState::Done && TASKS[i].stack != 0 {
+                reap(i);
+                slot = Some(i);
+                break;
+            }
+            if TASKS[i].state == TaskState::Done && TASKS[i].stack == 0 && TASKS[i].name_len == 0 {
+                slot = Some(i);
+                break;
+            }
+        }
+        slot
+    };
+    unlock();
+    id
+}
+
 unsafe fn reap(id: usize) {
     unsafe {
         let t = &mut TASKS[id];
@@ -408,6 +433,19 @@ unsafe fn reap(id: usize) {
     }
 }
 
+/// Install the initial frame for a reserved slot and mark it Ready.
+/// The slot must have come from `reserve_slot` and must not have been
+/// scheduled in between (exec stores its context between the two calls).
+pub fn launch_at(id: usize, entry: fn(), name: &str) -> bool {
+    if id >= MAX_TASKS {
+        return false;
+    }
+    lock();
+    let ok = spawn_at(id, entry, name);
+    unlock();
+    ok
+}
+
 fn spawn_at(id: usize, entry: fn(), name: &str) -> bool {
     let Some(base) = memory::alloc_pages(STACK_PAGES) else {
         return false;
@@ -483,7 +521,7 @@ unsafe extern "C" fn trampoline(entry: usize) -> ! {
     task_exit()
 }
 
-fn task_exit() -> ! {
+pub fn task_exit() -> ! {
     lock();
     unsafe {
         TASKS[CURRENT].state = TaskState::Done;
@@ -648,6 +686,12 @@ pub fn abort_current(msg: &str) -> ! {
             TASKS[id].stack,
             TASKS[id].guard
         );
+        // An exec'd binary died: unblock the waiting spawner with a
+        // completion message (exit code -1 encoded as u64::MAX).  The
+        // shell's queue is the only waiter; best-effort by design.
+        if id >= 2 {
+            let _ = push_msg(SHELL_TID, TaskMsg::User(u64::MAX));
+        }
         PREEMPT_DEPTH.store(0, Ordering::Relaxed);
     }
     yield_int();