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

Merge pull request #1528 from armink/fix_waitqueue 

[components][drivers] Add irq lock to rt_wqueue_wait.
This commit is contained in:
Bernard Xiong 2018-06-12 17:57:23 +08:00 committed by GitHub
parent bce30adddb 570ae751be
commit 2f0a5d9d38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/drivers/src/waitqueue.c
View File

@ -65,6 +65,10 @@ int rt_wqueue_wait(rt_wqueue_t *queue, int condition, int msec)
rt_thread_t tid = rt_current_thread; rt_thread_t tid = rt_current_thread;
rt_timer_t tmr = &(tid->thread_timer); rt_timer_t tmr = &(tid->thread_timer);
struct rt_wqueue_node __wait; struct rt_wqueue_node __wait;
rt_base_t level;
/* current context checking */
RT_DEBUG_NOT_IN_INTERRUPT;
tick = rt_tick_from_millisecond(msec); tick = rt_tick_from_millisecond(msec);
@ -76,10 +80,8 @@ int rt_wqueue_wait(rt_wqueue_t *queue, int condition, int msec)
__wait.wakeup = __wqueue_default_wake; __wait.wakeup = __wqueue_default_wake;
rt_list_init(&__wait.list); rt_list_init(&__wait.list);
level = rt_hw_interrupt_disable();
rt_wqueue_add(queue, &__wait); rt_wqueue_add(queue, &__wait);
/* current context checking */
RT_DEBUG_NOT_IN_INTERRUPT;
rt_thread_suspend(tid); rt_thread_suspend(tid);
/* start timer */ /* start timer */
@ -91,6 +93,7 @@ int rt_wqueue_wait(rt_wqueue_t *queue, int condition, int msec)
rt_timer_start(tmr); rt_timer_start(tmr);
} }
rt_hw_interrupt_enable(level);
rt_schedule(); rt_schedule();
@ -98,4 +101,3 @@ int rt_wqueue_wait(rt_wqueue_t *queue, int condition, int msec)
return 0; return 0;
} }