Skip to content

Commit bb84e23

Browse files
authored
Merge pull request #3787 from mysterywolf/master
fix在rt_event_recv函数中,如果事件已经满足无需阻塞的情况下,没有给thread->event_set/event_info…
2 parents 4f674ef + 1fe077a commit bb84e23

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/ipc.c

+7-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
* 2013-09-14 Grissiom add an option check in rt_event_recv
3535
* 2018-10-02 Bernard add 64bit support for mailbox
3636
* 2019-09-16 tyx add send wait support for message queue
37+
* 2020-07-29 Meco Man fix thread->event_set/event_info when received an
38+
event without pending
3739
*/
3840

3941
#include <rtthread.h>
@@ -1177,7 +1179,11 @@ rt_err_t rt_event_recv(rt_event_t event,
11771179
/* set received event */
11781180
if (recved)
11791181
*recved = (event->set & set);
1180-
1182+
1183+
/* fill thread event info */
1184+
thread->event_set = (event->set & set);
1185+
thread->event_info = option;
1186+
11811187
/* received event */
11821188
if (option & RT_EVENT_FLAG_CLEAR)
11831189
event->set &= ~set;

0 commit comments

Comments
 (0)