libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[kernel] 规范内核内部函数命名

This commit is contained in:
Meco Man 2021-06-04 00:34:27 +08:00
parent e0b66ccab8
commit 076941612a
3 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/idle.c
View File

@ -129,7 +129,7 @@ rt_err_t rt_thread_idle_delhook(void (*hook)(void))
#ifdef RT_USING_HEAP #ifdef RT_USING_HEAP
/* Return whether there is defunctional thread to be deleted. */ /* Return whether there is defunctional thread to be deleted. */
rt_inline int _has_defunct_thread(void) rt_inline int _rt_has_defunct_thread(void)
{ {
/* The rt_list_isempty has prototype of "int rt_list_isempty(const rt_list_t *l)". /* The rt_list_isempty has prototype of "int rt_list_isempty(const rt_list_t *l)".
* So the compiler has a good reason that the rt_thread_defunct list does * So the compiler has a good reason that the rt_thread_defunct list does
@ -165,7 +165,7 @@ void rt_thread_idle_excute(void)
lock = rt_hw_interrupt_disable(); lock = rt_hw_interrupt_disable();
/* check whether list is empty */ /* check whether list is empty */
if (!_has_defunct_thread()) if (!_rt_has_defunct_thread())
{ {
rt_hw_interrupt_enable(lock); rt_hw_interrupt_enable(lock);
break; break;

102
src/ipc.c
View File

@ -64,7 +64,7 @@ extern void (*rt_object_put_hook)(struct rt_object *object);
* *
* @return the operation status, RT_EOK on successful * @return the operation status, RT_EOK on successful
*/ */
rt_inline rt_err_t rt_ipc_object_init(struct rt_ipc_object *ipc) rt_inline rt_err_t _rt_ipc_object_init(struct rt_ipc_object *ipc)
{ {
/* initialize ipc object */ /* initialize ipc object */
rt_list_init(&(ipc->suspend_thread)); rt_list_init(&(ipc->suspend_thread));
@ -83,7 +83,7 @@ rt_inline rt_err_t rt_ipc_object_init(struct rt_ipc_object *ipc)
* *
* @return the operation status, RT_EOK on successful * @return the operation status, RT_EOK on successful
*/ */
rt_inline rt_err_t rt_ipc_list_suspend(rt_list_t *list, rt_inline rt_err_t _rt_ipc_list_suspend(rt_list_t *list,
struct rt_thread *thread, struct rt_thread *thread,
rt_uint8_t flag) rt_uint8_t flag)
{ {
@ -141,7 +141,7 @@ rt_inline rt_err_t rt_ipc_list_suspend(rt_list_t *list,
* *
* @return the operation status, RT_EOK on successful * @return the operation status, RT_EOK on successful
*/ */
rt_inline rt_err_t rt_ipc_list_resume(rt_list_t *list) rt_inline rt_err_t _rt_ipc_list_resume(rt_list_t *list)
{ {
struct rt_thread *thread; struct rt_thread *thread;
@ -164,7 +164,7 @@ rt_inline rt_err_t rt_ipc_list_resume(rt_list_t *list)
* *
* @return the operation status, RT_EOK on successful * @return the operation status, RT_EOK on successful
*/ */
rt_inline rt_err_t rt_ipc_list_resume_all(rt_list_t *list) rt_inline rt_err_t _rt_ipc_list_resume_all(rt_list_t *list)
{ {
struct rt_thread *thread; struct rt_thread *thread;
register rt_ubase_t temp; register rt_ubase_t temp;
@ -202,7 +202,7 @@ rt_inline rt_err_t rt_ipc_list_resume_all(rt_list_t *list)
* *
* @return the highest priority * @return the highest priority
*/ */
rt_uint8_t rt_ipc_get_highest_priority(rt_list_t *list) rt_uint8_t _rt_ipc_get_highest_priority(rt_list_t *list)
{ {
struct rt_list_node *n; struct rt_list_node *n;
struct rt_thread *sthread; struct rt_thread *sthread;
@ -243,7 +243,7 @@ rt_err_t rt_sem_init(rt_sem_t sem,
rt_object_init(&(sem->parent.parent), RT_Object_Class_Semaphore, name); rt_object_init(&(sem->parent.parent), RT_Object_Class_Semaphore, name);
/* initialize ipc object */ /* initialize ipc object */
rt_ipc_object_init(&(sem->parent)); _rt_ipc_object_init(&(sem->parent));
/* set initial value */ /* set initial value */
sem->value = (rt_uint16_t)value; sem->value = (rt_uint16_t)value;
@ -272,7 +272,7 @@ rt_err_t rt_sem_detach(rt_sem_t sem)
RT_ASSERT(rt_object_is_systemobject(&sem->parent.parent)); RT_ASSERT(rt_object_is_systemobject(&sem->parent.parent));
/* wakeup all suspended threads */ /* wakeup all suspended threads */
rt_ipc_list_resume_all(&(sem->parent.suspend_thread)); _rt_ipc_list_resume_all(&(sem->parent.suspend_thread));
/* detach semaphore object */ /* detach semaphore object */
rt_object_detach(&(sem->parent.parent)); rt_object_detach(&(sem->parent.parent));
@ -306,7 +306,7 @@ rt_sem_t rt_sem_create(const char *name, rt_uint32_t value, rt_uint8_t flag)
return sem; return sem;
/* initialize ipc object */ /* initialize ipc object */
rt_ipc_object_init(&(sem->parent)); _rt_ipc_object_init(&(sem->parent));
/* set initial value */ /* set initial value */
sem->value = value; sem->value = value;
@ -337,7 +337,7 @@ rt_err_t rt_sem_delete(rt_sem_t sem)
RT_ASSERT(rt_object_is_systemobject(&sem->parent.parent) == RT_FALSE); RT_ASSERT(rt_object_is_systemobject(&sem->parent.parent) == RT_FALSE);
/* wakeup all suspended threads */ /* wakeup all suspended threads */
rt_ipc_list_resume_all(&(sem->parent.suspend_thread)); _rt_ipc_list_resume_all(&(sem->parent.suspend_thread));
/* delete semaphore object */ /* delete semaphore object */
rt_object_delete(&(sem->parent.parent)); rt_object_delete(&(sem->parent.parent));
@ -408,7 +408,7 @@ rt_err_t rt_sem_take(rt_sem_t sem, rt_int32_t time)
thread->name)); thread->name));
/* suspend thread */ /* suspend thread */
rt_ipc_list_suspend(&(sem->parent.suspend_thread), _rt_ipc_list_suspend(&(sem->parent.suspend_thread),
thread, thread,
sem->parent.parent.flag); sem->parent.parent.flag);
@ -489,7 +489,7 @@ rt_err_t rt_sem_release(rt_sem_t sem)
if (!rt_list_isempty(&sem->parent.suspend_thread)) if (!rt_list_isempty(&sem->parent.suspend_thread))
{ {
/* resume the suspended thread */ /* resume the suspended thread */
rt_ipc_list_resume(&(sem->parent.suspend_thread)); _rt_ipc_list_resume(&(sem->parent.suspend_thread));
need_schedule = RT_TRUE; need_schedule = RT_TRUE;
} }
else else
@ -543,7 +543,7 @@ rt_err_t rt_sem_control(rt_sem_t sem, int cmd, void *arg)
level = rt_hw_interrupt_disable(); level = rt_hw_interrupt_disable();
/* resume all waiting thread */ /* resume all waiting thread */
rt_ipc_list_resume_all(&sem->parent.suspend_thread); _rt_ipc_list_resume_all(&sem->parent.suspend_thread);
/* set new value */ /* set new value */
sem->value = (rt_uint16_t)value; sem->value = (rt_uint16_t)value;
@ -581,7 +581,7 @@ rt_err_t rt_mutex_init(rt_mutex_t mutex, const char *name, rt_uint8_t flag)
rt_object_init(&(mutex->parent.parent), RT_Object_Class_Mutex, name); rt_object_init(&(mutex->parent.parent), RT_Object_Class_Mutex, name);
/* initialize ipc object */ /* initialize ipc object */
rt_ipc_object_init(&(mutex->parent)); _rt_ipc_object_init(&(mutex->parent));
mutex->value = 1; mutex->value = 1;
mutex->owner = RT_NULL; mutex->owner = RT_NULL;
@ -612,7 +612,7 @@ rt_err_t rt_mutex_detach(rt_mutex_t mutex)
RT_ASSERT(rt_object_is_systemobject(&mutex->parent.parent)); RT_ASSERT(rt_object_is_systemobject(&mutex->parent.parent));
/* wakeup all suspended threads */ /* wakeup all suspended threads */
rt_ipc_list_resume_all(&(mutex->parent.suspend_thread)); _rt_ipc_list_resume_all(&(mutex->parent.suspend_thread));
/* detach semaphore object */ /* detach semaphore object */
rt_object_detach(&(mutex->parent.parent)); rt_object_detach(&(mutex->parent.parent));
@ -644,7 +644,7 @@ rt_mutex_t rt_mutex_create(const char *name, rt_uint8_t flag)
return mutex; return mutex;
/* initialize ipc object */ /* initialize ipc object */
rt_ipc_object_init(&(mutex->parent)); _rt_ipc_object_init(&(mutex->parent));
mutex->value = 1; mutex->value = 1;
mutex->owner = RT_NULL; mutex->owner = RT_NULL;
@ -677,7 +677,7 @@ rt_err_t rt_mutex_delete(rt_mutex_t mutex)
RT_ASSERT(rt_object_is_systemobject(&mutex->parent.parent) == RT_FALSE); RT_ASSERT(rt_object_is_systemobject(&mutex->parent.parent) == RT_FALSE);
/* wakeup all suspended threads */ /* wakeup all suspended threads */
rt_ipc_list_resume_all(&(mutex->parent.suspend_thread)); _rt_ipc_list_resume_all(&(mutex->parent.suspend_thread));
/* delete mutex object */ /* delete mutex object */
rt_object_delete(&(mutex->parent.parent)); rt_object_delete(&(mutex->parent.parent));
@ -791,7 +791,7 @@ __again:
} }
/* suspend current thread */ /* suspend current thread */
rt_ipc_list_suspend(&(mutex->parent.suspend_thread), _rt_ipc_list_suspend(&(mutex->parent.suspend_thread),
thread, thread,
mutex->parent.parent.flag); mutex->parent.parent.flag);
@ -938,7 +938,7 @@ rt_err_t rt_mutex_release(rt_mutex_t mutex)
* 2.The priority of the thread to be resumed is not equal to the * 2.The priority of the thread to be resumed is not equal to the
* highest priority in the queue; * highest priority in the queue;
*/ */
max_priority_in_queue = rt_ipc_get_highest_priority(&mutex->parent.suspend_thread); max_priority_in_queue = _rt_ipc_get_highest_priority(&mutex->parent.suspend_thread);
if (mutex->parent.parent.flag == RT_IPC_FLAG_FIFO && if (mutex->parent.parent.flag == RT_IPC_FLAG_FIFO &&
thread->current_priority != max_priority_in_queue) thread->current_priority != max_priority_in_queue)
{ {
@ -958,7 +958,7 @@ rt_err_t rt_mutex_release(rt_mutex_t mutex)
} }
/* resume thread */ /* resume thread */
rt_ipc_list_resume(&(mutex->parent.suspend_thread)); _rt_ipc_list_resume(&(mutex->parent.suspend_thread));
need_schedule = RT_TRUE; need_schedule = RT_TRUE;
} }
@ -1035,7 +1035,7 @@ rt_err_t rt_event_init(rt_event_t event, const char *name, rt_uint8_t flag)
event->parent.parent.flag = flag; event->parent.parent.flag = flag;
/* initialize ipc object */ /* initialize ipc object */
rt_ipc_object_init(&(event->parent)); _rt_ipc_object_init(&(event->parent));
/* initialize event */ /* initialize event */
event->set = 0; event->set = 0;
@ -1059,7 +1059,7 @@ rt_err_t rt_event_detach(rt_event_t event)
RT_ASSERT(rt_object_is_systemobject(&event->parent.parent)); RT_ASSERT(rt_object_is_systemobject(&event->parent.parent));
/* resume all suspended thread */ /* resume all suspended thread */
rt_ipc_list_resume_all(&(event->parent.suspend_thread)); _rt_ipc_list_resume_all(&(event->parent.suspend_thread));
/* detach event object */ /* detach event object */
rt_object_detach(&(event->parent.parent)); rt_object_detach(&(event->parent.parent));
@ -1092,7 +1092,7 @@ rt_event_t rt_event_create(const char *name, rt_uint8_t flag)
event->parent.parent.flag = flag; event->parent.parent.flag = flag;
/* initialize ipc object */ /* initialize ipc object */
rt_ipc_object_init(&(event->parent)); _rt_ipc_object_init(&(event->parent));
/* initialize event */ /* initialize event */
event->set = 0; event->set = 0;
@ -1118,7 +1118,7 @@ rt_err_t rt_event_delete(rt_event_t event)
RT_DEBUG_NOT_IN_INTERRUPT; RT_DEBUG_NOT_IN_INTERRUPT;
/* resume all suspended thread */ /* resume all suspended thread */
rt_ipc_list_resume_all(&(event->parent.suspend_thread)); _rt_ipc_list_resume_all(&(event->parent.suspend_thread));
/* delete event object */ /* delete event object */
rt_object_delete(&(event->parent.parent)); rt_object_delete(&(event->parent.parent));
@ -1321,7 +1321,7 @@ rt_err_t rt_event_recv(rt_event_t event,
thread->event_info = option; thread->event_info = option;
/* put thread to suspended thread list */ /* put thread to suspended thread list */
rt_ipc_list_suspend(&(event->parent.suspend_thread), _rt_ipc_list_suspend(&(event->parent.suspend_thread),
thread, thread,
event->parent.parent.flag); event->parent.parent.flag);
@ -1387,7 +1387,7 @@ rt_err_t rt_event_control(rt_event_t event, int cmd, void *arg)
level = rt_hw_interrupt_disable(); level = rt_hw_interrupt_disable();
/* resume all waiting thread */ /* resume all waiting thread */
rt_ipc_list_resume_all(&event->parent.suspend_thread); _rt_ipc_list_resume_all(&event->parent.suspend_thread);
/* initialize event set */ /* initialize event set */
event->set = 0; event->set = 0;
@ -1433,7 +1433,7 @@ rt_err_t rt_mb_init(rt_mailbox_t mb,
mb->parent.parent.flag = flag; mb->parent.parent.flag = flag;
/* initialize ipc object */ /* initialize ipc object */
rt_ipc_object_init(&(mb->parent)); _rt_ipc_object_init(&(mb->parent));
/* initialize mailbox */ /* initialize mailbox */
mb->msg_pool = (rt_ubase_t *)msgpool; mb->msg_pool = (rt_ubase_t *)msgpool;
@ -1464,9 +1464,9 @@ rt_err_t rt_mb_detach(rt_mailbox_t mb)
RT_ASSERT(rt_object_is_systemobject(&mb->parent.parent)); RT_ASSERT(rt_object_is_systemobject(&mb->parent.parent));
/* resume all suspended thread */ /* resume all suspended thread */
rt_ipc_list_resume_all(&(mb->parent.suspend_thread)); _rt_ipc_list_resume_all(&(mb->parent.suspend_thread));
/* also resume all mailbox private suspended thread */ /* also resume all mailbox private suspended thread */
rt_ipc_list_resume_all(&(mb->suspend_sender_thread)); _rt_ipc_list_resume_all(&(mb->suspend_sender_thread));
/* detach mailbox object */ /* detach mailbox object */
rt_object_detach(&(mb->parent.parent)); rt_object_detach(&(mb->parent.parent));
@ -1500,7 +1500,7 @@ rt_mailbox_t rt_mb_create(const char *name, rt_size_t size, rt_uint8_t flag)
mb->parent.parent.flag = flag; mb->parent.parent.flag = flag;
/* initialize ipc object */ /* initialize ipc object */
rt_ipc_object_init(&(mb->parent)); _rt_ipc_object_init(&(mb->parent));
/* initialize mailbox */ /* initialize mailbox */
mb->size = size; mb->size = size;
@ -1540,10 +1540,10 @@ rt_err_t rt_mb_delete(rt_mailbox_t mb)
RT_ASSERT(rt_object_is_systemobject(&mb->parent.parent) == RT_FALSE); RT_ASSERT(rt_object_is_systemobject(&mb->parent.parent) == RT_FALSE);
/* resume all suspended thread */ /* resume all suspended thread */
rt_ipc_list_resume_all(&(mb->parent.suspend_thread)); _rt_ipc_list_resume_all(&(mb->parent.suspend_thread));
/* also resume all mailbox private suspended thread */ /* also resume all mailbox private suspended thread */
rt_ipc_list_resume_all(&(mb->suspend_sender_thread)); _rt_ipc_list_resume_all(&(mb->suspend_sender_thread));
/* free mailbox pool */ /* free mailbox pool */
RT_KERNEL_FREE(mb->msg_pool); RT_KERNEL_FREE(mb->msg_pool);
@ -1612,7 +1612,7 @@ rt_err_t rt_mb_send_wait(rt_mailbox_t mb,
RT_DEBUG_IN_THREAD_CONTEXT; RT_DEBUG_IN_THREAD_CONTEXT;
/* suspend current thread */ /* suspend current thread */
rt_ipc_list_suspend(&(mb->suspend_sender_thread), _rt_ipc_list_suspend(&(mb->suspend_sender_thread),
thread, thread,
mb->parent.parent.flag); mb->parent.parent.flag);
@ -1679,7 +1679,7 @@ rt_err_t rt_mb_send_wait(rt_mailbox_t mb,
/* resume suspended thread */ /* resume suspended thread */
if (!rt_list_isempty(&mb->parent.suspend_thread)) if (!rt_list_isempty(&mb->parent.suspend_thread))
{ {
rt_ipc_list_resume(&(mb->parent.suspend_thread)); _rt_ipc_list_resume(&(mb->parent.suspend_thread));
/* enable interrupt */ /* enable interrupt */
rt_hw_interrupt_enable(temp); rt_hw_interrupt_enable(temp);
@ -1760,7 +1760,7 @@ rt_err_t rt_mb_urgent(rt_mailbox_t mb, rt_ubase_t value)
/* resume suspended thread */ /* resume suspended thread */
if (!rt_list_isempty(&mb->parent.suspend_thread)) if (!rt_list_isempty(&mb->parent.suspend_thread))
{ {
rt_ipc_list_resume(&(mb->parent.suspend_thread)); _rt_ipc_list_resume(&(mb->parent.suspend_thread));
/* enable interrupt */ /* enable interrupt */
rt_hw_interrupt_enable(temp); rt_hw_interrupt_enable(temp);
@ -1834,7 +1834,7 @@ rt_err_t rt_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout)
RT_DEBUG_IN_THREAD_CONTEXT; RT_DEBUG_IN_THREAD_CONTEXT;
/* suspend current thread */ /* suspend current thread */
rt_ipc_list_suspend(&(mb->parent.suspend_thread), _rt_ipc_list_suspend(&(mb->parent.suspend_thread),
thread, thread,
mb->parent.parent.flag); mb->parent.parent.flag);
@ -1897,7 +1897,7 @@ rt_err_t rt_mb_recv(rt_mailbox_t mb, rt_ubase_t *value, rt_int32_t timeout)
/* resume suspended thread */ /* resume suspended thread */
if (!rt_list_isempty(&(mb->suspend_sender_thread))) if (!rt_list_isempty(&(mb->suspend_sender_thread)))
{ {
rt_ipc_list_resume(&(mb->suspend_sender_thread)); _rt_ipc_list_resume(&(mb->suspend_sender_thread));
/* enable interrupt */ /* enable interrupt */
rt_hw_interrupt_enable(temp); rt_hw_interrupt_enable(temp);
@ -1941,9 +1941,9 @@ rt_err_t rt_mb_control(rt_mailbox_t mb, int cmd, void *arg)
level = rt_hw_interrupt_disable(); level = rt_hw_interrupt_disable();
/* resume all waiting thread */ /* resume all waiting thread */
rt_ipc_list_resume_all(&(mb->parent.suspend_thread)); _rt_ipc_list_resume_all(&(mb->parent.suspend_thread));
/* also resume all mailbox private suspended thread */ /* also resume all mailbox private suspended thread */
rt_ipc_list_resume_all(&(mb->suspend_sender_thread)); _rt_ipc_list_resume_all(&(mb->suspend_sender_thread));
/* re-init mailbox */ /* re-init mailbox */
mb->entry = 0; mb->entry = 0;
@ -2002,7 +2002,7 @@ rt_err_t rt_mq_init(rt_mq_t mq,
mq->parent.parent.flag = flag; mq->parent.parent.flag = flag;
/* initialize ipc object */ /* initialize ipc object */
rt_ipc_object_init(&(mq->parent)); _rt_ipc_object_init(&(mq->parent));
/* set message pool */ /* set message pool */
mq->msg_pool = msgpool; mq->msg_pool = msgpool;
@ -2050,9 +2050,9 @@ rt_err_t rt_mq_detach(rt_mq_t mq)
RT_ASSERT(rt_object_is_systemobject(&mq->parent.parent)); RT_ASSERT(rt_object_is_systemobject(&mq->parent.parent));
/* resume all suspended thread */ /* resume all suspended thread */
rt_ipc_list_resume_all(&mq->parent.suspend_thread); _rt_ipc_list_resume_all(&mq->parent.suspend_thread);
/* also resume all message queue private suspended thread */ /* also resume all message queue private suspended thread */
rt_ipc_list_resume_all(&(mq->suspend_sender_thread)); _rt_ipc_list_resume_all(&(mq->suspend_sender_thread));
/* detach message queue object */ /* detach message queue object */
rt_object_detach(&(mq->parent.parent)); rt_object_detach(&(mq->parent.parent));
@ -2092,7 +2092,7 @@ rt_mq_t rt_mq_create(const char *name,
mq->parent.parent.flag = flag; mq->parent.parent.flag = flag;
/* initialize ipc object */ /* initialize ipc object */
rt_ipc_object_init(&(mq->parent)); _rt_ipc_object_init(&(mq->parent));
/* initialize message queue */ /* initialize message queue */
@ -2150,9 +2150,9 @@ rt_err_t rt_mq_delete(rt_mq_t mq)
RT_ASSERT(rt_object_is_systemobject(&mq->parent.parent) == RT_FALSE); RT_ASSERT(rt_object_is_systemobject(&mq->parent.parent) == RT_FALSE);
/* resume all suspended thread */ /* resume all suspended thread */
rt_ipc_list_resume_all(&(mq->parent.suspend_thread)); _rt_ipc_list_resume_all(&(mq->parent.suspend_thread));
/* also resume all message queue private suspended thread */ /* also resume all message queue private suspended thread */
rt_ipc_list_resume_all(&(mq->suspend_sender_thread)); _rt_ipc_list_resume_all(&(mq->suspend_sender_thread));
/* free message queue pool */ /* free message queue pool */
RT_KERNEL_FREE(mq->msg_pool); RT_KERNEL_FREE(mq->msg_pool);
@ -2234,7 +2234,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
RT_DEBUG_IN_THREAD_CONTEXT; RT_DEBUG_IN_THREAD_CONTEXT;
/* suspend current thread */ /* suspend current thread */
rt_ipc_list_suspend(&(mq->suspend_sender_thread), _rt_ipc_list_suspend(&(mq->suspend_sender_thread),
thread, thread,
mq->parent.parent.flag); mq->parent.parent.flag);
@ -2320,7 +2320,7 @@ rt_err_t rt_mq_send_wait(rt_mq_t mq,
/* resume suspended thread */ /* resume suspended thread */
if (!rt_list_isempty(&mq->parent.suspend_thread)) if (!rt_list_isempty(&mq->parent.suspend_thread))
{ {
rt_ipc_list_resume(&(mq->parent.suspend_thread)); _rt_ipc_list_resume(&(mq->parent.suspend_thread));
/* enable interrupt */ /* enable interrupt */
rt_hw_interrupt_enable(temp); rt_hw_interrupt_enable(temp);
@ -2428,7 +2428,7 @@ rt_err_t rt_mq_urgent(rt_mq_t mq, const void *buffer, rt_size_t size)
/* resume suspended thread */ /* resume suspended thread */
if (!rt_list_isempty(&mq->parent.suspend_thread)) if (!rt_list_isempty(&mq->parent.suspend_thread))
{ {
rt_ipc_list_resume(&(mq->parent.suspend_thread)); _rt_ipc_list_resume(&(mq->parent.suspend_thread));
/* enable interrupt */ /* enable interrupt */
rt_hw_interrupt_enable(temp); rt_hw_interrupt_enable(temp);
@ -2510,7 +2510,7 @@ rt_err_t rt_mq_recv(rt_mq_t mq,
} }
/* suspend current thread */ /* suspend current thread */
rt_ipc_list_suspend(&(mq->parent.suspend_thread), _rt_ipc_list_suspend(&(mq->parent.suspend_thread),
thread, thread,
mq->parent.parent.flag); mq->parent.parent.flag);
@ -2586,7 +2586,7 @@ rt_err_t rt_mq_recv(rt_mq_t mq,
/* resume suspended thread */ /* resume suspended thread */
if (!rt_list_isempty(&(mq->suspend_sender_thread))) if (!rt_list_isempty(&(mq->suspend_sender_thread)))
{ {
rt_ipc_list_resume(&(mq->suspend_sender_thread)); _rt_ipc_list_resume(&(mq->suspend_sender_thread));
/* enable interrupt */ /* enable interrupt */
rt_hw_interrupt_enable(temp); rt_hw_interrupt_enable(temp);
@ -2632,9 +2632,9 @@ rt_err_t rt_mq_control(rt_mq_t mq, int cmd, void *arg)
level = rt_hw_interrupt_disable(); level = rt_hw_interrupt_disable();
/* resume all waiting thread */ /* resume all waiting thread */
rt_ipc_list_resume_all(&mq->parent.suspend_thread); _rt_ipc_list_resume_all(&mq->parent.suspend_thread);
/* also resume all message queue private suspended thread */ /* also resume all message queue private suspended thread */
rt_ipc_list_resume_all(&(mq->suspend_sender_thread)); _rt_ipc_list_resume_all(&(mq->suspend_sender_thread));
/* release all message in the queue */ /* release all message in the queue */
while (mq->msg_queue_head != RT_NULL) while (mq->msg_queue_head != RT_NULL)

14
src/scheduler.c
View File

@ -23,7 +23,7 @@
* 2013-12-21 Grissiom add rt_critical_level * 2013-12-21 Grissiom add rt_critical_level
* 2018-11-22 Jesven remove the current task from ready queue * 2018-11-22 Jesven remove the current task from ready queue
* add per cpu ready queue * add per cpu ready queue
* add _get_highest_priority_thread to find highest priority task * add _rt_get_highest_priority_thread to find highest priority task
* rt_schedule_insert_thread won't insert current task to ready queue * rt_schedule_insert_thread won't insert current task to ready queue
* in smp version, rt_hw_context_switch_interrupt maybe switch to * in smp version, rt_hw_context_switch_interrupt maybe switch to
* new task directly * new task directly
@ -114,7 +114,7 @@ static void _rt_scheduler_stack_check(struct rt_thread *thread)
* get the highest priority thread in ready queue * get the highest priority thread in ready queue
*/ */
#ifdef RT_USING_SMP #ifdef RT_USING_SMP
static struct rt_thread* _get_highest_priority_thread(rt_ubase_t *highest_prio) static struct rt_thread* _rt_get_highest_priority_thread(rt_ubase_t *highest_prio)
{ {
register struct rt_thread *highest_priority_thread; register struct rt_thread *highest_priority_thread;
register rt_ubase_t highest_ready_priority, local_highest_ready_priority; register rt_ubase_t highest_ready_priority, local_highest_ready_priority;
@ -150,7 +150,7 @@ static struct rt_thread* _get_highest_priority_thread(rt_ubase_t *highest_prio)
return highest_priority_thread; return highest_priority_thread;
} }
#else #else
static struct rt_thread* _get_highest_priority_thread(rt_ubase_t *highest_prio) static struct rt_thread* _rt_get_highest_priority_thread(rt_ubase_t *highest_prio)
{ {
register struct rt_thread *highest_priority_thread; register struct rt_thread *highest_priority_thread;
register rt_ubase_t highest_ready_priority; register rt_ubase_t highest_ready_priority;
@ -239,7 +239,7 @@ void rt_system_scheduler_start(void)
register struct rt_thread *to_thread; register struct rt_thread *to_thread;
rt_ubase_t highest_ready_priority; rt_ubase_t highest_ready_priority;
to_thread = _get_highest_priority_thread(&highest_ready_priority); to_thread = _rt_get_highest_priority_thread(&highest_ready_priority);
#ifdef RT_USING_SMP #ifdef RT_USING_SMP
to_thread->oncpu = rt_hw_cpu_id(); to_thread->oncpu = rt_hw_cpu_id();
@ -327,7 +327,7 @@ void rt_schedule(void)
if (rt_thread_ready_priority_group != 0 || pcpu->priority_group != 0) if (rt_thread_ready_priority_group != 0 || pcpu->priority_group != 0)
{ {
to_thread = _get_highest_priority_thread(&highest_ready_priority); to_thread = _rt_get_highest_priority_thread(&highest_ready_priority);
current_thread->oncpu = RT_CPU_DETACHED; current_thread->oncpu = RT_CPU_DETACHED;
if ((current_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_RUNNING) if ((current_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_RUNNING)
{ {
@ -425,7 +425,7 @@ void rt_schedule(void)
/* need_insert_from_thread: need to insert from_thread to ready queue */ /* need_insert_from_thread: need to insert from_thread to ready queue */
int need_insert_from_thread = 0; int need_insert_from_thread = 0;
to_thread = _get_highest_priority_thread(&highest_ready_priority); to_thread = _rt_get_highest_priority_thread(&highest_ready_priority);
if ((rt_current_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_RUNNING) if ((rt_current_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_RUNNING)
{ {
@ -576,7 +576,7 @@ void rt_scheduler_do_irq_switch(void *context)
if (rt_thread_ready_priority_group != 0 || pcpu->priority_group != 0) if (rt_thread_ready_priority_group != 0 || pcpu->priority_group != 0)
{ {
to_thread = _get_highest_priority_thread(&highest_ready_priority); to_thread = _rt_get_highest_priority_thread(&highest_ready_priority);
current_thread->oncpu = RT_CPU_DETACHED; current_thread->oncpu = RT_CPU_DETACHED;
if ((current_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_RUNNING) if ((current_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_RUNNING)
{ {