From 2d593a22b780b093f9c87dab4c8fb20139bc233b Mon Sep 17 00:00:00 2001 From: armink Date: Mon, 10 Apr 2017 09:53:45 +0800 Subject: [PATCH] [Kernel] Fix thread delete and thread detach bug. #712 --- src/thread.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/thread.c b/src/thread.c index 0eef331d52..4f7e070e02 100644 --- a/src/thread.c +++ b/src/thread.c @@ -36,6 +36,8 @@ * 2011-09-08 Bernard fixed the scheduling issue in rt_thread_startup. * 2012-12-29 Bernard fixed compiling warning. * 2016-08-09 ArdaFu add thread suspend and resume hook. + * 2017-04-10 armink fixed the rt_thread_delete and rt_thread_detach + bug when thread has not startup. */ #include @@ -297,8 +299,11 @@ rt_err_t rt_thread_detach(rt_thread_t thread) /* thread check */ RT_ASSERT(thread != RT_NULL); - /* remove from schedule */ - rt_schedule_remove_thread(thread); + if (thread->stat != RT_THREAD_INIT) + { + /* remove from schedule */ + rt_schedule_remove_thread(thread); + } /* release thread timer */ rt_timer_detach(&(thread->thread_timer)); @@ -392,8 +397,11 @@ rt_err_t rt_thread_delete(rt_thread_t thread) /* thread check */ RT_ASSERT(thread != RT_NULL); - /* remove from schedule */ - rt_schedule_remove_thread(thread); + if (thread->stat != RT_THREAD_INIT) + { + /* remove from schedule */ + rt_schedule_remove_thread(thread); + } /* release thread timer */ rt_timer_detach(&(thread->thread_timer));