diff options
| author | Bernard Xiong <[email protected]> | 2017-04-10 11:09:20 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-04-10 11:09:20 +0800 |
| commit | 85cdcab4608bc37d1c20581a979fe2d8fa1df26e (patch) | |
| tree | da17b10827cf5d731ee2f707248308dce625ac7e | |
| parent | 1368e014708b66a0a4615b1479e3679f581add2e (diff) | |
| parent | 2d593a22b780b093f9c87dab4c8fb20139bc233b (diff) | |
Merge pull request #713 from armink/fix#712
[Kernel] Fix thread delete and thread detach bug. #712
| -rw-r--r-- | src/thread.c | 16 |
1 files 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 <rtthread.h> @@ -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)); |