fix(epoll)

TODO: Cleanup the task state enum.

Signed-off-by: Anhad Singh <[email protected]>

Author: Andy-Python-Programmer

src/aero_kernel/src/fs/epoll.rs

@@ -25,6 +25,7 @@ use alloc::sync::Arc;
 use hashbrown::HashMap;
 
 use crate::userland::scheduler;
+use crate::userland::task::TaskState;
 use crate::utils::sync::Mutex;
 
 use super::inode::{INodeInterface, PollTable};
@@ -193,9 +194,10 @@ impl EPoll {
         }
 
         'search: loop {
-            scheduler::get_scheduler().inner.await_io()?;
-
-            if current_task.load_sleep_duration() == 0 && timeout > 0 {
+            if current_task.state() == TaskState::AwaitingIoDeadline
+                && current_task.load_sleep_duration() == 0
+                && timeout > 0
+            {
                 // Timeout has expired.
                 return Ok(0);
             }
@@ -224,6 +226,8 @@ impl EPoll {
                     n = 1;
                     break 'search;
                 }
+
+                scheduler::get_scheduler().inner.await_io()?;
             }
         }
 

src/aero_kernel/src/userland/scheduler/round_robin.rs

@@ -80,7 +80,7 @@ impl TaskQueue {
     fn push_deadline_awaiting(&mut self, task: Arc<Task>, duration: usize) {
         debug_assert!(!task.link.is_linked()); // Make sure the task is not already linked
 
-        task.update_state(TaskState::AwaitingIo);
+        task.update_state(TaskState::AwaitingIoDeadline);
         task.set_sleep_duration(crate::arch::time::get_uptime_ticks() + duration);
 
         self.deadline_awaiting.push_back(task);
@@ -214,8 +214,8 @@ impl SchedulerInterface for RoundRobin {
         let _guard = IrqGuard::new();
         let queue = self.queue.get_mut();
 
-        if task.state() == TaskState::AwaitingIo {
-            let mut cursor = if task.load_sleep_duration() > 0 {
+        if task.state() == TaskState::AwaitingIo || task.state() == TaskState::AwaitingIoDeadline {
+            let mut cursor = if task.state() == TaskState::AwaitingIoDeadline {
                 unsafe { queue.deadline_awaiting.cursor_mut_from_ptr(task.as_ref()) }
             } else {
                 unsafe { queue.awaiting.cursor_mut_from_ptr(task.as_ref()) }

src/aero_kernel/src/userland/task/mod.rs

@@ -73,6 +73,7 @@ pub enum TaskState {
     Runnable,
     Zombie,
     AwaitingIo,
+    AwaitingIoDeadline,
 }
 
 impl From<u8> for TaskState {
@@ -81,6 +82,7 @@ impl From<u8> for TaskState {
             0 => TaskState::Runnable,
             1 => TaskState::Zombie,
             2 => TaskState::AwaitingIo,
+            3 => TaskState::AwaitingIoDeadline,
             _ => panic!("invalid task state"),
         }
     }