浏览代码

Merge pull request #4390 from zhangsz0516/zhangsz_0226

[update][kernel]规范rt_object_detach的使用
Bernard Xiong 4 年之前
父节点
当前提交
c8056dc7bb
共有 2 个文件被更改,包括 3 次插入14 次删除
  1. 2 13
      src/thread.c
  2. 1 1
      src/timer.c

+ 2 - 13
src/thread.c

@@ -382,19 +382,8 @@ rt_err_t rt_thread_detach(rt_thread_t thread)
     /* change stat */
     thread->stat = RT_THREAD_CLOSE;
 
-    if (rt_object_is_systemobject((rt_object_t)thread) == RT_TRUE)
-    {
-        rt_object_detach((rt_object_t)thread);
-    }
-    else
-    {
-        /* disable interrupt */
-        lock = rt_hw_interrupt_disable();
-        /* insert to defunct thread list */
-        rt_list_insert_after(&rt_thread_defunct, &(thread->tlist));
-        /* enable interrupt */
-        rt_hw_interrupt_enable(lock);
-    }
+    /* detach thread object */
+    rt_object_detach((rt_object_t)thread);
 
     return RT_EOK;
 }

+ 1 - 1
src/timer.c

@@ -233,7 +233,7 @@ rt_err_t rt_timer_detach(rt_timer_t timer)
     /* enable interrupt */
     rt_hw_interrupt_enable(level);
 
-    rt_object_detach((rt_object_t)timer);
+    rt_object_detach(&(timer->parent));
 
     return RT_EOK;
 }