🎈 perf(ktime): perf hrtimer, del wrong function

RT-Thread · Jul 28, 2023 · d1010e2 · d1010e2
1 parent 307e9e5
commit d1010e2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 27 deletions.
diff --git a/components/ktime/inc/ktime.h b/components/ktime/inc/ktime.h
@@ -125,7 +125,6 @@ void     rt_ktime_hrtimer_init(rt_ktime_hrtimer_t timer,
                                rt_uint8_t         flag,
                                void (*timeout)(void *parameter),
                                void *parameter);
-rt_err_t rt_ktime_hrtimer_delete(rt_ktime_hrtimer_t timer);
 rt_err_t rt_ktime_hrtimer_start(rt_ktime_hrtimer_t timer);
 rt_err_t rt_ktime_hrtimer_stop(rt_ktime_hrtimer_t timer);
 rt_err_t rt_ktime_hrtimer_control(rt_ktime_hrtimer_t timer, int cmd, void *arg);

diff --git a/components/ktime/src/hrtimer.c b/components/ktime/src/hrtimer.c
@@ -50,7 +50,9 @@ static void _hrtimer_timeout(void *parameter)
 rt_weak rt_err_t rt_ktime_hrtimer_settimeout(unsigned long cnt, void (*timeout)(void *param), void *param)
 {
     static rt_timer_t timer = RT_NULL;
+    rt_base_t         level;
 
+    level  = rt_spin_lock_irqsave(&_spinlock);
     _outcb = timeout;
     if (cnt == 0)
     {
@@ -61,7 +63,7 @@ rt_weak rt_err_t rt_ktime_hrtimer_settimeout(unsigned long cnt, void (*timeout)(
                 rt_timer_stop(timer);
             }
         }
-
+        rt_spin_unlock_irqrestore(&_spinlock, level);
         if (_outcb)
             _outcb(param);
 
@@ -84,6 +86,7 @@ rt_weak rt_err_t rt_ktime_hrtimer_settimeout(unsigned long cnt, void (*timeout)(
         rt_timer_stop(timer);
     }
     rt_timer_start(timer);
+    rt_spin_unlock_irqrestore(&_spinlock, level);
     return RT_EOK;
 }
 
@@ -197,24 +200,6 @@ void rt_ktime_hrtimer_init(rt_ktime_hrtimer_t timer,
     rt_sem_init(&(timer->sem), "hrtimer", 0, RT_IPC_FLAG_PRIO);
 }
 
-rt_err_t rt_ktime_hrtimer_delete(rt_ktime_hrtimer_t timer)
-{
-    rt_base_t level;
-
-    /* parameter check */
-    RT_ASSERT(timer != RT_NULL);
-
-    level     = rt_spin_lock_irqsave(&_spinlock);
-    _nowtimer = RT_NULL;
-    rt_list_remove(&timer->row);
-    timer->parent.flag &= ~RT_TIMER_FLAG_ACTIVATED; /* stop timer */
-    rt_spin_unlock_irqrestore(&_spinlock, level);
-
-    _set_next_timeout();
-
-    return RT_EOK;
-}
-
 rt_err_t rt_ktime_hrtimer_start(rt_ktime_hrtimer_t timer)
 {
     rt_list_t *timer_list;
@@ -350,15 +335,22 @@ rt_err_t rt_ktime_hrtimer_detach(rt_ktime_hrtimer_t timer)
     /* parameter check */
     RT_ASSERT(timer != RT_NULL);
 
-    level     = rt_spin_lock_irqsave(&_spinlock);
-    _nowtimer = RT_NULL;
-    rt_list_remove(&timer->row);
+    level = rt_spin_lock_irqsave(&_spinlock);
+
     /* stop timer */
     timer->parent.flag &= ~RT_TIMER_FLAG_ACTIVATED;
-    rt_spin_unlock_irqrestore(&_spinlock, level);
-
-    _set_next_timeout();
-
+    /* when interrupted */
+    if (rt_get_errno() == -RT_EINTR)
+    {
+        _nowtimer = RT_NULL;
+        rt_list_remove(&timer->row);
+        rt_spin_unlock_irqrestore(&_spinlock, level);
+        _set_next_timeout();
+    }
+    else
+    {
+        rt_spin_unlock_irqrestore(&_spinlock, level);
+    }
     rt_sem_detach(&(timer->sem));
 
     return RT_EOK;