libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4381 from mysterywolf/exit 

[kernel]  rt_thread_control() 关闭线程后增加rt_schedule调度
This commit is contained in:
Bernard Xiong 2021-02-24 16:43:00 +08:00 committed by GitHub
parent 06e01da1d5 2b98ac215a
commit 86aec6371a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 79 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/libc/compilers/common/stdlib.c
View File

@ -14,18 +14,10 @@ void __rt_libc_exit(int status)
{ {
rt_thread_t self = rt_thread_self(); rt_thread_t self = rt_thread_self();
#ifdef RT_USING_MODULE
if (dlmodule_self())
{
dlmodule_exit(status);
}
#endif
if (self != RT_NULL) if (self != RT_NULL)
{ {
rt_kprintf("thread:%s exit:%d!\n", self->name, status); rt_kprintf("thread:%s exit:%d!\n", self->name, status);
rt_thread_suspend(self); rt_thread_control(self, RT_THREAD_CTRL_CLOSE, RT_NULL);
rt_schedule();
} }
} }

35
src/thread.c
View File

@ -26,6 +26,7 @@
* bug when thread has not startup. * bug when thread has not startup.
* 2018-11-22 Jesven yield is same to rt_schedule * 2018-11-22 Jesven yield is same to rt_schedule
* add support for tasks bound to cpu * add support for tasks bound to cpu
* 2021-02-24 Meco Man rearrange rt_thread_control() - schedule the thread when close it
*/ */
#include <rthw.h> #include <rthw.h>
@ -671,6 +672,7 @@ rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg)
switch (cmd) switch (cmd)
{ {
case RT_THREAD_CTRL_CHANGE_PRIORITY: case RT_THREAD_CTRL_CHANGE_PRIORITY:
{
/* disable interrupt */ /* disable interrupt */
temp = rt_hw_interrupt_disable(); temp = rt_hw_interrupt_disable();
@ -684,13 +686,13 @@ rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg)
thread->current_priority = *(rt_uint8_t *)arg; thread->current_priority = *(rt_uint8_t *)arg;
/* recalculate priority attribute */ /* recalculate priority attribute */
#if RT_THREAD_PRIORITY_MAX > 32 #if RT_THREAD_PRIORITY_MAX > 32
thread->number = thread->current_priority >> 3; /* 5bit */ thread->number = thread->current_priority >> 3; /* 5bit */
thread->number_mask = 1 << thread->number; thread->number_mask = 1 << thread->number;
thread->high_mask = 1 << (thread->current_priority & 0x07); /* 3bit */ thread->high_mask = 1 << (thread->current_priority & 0x07); /* 3bit */
#else #else
thread->number_mask = 1 << thread->current_priority; thread->number_mask = 1 << thread->current_priority;
#endif #endif
/* insert thread to schedule queue again */ /* insert thread to schedule queue again */
rt_schedule_insert_thread(thread); rt_schedule_insert_thread(thread);
@ -700,36 +702,44 @@ rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg)
thread->current_priority = *(rt_uint8_t *)arg; thread->current_priority = *(rt_uint8_t *)arg;
/* recalculate priority attribute */ /* recalculate priority attribute */
#if RT_THREAD_PRIORITY_MAX > 32 #if RT_THREAD_PRIORITY_MAX > 32
thread->number = thread->current_priority >> 3; /* 5bit */ thread->number = thread->current_priority >> 3; /* 5bit */
thread->number_mask = 1 << thread->number; thread->number_mask = 1 << thread->number;
thread->high_mask = 1 << (thread->current_priority & 0x07); /* 3bit */ thread->high_mask = 1 << (thread->current_priority & 0x07); /* 3bit */
#else #else
thread->number_mask = 1 << thread->current_priority; thread->number_mask = 1 << thread->current_priority;
#endif #endif
} }
/* enable interrupt */ /* enable interrupt */
rt_hw_interrupt_enable(temp); rt_hw_interrupt_enable(temp);
break; break;
}
case RT_THREAD_CTRL_STARTUP: case RT_THREAD_CTRL_STARTUP:
{
return rt_thread_startup(thread); return rt_thread_startup(thread);
}
case RT_THREAD_CTRL_CLOSE: case RT_THREAD_CTRL_CLOSE:
{
rt_err_t rt_err;
if (rt_object_is_systemobject((rt_object_t)thread) == RT_TRUE) if (rt_object_is_systemobject((rt_object_t)thread) == RT_TRUE)
{ {
return rt_thread_detach(thread); rt_err = rt_thread_detach(thread);
} }
#ifdef RT_USING_HEAP #ifdef RT_USING_HEAP
else else
{ {
return rt_thread_delete(thread); rt_err = rt_thread_delete(thread);
}
#endif
rt_schedule();
return rt_err;
} }
#endif
#ifdef RT_USING_SMP #ifdef RT_USING_SMP
case RT_THREAD_CTRL_BIND_CPU: case RT_THREAD_CTRL_BIND_CPU:
{ {
rt_uint8_t cpu; rt_uint8_t cpu;
@ -744,7 +754,8 @@ rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg)
thread->bind_cpu = cpu > RT_CPUS_NR? RT_CPUS_NR : cpu; thread->bind_cpu = cpu > RT_CPUS_NR? RT_CPUS_NR : cpu;
break; break;
} }
#endif /*RT_USING_SMP*/ #endif /*RT_USING_SMP*/
default: default:
break; break;
} }