Skip to content

Commit c8056dc

Browse files
authored
Merge pull request #4390 from zhangsz0516/zhangsz_0226
[update][kernel]规范rt_object_detach的使用
2 parents fae0fa8 + 62137ee commit c8056dc

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

src/thread.c

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -382,19 +382,8 @@ rt_err_t rt_thread_detach(rt_thread_t thread)
382382
/* change stat */
383383
thread->stat = RT_THREAD_CLOSE;
384384

385-
if (rt_object_is_systemobject((rt_object_t)thread) == RT_TRUE)
386-
{
387-
rt_object_detach((rt_object_t)thread);
388-
}
389-
else
390-
{
391-
/* disable interrupt */
392-
lock = rt_hw_interrupt_disable();
393-
/* insert to defunct thread list */
394-
rt_list_insert_after(&rt_thread_defunct, &(thread->tlist));
395-
/* enable interrupt */
396-
rt_hw_interrupt_enable(lock);
397-
}
385+
/* detach thread object */
386+
rt_object_detach((rt_object_t)thread);
398387

399388
return RT_EOK;
400389
}

src/timer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ rt_err_t rt_timer_detach(rt_timer_t timer)
233233
/* enable interrupt */
234234
rt_hw_interrupt_enable(level);
235235

236-
rt_object_detach((rt_object_t)timer);
236+
rt_object_detach(&(timer->parent));
237237

238238
return RT_EOK;
239239
}

0 commit comments

Comments
 (0)