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

【更新】调整RT_ASSERT和RT_DEBUG_NOT_IN_INTERRUPT，维持代码风格

This commit is contained in:
wangqinglin 2021-10-19 10:00:01 +08:00 committed by HelloByeAll
parent 4c4f107436
commit 758ef39024
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ipc.c
View File

@ -378,10 +378,11 @@ rt_sem_t rt_sem_create(const char *name, rt_uint32_t value, rt_uint8_t flag)
{ {
rt_sem_t sem; rt_sem_t sem;
RT_DEBUG_NOT_IN_INTERRUPT;
RT_ASSERT(value < 0x10000U); RT_ASSERT(value < 0x10000U);
RT_ASSERT((flag == RT_IPC_FLAG_FIFO) || (flag == RT_IPC_FLAG_PRIO)); RT_ASSERT((flag == RT_IPC_FLAG_FIFO) || (flag == RT_IPC_FLAG_PRIO));
RT_DEBUG_NOT_IN_INTERRUPT;
/* allocate object */ /* allocate object */
sem = (rt_sem_t)rt_object_allocate(RT_Object_Class_Semaphore, name); sem = (rt_sem_t)rt_object_allocate(RT_Object_Class_Semaphore, name);
if (sem == RT_NULL) if (sem == RT_NULL)
@ -421,13 +422,13 @@ RTM_EXPORT(rt_sem_create);
*/ */
rt_err_t rt_sem_delete(rt_sem_t sem) rt_err_t rt_sem_delete(rt_sem_t sem)
{ {
RT_DEBUG_NOT_IN_INTERRUPT;
/* parameter check */ /* parameter check */
RT_ASSERT(sem != RT_NULL); RT_ASSERT(sem != RT_NULL);
RT_ASSERT(rt_object_get_type(&sem->parent.parent) == RT_Object_Class_Semaphore); RT_ASSERT(rt_object_get_type(&sem->parent.parent) == RT_Object_Class_Semaphore);
RT_ASSERT(rt_object_is_systemobject(&sem->parent.parent) == RT_FALSE); RT_ASSERT(rt_object_is_systemobject(&sem->parent.parent) == RT_FALSE);
RT_DEBUG_NOT_IN_INTERRUPT;
/* wakeup all suspended threads */ /* wakeup all suspended threads */
_ipc_list_resume_all(&(sem->parent.suspend_thread)); _ipc_list_resume_all(&(sem->parent.suspend_thread));
@ -850,13 +851,13 @@ RTM_EXPORT(rt_mutex_create);
*/ */
rt_err_t rt_mutex_delete(rt_mutex_t mutex) rt_err_t rt_mutex_delete(rt_mutex_t mutex)
{ {
RT_DEBUG_NOT_IN_INTERRUPT;
/* parameter check */ /* parameter check */
RT_ASSERT(mutex != RT_NULL); RT_ASSERT(mutex != RT_NULL);
RT_ASSERT(rt_object_get_type(&mutex->parent.parent) == RT_Object_Class_Mutex); RT_ASSERT(rt_object_get_type(&mutex->parent.parent) == RT_Object_Class_Mutex);
RT_ASSERT(rt_object_is_systemobject(&mutex->parent.parent) == RT_FALSE); RT_ASSERT(rt_object_is_systemobject(&mutex->parent.parent) == RT_FALSE);
RT_DEBUG_NOT_IN_INTERRUPT;
/* wakeup all suspended threads */ /* wakeup all suspended threads */
_ipc_list_resume_all(&(mutex->parent.suspend_thread)); _ipc_list_resume_all(&(mutex->parent.suspend_thread));
@ -1346,9 +1347,10 @@ rt_event_t rt_event_create(const char *name, rt_uint8_t flag)
{ {
rt_event_t event; rt_event_t event;
RT_DEBUG_NOT_IN_INTERRUPT;
RT_ASSERT((flag == RT_IPC_FLAG_FIFO) || (flag == RT_IPC_FLAG_PRIO)); RT_ASSERT((flag == RT_IPC_FLAG_FIFO) || (flag == RT_IPC_FLAG_PRIO));
RT_DEBUG_NOT_IN_INTERRUPT;
/* allocate object */ /* allocate object */
event = (rt_event_t)rt_object_allocate(RT_Object_Class_Event, name); event = (rt_event_t)rt_object_allocate(RT_Object_Class_Event, name);
if (event == RT_NULL) if (event == RT_NULL)
@ -1869,9 +1871,10 @@ rt_mailbox_t rt_mb_create(const char *name, rt_size_t size, rt_uint8_t flag)
{ {
rt_mailbox_t mb; rt_mailbox_t mb;
RT_DEBUG_NOT_IN_INTERRUPT;
RT_ASSERT((flag == RT_IPC_FLAG_FIFO) || (flag == RT_IPC_FLAG_PRIO)); RT_ASSERT((flag == RT_IPC_FLAG_FIFO) || (flag == RT_IPC_FLAG_PRIO));
RT_DEBUG_NOT_IN_INTERRUPT;
/* allocate object */ /* allocate object */
mb = (rt_mailbox_t)rt_object_allocate(RT_Object_Class_MailBox, name); mb = (rt_mailbox_t)rt_object_allocate(RT_Object_Class_MailBox, name);
if (mb == RT_NULL) if (mb == RT_NULL)
@ -1925,13 +1928,13 @@ RTM_EXPORT(rt_mb_create);
*/ */
rt_err_t rt_mb_delete(rt_mailbox_t mb) rt_err_t rt_mb_delete(rt_mailbox_t mb)
{ {
RT_DEBUG_NOT_IN_INTERRUPT;
/* parameter check */ /* parameter check */
RT_ASSERT(mb != RT_NULL); RT_ASSERT(mb != RT_NULL);
RT_ASSERT(rt_object_get_type(&mb->parent.parent) == RT_Object_Class_MailBox); RT_ASSERT(rt_object_get_type(&mb->parent.parent) == RT_Object_Class_MailBox);
RT_ASSERT(rt_object_is_systemobject(&mb->parent.parent) == RT_FALSE); RT_ASSERT(rt_object_is_systemobject(&mb->parent.parent) == RT_FALSE);
RT_DEBUG_NOT_IN_INTERRUPT;
/* resume all suspended thread */ /* resume all suspended thread */
_ipc_list_resume_all(&(mb->parent.suspend_thread)); _ipc_list_resume_all(&(mb->parent.suspend_thread));
@ -2591,9 +2594,10 @@ rt_mq_t rt_mq_create(const char *name,
struct rt_mq_message *head; struct rt_mq_message *head;
register rt_base_t temp; register rt_base_t temp;
RT_DEBUG_NOT_IN_INTERRUPT;
RT_ASSERT((flag == RT_IPC_FLAG_FIFO) || (flag == RT_IPC_FLAG_PRIO)); RT_ASSERT((flag == RT_IPC_FLAG_FIFO) || (flag == RT_IPC_FLAG_PRIO));
RT_DEBUG_NOT_IN_INTERRUPT;
/* allocate object */ /* allocate object */
mq = (rt_mq_t)rt_object_allocate(RT_Object_Class_MessageQueue, name); mq = (rt_mq_t)rt_object_allocate(RT_Object_Class_MessageQueue, name);
if (mq == RT_NULL) if (mq == RT_NULL)
@ -2666,13 +2670,13 @@ RTM_EXPORT(rt_mq_create);
*/ */
rt_err_t rt_mq_delete(rt_mq_t mq) rt_err_t rt_mq_delete(rt_mq_t mq)
{ {
RT_DEBUG_NOT_IN_INTERRUPT;
/* parameter check */ /* parameter check */
RT_ASSERT(mq != RT_NULL); RT_ASSERT(mq != RT_NULL);
RT_ASSERT(rt_object_get_type(&mq->parent.parent) == RT_Object_Class_MessageQueue); RT_ASSERT(rt_object_get_type(&mq->parent.parent) == RT_Object_Class_MessageQueue);
RT_ASSERT(rt_object_is_systemobject(&mq->parent.parent) == RT_FALSE); RT_ASSERT(rt_object_is_systemobject(&mq->parent.parent) == RT_FALSE);
RT_DEBUG_NOT_IN_INTERRUPT;
/* resume all suspended thread */ /* resume all suspended thread */
_ipc_list_resume_all(&(mq->parent.suspend_thread)); _ipc_list_resume_all(&(mq->parent.suspend_thread));
/* also resume all message queue private suspended thread */ /* also resume all message queue private suspended thread */