rawlist use fix: must use an unique &T as rawlist node

Signed-off-by: guoweikang <[email protected]>

modules/axtask/src/wait_queue.rs

@@ -6,9 +6,6 @@ use linked_list_r4l::{def_node, RawList};
 
 use crate::{current_run_queue, select_run_queue, AxTaskRef};
 
-#[cfg(feature = "irq")]
-use crate::CurrentTask;
-
 def_node! {
     pub(crate) struct WaitTaskNode(AxTaskRef);
 }
@@ -55,9 +52,10 @@ impl WaitQueue {
         }
     }
 
+    /// Cancel events by removing the task from the wait queue.
     /// Cancel events by removing the task from the wait queue.
     /// If `from_timer_list` is true, try to remove the task from the timer list.
-    fn cancel_events(&self, waiter: WaitTaskNode, _from_timer_list: bool) {
+    fn cancel_events(&self, waiter: &WaitTaskNode, _from_timer_list: bool) {
         // SAFETY:
         // Waiter is only  defined in the local function scope,
         // therefore, it is not possible in other List.
@@ -69,7 +67,7 @@ impl WaitQueue {
         // Just mark task's current timer ticket ID as expired.
         #[cfg(feature = "irq")]
         if _from_timer_list {
-            waiter.into_inner().timer_ticket_expired();
+            waiter.inner().timer_ticket_expired();
             // Note:
             //  this task is still not removed from timer list of target CPU,
             //  which may cause some redundant timer events because it still needs to
@@ -81,8 +79,8 @@ impl WaitQueue {
     /// Blocks the current task and put it into the wait queue, until other task
     /// notifies it.
     pub fn wait(&self) {
-        let waiter = WaitTaskNode::from_current();
-        current_run_queue::<NoPreemptIrqSave>().blocked_resched(self.list.lock(), &waiter);
+        let waiter = &WaitTaskNode::from_current();
+        current_run_queue::<NoPreemptIrqSave>().blocked_resched(self.list.lock(), waiter);
         self.cancel_events(waiter, false);
     }
 
@@ -95,14 +93,14 @@ impl WaitQueue {
     where
         F: Fn() -> bool,
     {
-        let waiter = WaitTaskNode::from_current();
+        let waiter = &WaitTaskNode::from_current();
         loop {
             let mut rq = current_run_queue::<NoPreemptIrqSave>();
             let wq = self.list.lock();
             if condition() {
                 break;
             }
-            rq.blocked_resched(wq, &waiter);
+            rq.blocked_resched(wq, waiter);
             // Preemption may occur here.
         }
 
@@ -113,7 +111,7 @@ impl WaitQueue {
     /// notify it, or the given duration has elapsed.
     #[cfg(feature = "irq")]
     pub fn wait_timeout(&self, dur: core::time::Duration) -> bool {
-        let waiter = WaitTaskNode::from_current();
+        let waiter = &WaitTaskNode::from_current();
         let mut rq = current_run_queue::<NoPreemptIrqSave>();
         let curr = crate::current();
         let deadline = axhal::time::wall_time() + dur;
@@ -124,7 +122,7 @@ impl WaitQueue {
         );
         crate::timers::set_alarm_wakeup(deadline, curr.clone());
 
-        rq.blocked_resched(self.list.lock(), &waiter);
+        rq.blocked_resched(self.list.lock(), waiter);
 
         let timeout = axhal::time::wall_time() >= deadline;
 
@@ -143,7 +141,7 @@ impl WaitQueue {
     where
         F: Fn() -> bool,
     {
-        let waiter = WaitTaskNode::from_current();
+        let waiter = &WaitTaskNode::from_current();
         let curr = crate::current();
         let deadline = axhal::time::wall_time() + dur;
         debug!(
@@ -159,12 +157,12 @@ impl WaitQueue {
             if axhal::time::wall_time() >= deadline {
                 break;
             }
-            let mut wq = self.list.lock();
+            let wq = self.list.lock();
             if condition() {
                 timeout = false;
                 break;
             }
-            rq.blocked_resched(wq, &waiter);
+            rq.blocked_resched(wq, waiter);
             // Preemption may occur here.
         }