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();
} }
} }

145
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>
@ -670,83 +671,93 @@ 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 */
temp = rt_hw_interrupt_disable();
/* for ready thread, change queue */
if ((thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_READY)
{ {
/* remove thread from schedule queue first */ /* disable interrupt */
rt_schedule_remove_thread(thread); temp = rt_hw_interrupt_disable();
/* change thread priority */ /* for ready thread, change queue */
thread->current_priority = *(rt_uint8_t *)arg; if ((thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_READY)
{
/* remove thread from schedule queue first */
rt_schedule_remove_thread(thread);
/* recalculate priority attribute */ /* change thread priority */
#if RT_THREAD_PRIORITY_MAX > 32 thread->current_priority = *(rt_uint8_t *)arg;
thread->number = thread->current_priority >> 3; /* 5bit */
thread->number_mask = 1 << thread->number;
thread->high_mask = 1 << (thread->current_priority & 0x07); /* 3bit */
#else
thread->number_mask = 1 << thread->current_priority;
#endif
/* insert thread to schedule queue again */ /* recalculate priority attribute */
rt_schedule_insert_thread(thread); #if RT_THREAD_PRIORITY_MAX > 32
} thread->number = thread->current_priority >> 3; /* 5bit */
else thread->number_mask = 1 << thread->number;
{ thread->high_mask = 1 << (thread->current_priority & 0x07); /* 3bit */
thread->current_priority = *(rt_uint8_t *)arg; #else
thread->number_mask = 1 << thread->current_priority;
#endif
/* recalculate priority attribute */ /* insert thread to schedule queue again */
#if RT_THREAD_PRIORITY_MAX > 32 rt_schedule_insert_thread(thread);
thread->number = thread->current_priority >> 3; /* 5bit */ }
thread->number_mask = 1 << thread->number; else
thread->high_mask = 1 << (thread->current_priority & 0x07); /* 3bit */ {
#else thread->current_priority = *(rt_uint8_t *)arg;
thread->number_mask = 1 << thread->current_priority;
#endif /* recalculate priority attribute */
#if RT_THREAD_PRIORITY_MAX > 32
thread->number = thread->current_priority >> 3; /* 5bit */
thread->number_mask = 1 << thread->number;
thread->high_mask = 1 << (thread->current_priority & 0x07); /* 3bit */
#else
thread->number_mask = 1 << thread->current_priority;
#endif
}
/* enable interrupt */
rt_hw_interrupt_enable(temp);
break;
} }
/* enable interrupt */ case RT_THREAD_CTRL_STARTUP:
rt_hw_interrupt_enable(temp);
break;
case RT_THREAD_CTRL_STARTUP:
return rt_thread_startup(thread);
case RT_THREAD_CTRL_CLOSE:
if (rt_object_is_systemobject((rt_object_t)thread) == RT_TRUE)
{ {
return rt_thread_detach(thread); return rt_thread_startup(thread);
}
#ifdef RT_USING_HEAP
else
{
return rt_thread_delete(thread);
}
#endif
#ifdef RT_USING_SMP
case RT_THREAD_CTRL_BIND_CPU:
{
rt_uint8_t cpu;
if ((thread->stat & RT_THREAD_STAT_MASK) != RT_THREAD_INIT)
{
/* we only support bind cpu before started phase. */
return RT_ERROR;
} }
cpu = (rt_uint8_t)(size_t)arg; case RT_THREAD_CTRL_CLOSE:
thread->bind_cpu = cpu > RT_CPUS_NR? RT_CPUS_NR : cpu; {
break; rt_err_t rt_err;
}
#endif /*RT_USING_SMP*/ if (rt_object_is_systemobject((rt_object_t)thread) == RT_TRUE)
default: {
break; rt_err = rt_thread_detach(thread);
}
#ifdef RT_USING_HEAP
else
{
rt_err = rt_thread_delete(thread);
}
#endif
rt_schedule();
return rt_err;
}
#ifdef RT_USING_SMP
case RT_THREAD_CTRL_BIND_CPU:
{
rt_uint8_t cpu;
if ((thread->stat & RT_THREAD_STAT_MASK) != RT_THREAD_INIT)
{
/* we only support bind cpu before started phase. */
return RT_ERROR;
}
cpu = (rt_uint8_t)(size_t)arg;
thread->bind_cpu = cpu > RT_CPUS_NR? RT_CPUS_NR : cpu;
break;
}
#endif /*RT_USING_SMP*/
default:
break;
} }
return RT_EOK; return RT_EOK;