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

Merge pull request #3787 from mysterywolf/master 

fix在rt_event_recv函数中，如果事件已经满足无需阻塞的情况下，没有给thread->event_set/event_info…
This commit is contained in:
Bernard Xiong 2020-07-30 14:10:04 +08:00 committed by GitHub
parent 4f674ef149 1fe077a0be
commit bb84e235af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ipc.c
View File

@ -34,6 +34,8 @@
* 2013-09-14 Grissiom add an option check in rt_event_recv * 2013-09-14 Grissiom add an option check in rt_event_recv
* 2018-10-02 Bernard add 64bit support for mailbox * 2018-10-02 Bernard add 64bit support for mailbox
* 2019-09-16 tyx add send wait support for message queue * 2019-09-16 tyx add send wait support for message queue
* 2020-07-29 Meco Man fix thread->event_set/event_info when received an
event without pending
*/ */
#include <rtthread.h> #include <rtthread.h>
@ -1178,6 +1180,10 @@ rt_err_t rt_event_recv(rt_event_t event,
if (recved) if (recved)
*recved = (event->set & set); *recved = (event->set & set);
/* fill thread event info */
thread->event_set = (event->set & set);
thread->event_info = option;
/* received event */ /* received event */
if (option & RT_EVENT_FLAG_CLEAR) if (option & RT_EVENT_FLAG_CLEAR)
event->set &= ~set; event->set &= ~set;