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

[workqueue] 修复临界条件线程意外挂起问题 

线程判断任务链表为空时，开中断挂起线程，在挂起线程的过程中，提交的任务不会被执行。

将线程的挂起与恢复放在中断保护内，确保挂起挂起恢复是一个完整的过程
This commit is contained in:
tangyuxin 2021-02-22 17:10:33 +08:00
parent 791b8a35de
commit 4f2359d34c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/drivers/src/workqueue.c
View File

@ -61,9 +61,9 @@ static void _workqueue_thread_entry(void *parameter)
level = rt_hw_interrupt_disable();
if (rt_list_isempty(&(queue->work_list)))
{
rt_hw_interrupt_enable(level);
/* no software timer exist, suspend self. */
rt_thread_suspend(rt_thread_self());
rt_hw_interrupt_enable(level);
rt_schedule();
continue;
}
@ -115,9 +115,9 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
if (queue->work_current == RT_NULL &&
((queue->work_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_SUSPEND))
{
rt_hw_interrupt_enable(level);
/* resume work thread */
rt_thread_resume(queue->work_thread);
rt_hw_interrupt_enable(level);
rt_schedule();
}
else
@ -197,9 +197,9 @@ static void _delayed_work_timeout_handler(void *parameter)
if (queue->work_current == RT_NULL &&
((queue->work_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_SUSPEND))
{
rt_hw_interrupt_enable(level);
/* resume work thread */
rt_thread_resume(queue->work_thread);
rt_hw_interrupt_enable(level);
rt_schedule();
}
else
@ -277,9 +277,9 @@ rt_err_t rt_workqueue_critical_work(struct rt_workqueue *queue, struct rt_work *
if (queue->work_current == RT_NULL &&
((queue->work_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_SUSPEND))
{
rt_hw_interrupt_enable(level);
/* resume work thread */
rt_thread_resume(queue->work_thread);
rt_hw_interrupt_enable(level);
rt_schedule();
}
else
@ -321,14 +321,14 @@ rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue)
RT_ASSERT(queue != RT_NULL);
// cancel work
/* cancel work */
rt_enter_critical();
while (rt_list_isempty(&queue->work_list) == RT_FALSE)
{
work = rt_list_first_entry(&queue->work_list, struct rt_work, list);
_workqueue_cancel_work(queue, work);
}
// cancel delay work
/* cancel delay work */
while (rt_list_isempty(&queue->delayed_list) == RT_FALSE)
{
work = rt_list_first_entry(&queue->delayed_list, struct rt_work, list);