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

bugfix: thread->error will be changed unexpectedly when sending a mail in interrupt context. 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1626 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
mbbill@gmail.com 2011-07-13 06:58:25 +00:00
parent ce5eddd0a5
commit 98d59d153e
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ipc.c
View File

@ -1452,13 +1452,22 @@ rt_err_t rt_mb_recv (rt_mailbox_t mb, rt_uint32_t* value, rt_int32_t timeout)
/* parameter check */ /* parameter check */
RT_ASSERT(mb != RT_NULL); RT_ASSERT(mb != RT_NULL);
tick_delta = 0;
RT_OBJECT_HOOK_CALL(rt_object_trytake_hook, (&(mb->parent.parent))); RT_OBJECT_HOOK_CALL(rt_object_trytake_hook, (&(mb->parent.parent)));
/* disable interrupt */ /* disable interrupt */
temp = rt_hw_interrupt_disable(); temp = rt_hw_interrupt_disable();
/* for non-blocking call */
if (mb->entry == 0 && timeout == 0)
{
rt_hw_interrupt_enable(temp);
return -RT_ETIMEOUT;
}
RT_DEBUG_NOT_IN_INTERRUPT;
tick_delta = 0;
/* get current thread */ /* get current thread */
thread = rt_thread_self(); thread = rt_thread_self();
@ -1478,8 +1487,6 @@ rt_err_t rt_mb_recv (rt_mailbox_t mb, rt_uint32_t* value, rt_int32_t timeout)
return -RT_ETIMEOUT; return -RT_ETIMEOUT;
} }
RT_DEBUG_NOT_IN_INTERRUPT;
/* suspend current thread */ /* suspend current thread */
rt_ipc_list_suspend(&(mb->parent.suspend_thread), rt_ipc_list_suspend(&(mb->parent.suspend_thread),
thread, mb->parent.parent.flag); thread, mb->parent.parent.flag);
@ -1952,13 +1959,23 @@ rt_err_t rt_mq_recv (rt_mq_t mq, void* buffer, rt_size_t size, rt_int32_t timeou
RT_OBJECT_HOOK_CALL(rt_object_trytake_hook, (&(mq->parent.parent))); RT_OBJECT_HOOK_CALL(rt_object_trytake_hook, (&(mq->parent.parent)));
tick_delta = 0;
/* get current thread */
thread = rt_thread_self();
/* disable interrupt */ /* disable interrupt */
temp = rt_hw_interrupt_disable(); temp = rt_hw_interrupt_disable();
/* for non-blocking call */
if (mq->entry == 0 && timeout == 0)
{
rt_hw_interrupt_enable(temp);
return -RT_ETIMEOUT;
}
RT_DEBUG_NOT_IN_INTERRUPT;
tick_delta = 0;
/* get current thread */
thread = rt_thread_self();
/* message queue is empty */ /* message queue is empty */
while (mq->entry == 0) while (mq->entry == 0)
{ {
@ -1975,7 +1992,6 @@ rt_err_t rt_mq_recv (rt_mq_t mq, void* buffer, rt_size_t size, rt_int32_t timeou
return -RT_ETIMEOUT; return -RT_ETIMEOUT;
} }
RT_DEBUG_NOT_IN_INTERRUPT;
/* suspend current thread */ /* suspend current thread */
rt_ipc_list_suspend(&(mq->parent.suspend_thread), rt_ipc_list_suspend(&(mq->parent.suspend_thread),