[fix] use put_prev_task in unblock_task

arceos-org · Sep 30, 2024 · 1f7ac39 · 1f7ac39
1 parent 2782e4e
commit 1f7ac39
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/modules/axtask/src/run_queue.rs b/modules/axtask/src/run_queue.rs
@@ -295,7 +295,10 @@ impl<'a, G: BaseGuard> AxRunQueueRef<'a, G> {
             let cpu_id = self.inner.cpu_id;
             debug!("task unblock: {} on run_queue {}", task.id_name(), cpu_id);
             task.set_state(TaskState::Ready);
-            self.inner.scheduler.lock().add_task(task.clone()); // TODO: priority
+            self.inner
+                .scheduler
+                .lock()
+                .put_prev_task(task.clone(), resched); // TODO: priority
 
             // Note: when the task is unblocked on another CPU's run queue,
             // we just ingiore the `resched` flag.

diff --git a/modules/axtask/src/timers.rs b/modules/axtask/src/timers.rs
@@ -31,8 +31,6 @@ impl TimerEvent for TaskWakeupEvent {
         }
 
         // Timer ticket match.
-        // Timer event is triggered, expire the ticket ID.
-        self.task.timer_ticket_expired();
         select_run_queue::<NoOp>(self.task.clone()).unblock_task(self.task, true)
     }
 }