From 6f71308ef529bfcecd54daaa309d1336ef0c6366 Mon Sep 17 00:00:00 2001 From: Grissiom Date: Fri, 11 Oct 2013 22:46:05 +0800 Subject: kernel: add RT_DEBUG_IN_THREAD_CONTEXT In thread context means: 1) the scheduler has been started; 2) not in interrupt context. It is more stronger than RT_DEBUG_NOT_IN_INTERRUPT. With this commit, you will catch the error on situations like taking mutex before scheduling instead of crashing on NULL pointer reference. --- src/ipc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/ipc.c b/src/ipc.c index 116bde863b..7e4263c0bf 100644 --- a/src/ipc.c +++ b/src/ipc.c @@ -362,7 +362,7 @@ rt_err_t rt_sem_take(rt_sem_t sem, rt_int32_t time) else { /* current context checking */ - RT_DEBUG_NOT_IN_INTERRUPT; + RT_DEBUG_IN_THREAD_CONTEXT; /* semaphore is unavailable, push to suspend list */ /* get current thread */ @@ -645,7 +645,7 @@ rt_err_t rt_mutex_take(rt_mutex_t mutex, rt_int32_t time) struct rt_thread *thread; /* this function must not be used in interrupt even if time = 0 */ - RT_DEBUG_NOT_IN_INTERRUPT; + RT_DEBUG_IN_THREAD_CONTEXT; RT_ASSERT(mutex != RT_NULL); @@ -1097,7 +1097,7 @@ rt_err_t rt_event_recv(rt_event_t event, register rt_ubase_t level; register rt_base_t status; - RT_DEBUG_NOT_IN_INTERRUPT; + RT_DEBUG_IN_THREAD_CONTEXT; /* parameter check */ RT_ASSERT(event != RT_NULL); @@ -1442,7 +1442,7 @@ rt_err_t rt_mb_send_wait(rt_mailbox_t mb, return -RT_EFULL; } - RT_DEBUG_NOT_IN_INTERRUPT; + RT_DEBUG_IN_THREAD_CONTEXT; /* suspend current thread */ rt_ipc_list_suspend(&(mb->suspend_sender_thread), thread, @@ -1589,7 +1589,7 @@ rt_err_t rt_mb_recv(rt_mailbox_t mb, rt_uint32_t *value, rt_int32_t timeout) return -RT_ETIMEOUT; } - RT_DEBUG_NOT_IN_INTERRUPT; + RT_DEBUG_IN_THREAD_CONTEXT; /* suspend current thread */ rt_ipc_list_suspend(&(mb->parent.suspend_thread), thread, @@ -2123,7 +2123,7 @@ rt_err_t rt_mq_recv(rt_mq_t mq, /* message queue is empty */ while (mq->entry == 0) { - RT_DEBUG_NOT_IN_INTERRUPT; + RT_DEBUG_IN_THREAD_CONTEXT; /* reset error number in thread */ thread->error = RT_EOK; -- cgit v1.3.1