From 5a16a2060e5c330066d6d7c499c04d27277b9ae4 Mon Sep 17 00:00:00 2001
From: tangyuxin <tangyuxin@rt-thread.com>
Date: Mon, 1 Feb 2021 14:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=A4=84=E7=90=86=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E4=B8=B4=E7=95=8C=E5=8C=BA=E4=BF=9D=E6=8A=A4=E6=9B=B4?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=8C=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

定时器回调函数中，添加工作之前打开了中断。此时在极端情况下，会导致状态不对。
---
 components/drivers/src/workqueue.c | 35 +++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index 0c3c0e9f53..6e8683c9b9 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -164,17 +164,36 @@ static rt_err_t _workqueue_cancel_work(struct rt_work *work)
 
 static void _delayed_work_timeout_handler(void *parameter)
 {
-    struct rt_work *delayed_work;
+    struct rt_work *work;
+    struct rt_workqueue *queue;
     rt_base_t level;
 
-    delayed_work = (struct rt_work *)parameter;
+    work = (struct rt_work *)parameter;
+    queue = work->workqueue;
+    RT_ASSERT(queue != RT_NULL);
+
     level = rt_hw_interrupt_disable();
-    rt_timer_stop(&(delayed_work->timer));
-    rt_timer_detach(&(delayed_work->timer));
-    delayed_work->flags &= ~RT_WORK_STATE_SUBMITTING;
-    delayed_work->type &= ~RT_WORK_TYPE_DELAYED;
-    rt_hw_interrupt_enable(level);
-    _workqueue_submit_work(delayed_work->workqueue, delayed_work, 0);
+    rt_timer_detach(&(work->timer));
+    work->flags &= ~RT_WORK_STATE_SUBMITTING;
+    /* insert work queue */
+    if (queue->work_current != work)
+    {
+        rt_list_insert_after(queue->work_list.prev, &(work->list));
+        work->flags |= RT_WORK_STATE_PENDING;
+    }
+    /* whether the workqueue is doing 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_schedule();
+    }
+    else
+    {
+        rt_hw_interrupt_enable(level);
+    }
 }
 
 struct rt_workqueue *rt_workqueue_create(const char *name, rt_uint16_t stack_size, rt_uint8_t priority)