From 0c87becb3eed0e890198740589f0db94ab6256cf Mon Sep 17 00:00:00 2001
From: tangyuxin <tangyuxin@rt-thread.com>
Date: Sat, 30 Jan 2021 18:21:33 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E5=90=88=E5=B9=B6=20submit=20=E5=92=8C?=
 =?UTF-8?q?=20submit=5Fdelayed=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BD=93=E7=A7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将 _workqueue_submit_delayed_work 和 _workqueue_submit_work 函数合并成一个。优化代码体积
---
 components/drivers/src/workqueue.c | 134 +++++++++++------------------
 1 file changed, 52 insertions(+), 82 deletions(-)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index 2b5630d8d0..557f349e53 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -86,43 +86,61 @@ static void _workqueue_thread_entry(void *parameter)
     }
 }
 
-static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue, struct rt_work *work)
+static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
+        struct rt_work *work, rt_tick_t ticks)
 {
     rt_base_t level;
 
     level = rt_hw_interrupt_disable();
-    if (work->flags & RT_WORK_STATE_PENDING)
-    {
-        rt_hw_interrupt_enable(level);
-        return -RT_EBUSY;
-    }
-
-    if (queue->work_current == work)
-    {
-        rt_hw_interrupt_enable(level);
-        return -RT_EBUSY;
-    }
-
-    /* NOTE: the work MUST be initialized firstly */
+    /* remove list */
     rt_list_remove(&(work->list));
-
-    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)
+    work->flags &= ~RT_WORK_STATE_PENDING;
+    /*  */
+    if (ticks == 0)
     {
-        rt_hw_interrupt_enable(level);
-        /* resume work thread */
-        rt_thread_resume(queue->work_thread);
-        rt_schedule();
-    }
-    else
-    {
-        rt_hw_interrupt_enable(level);
-    }
+        if (queue->work_current != work)
+        {
+            rt_list_insert_after(queue->work_list.prev, &(work->list));
+            work->flags |= RT_WORK_STATE_PENDING;
+            work->workqueue = queue;
+        }
 
-    return RT_EOK;
+        /* 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);
+        }
+        return RT_EOK;
+    }
+    else if (ticks < RT_TICK_MAX / 2)
+    {
+        /* Timer started */
+        if (work->flags & RT_WORK_STATE_SUBMITTING)
+        {
+            rt_timer_stop(&work->timer);
+            rt_timer_control(&work->timer, RT_TIMER_CTRL_SET_TIME, &ticks);
+        }
+        else
+        {
+            rt_timer_init(&(work->timer), "work", _delayed_work_timeout_handler,
+                        work, ticks, RT_TIMER_FLAG_ONE_SHOT | RT_TIMER_FLAG_SOFT_TIMER);
+            work->flags |= RT_WORK_STATE_SUBMITTING;
+        }
+        work->workqueue = queue;
+        rt_hw_interrupt_enable(level);
+        rt_timer_start(&(work->timer));
+        return RT_EOK;
+    }
+    rt_hw_interrupt_enable(level);
+    return -RT_ERROR;
 }
 
 static rt_err_t _workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *work)
@@ -184,54 +202,6 @@ __exit:
     return ret;
 }
 
-static rt_err_t _workqueue_submit_delayed_work(struct rt_workqueue *queue,
-        struct rt_work *work, rt_tick_t ticks)
-{
-    rt_base_t level;
-    rt_err_t ret = RT_EOK;
-
-    /* Work cannot be active in multiple queues */
-    if (work->workqueue && work->workqueue != queue)
-    {
-        ret = -RT_EINVAL;
-        goto __exit;
-    }
-
-    /* Cancel if work has been submitted */
-    if (work->workqueue == queue)
-    {
-        ret = _workqueue_cancel_delayed_work(work);
-        if (ret < 0)
-        {
-            goto __exit;
-        }
-    }
-
-    level = rt_hw_interrupt_disable();
-    /* Attach workqueue so the timeout callback can submit it */
-    work->workqueue = queue;
-    rt_hw_interrupt_enable(level);
-
-    if (!ticks)
-    {
-        /* Submit work if no ticks is 0 */
-        ret = _workqueue_submit_work(work->workqueue, work);
-    }
-    else
-    {
-        level = rt_hw_interrupt_disable();
-        /* Add timeout */
-        work->flags |= RT_WORK_STATE_SUBMITTING;
-        rt_timer_init(&(work->timer), "work", _delayed_work_timeout_handler, work, ticks,
-                      RT_TIMER_FLAG_ONE_SHOT | RT_TIMER_FLAG_SOFT_TIMER);
-        rt_hw_interrupt_enable(level);
-        rt_timer_start(&(work->timer));
-    }
-
-__exit:
-    return ret;
-}
-
 static void _delayed_work_timeout_handler(void *parameter)
 {
     struct rt_work *delayed_work;
@@ -244,7 +214,7 @@ static void _delayed_work_timeout_handler(void *parameter)
     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);
+    _workqueue_submit_work(delayed_work->workqueue, delayed_work, 0);
 }
 
 struct rt_workqueue *rt_workqueue_create(const char *name, rt_uint16_t stack_size, rt_uint8_t priority)
@@ -288,7 +258,7 @@ rt_err_t rt_workqueue_dowork(struct rt_workqueue *queue, struct rt_work *work)
     RT_ASSERT(queue != RT_NULL);
     RT_ASSERT(work != RT_NULL);
 
-    return _workqueue_submit_work(queue, work);
+    return _workqueue_submit_work(queue, work, 0);
 }
 
 rt_err_t rt_workqueue_submit_work(struct rt_workqueue *queue, struct rt_work *work, rt_tick_t time)
@@ -303,11 +273,11 @@ rt_err_t rt_workqueue_submit_work(struct rt_workqueue *queue, struct rt_work *wo
 
     if (work->type & RT_WORK_TYPE_DELAYED)
     {
-        return _workqueue_submit_delayed_work(queue, work, time);
+        return _workqueue_submit_work(queue, work, time);
     }
     else
     {
-        return _workqueue_submit_work(queue, work);
+        return _workqueue_submit_work(queue, work, 0);
     }
 }
 

From 10b5aa8f59fa83f4f053fd2318cf5268544b3304 Mon Sep 17 00:00:00 2001
From: tangyuxin <tangyuxin@rt-thread.com>
Date: Sat, 30 Jan 2021 18:29:17 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E5=90=88=E5=B9=B6=20cancel=20=E5=92=8C?=
 =?UTF-8?q?=20cancel=5Fdelayed=20=E5=87=BD=E6=95=B0=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E4=BD=93=E7=A7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

合并 _workqueue_cancel_work 和 _workqueue_cancel_delayed_work 函数，优化代码体积
---
 components/drivers/src/workqueue.c | 58 +++++-------------------------
 1 file changed, 9 insertions(+), 49 deletions(-)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index 557f349e53..0c3c0e9f53 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -143,63 +143,23 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
     return -RT_ERROR;
 }
 
-static rt_err_t _workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *work)
+static rt_err_t _workqueue_cancel_work(struct rt_work *work)
 {
     rt_base_t level;
 
     level = rt_hw_interrupt_disable();
-    if (queue->work_current == work)
-    {
-        rt_hw_interrupt_enable(level);
-        return -RT_EBUSY;
-    }
     rt_list_remove(&(work->list));
     work->flags &= ~RT_WORK_STATE_PENDING;
-    rt_hw_interrupt_enable(level);
-
-    return RT_EOK;
-}
-
-static rt_err_t _workqueue_cancel_delayed_work(struct rt_work *work)
-{
-    rt_base_t level;
-    int ret = RT_EOK;
-
-    if (!work->workqueue)
+    /* Timer started */
+    if (work->flags & RT_WORK_STATE_SUBMITTING)
     {
-        ret = -EINVAL;
-        goto __exit;
+        rt_timer_stop(&(work->timer));
+        rt_timer_detach(&(work->timer));
+        work->flags &= ~RT_WORK_STATE_SUBMITTING;
     }
-
-    if (work->flags & RT_WORK_STATE_PENDING)
-    {
-        /* Remove from the queue if already submitted */
-        ret = _workqueue_cancel_work(work->workqueue, work);
-        if (ret)
-        {
-            goto __exit;
-        }
-    }
-    else
-    {
-        if (work->flags & RT_WORK_STATE_SUBMITTING)
-        {
-            level = rt_hw_interrupt_disable();
-            rt_timer_stop(&(work->timer));
-            rt_timer_detach(&(work->timer));
-            work->flags &= ~RT_WORK_STATE_SUBMITTING;
-            rt_hw_interrupt_enable(level);
-        }
-    }
-
-    level = rt_hw_interrupt_disable();
-    /* Detach from workqueue */
     work->workqueue = RT_NULL;
-    work->flags &= ~(RT_WORK_STATE_PENDING);
     rt_hw_interrupt_enable(level);
-
-__exit:
-    return ret;
+    return 0;
 }
 
 static void _delayed_work_timeout_handler(void *parameter)
@@ -317,11 +277,11 @@ rt_err_t rt_workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *wo
 
     if (work->type & RT_WORK_TYPE_DELAYED)
     {
-        return _workqueue_cancel_delayed_work(work);
+        return _workqueue_cancel_work(work);
     }
     else
     {
-        return _workqueue_cancel_work(queue, work);
+        return _workqueue_cancel_work(work);
     }
 }
 

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 03/15] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=B8=B4=E7=95=8C=E5=8C=BA=E4=BF=9D=E6=8A=A4?=
 =?UTF-8?q?=E6=9B=B4=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)

From 5b52e6c7e315d25c5a492d5460442e6e3f5c5631 Mon Sep 17 00:00:00 2001
From: tangyuxin <tangyuxin@rt-thread.com>
Date: Mon, 1 Feb 2021 14:31:45 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=94=81=E4=B8=AD=E6=96=AD=E7=AD=89=E4=BF=A1?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/drivers/src/workqueue.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index 6e8683c9b9..5c497cd5c8 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -306,12 +306,9 @@ rt_err_t rt_workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *wo
 
 rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_work *work)
 {
-    rt_base_t level;
-
     RT_ASSERT(queue != RT_NULL);
     RT_ASSERT(work != RT_NULL);
 
-    level = rt_hw_interrupt_disable();
     if (queue->work_current == work) /* it's current work in the queue */
     {
         /* wait for work completion */
@@ -319,10 +316,8 @@ rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_wor
     }
     else
     {
-        rt_list_remove(&(work->list));
+        _workqueue_cancel_work(work);
     }
-    work->flags &= ~RT_WORK_STATE_PENDING;
-    rt_hw_interrupt_enable(level);
 
     return RT_EOK;
 }

From c5218b5eeed799593485c89234de809858cb6bf2 Mon Sep 17 00:00:00 2001
From: tangyuxin <tangyuxin@rt-thread.com>
Date: Mon, 1 Feb 2021 14:36:18 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B4=A7=E6=80=A5?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E9=98=9F=E5=88=97=E6=8F=92=E5=85=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

紧急工作仍插入队列尾部，先将其插入队列头部
---
 components/drivers/src/workqueue.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index 5c497cd5c8..d21bf08f4d 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -267,24 +267,22 @@ rt_err_t rt_workqueue_critical_work(struct rt_workqueue *queue, struct rt_work *
     RT_ASSERT(work != RT_NULL);
 
     level = rt_hw_interrupt_disable();
-    if (queue->work_current == work)
-    {
-        rt_hw_interrupt_enable(level);
-        return -RT_EBUSY;
-    }
-
     /* NOTE: the work MUST be initialized firstly */
     rt_list_remove(&(work->list));
-
-    rt_list_insert_after(queue->work_list.prev, &(work->list));
-    if (queue->work_current == RT_NULL)
+    rt_list_insert_after(&queue->work_list, &(work->list));
+    /* 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);
+    else
+    {
+        rt_hw_interrupt_enable(level);
+    }
 
     return RT_EOK;
 }

From b42506fb731c6de683fe27c74cf68064a6919a25 Mon Sep 17 00:00:00 2001
From: tangyuxin <tangyuxin@rt-thread.com>
Date: Mon, 1 Feb 2021 14:43:12 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/drivers/src/workqueue.c | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index d21bf08f4d..4dc08bb2ea 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -245,19 +245,7 @@ rt_err_t rt_workqueue_submit_work(struct rt_workqueue *queue, struct rt_work *wo
     RT_ASSERT(queue != RT_NULL);
     RT_ASSERT(work != RT_NULL);
 
-    if (time > 0)
-    {
-        work->type |= RT_WORK_TYPE_DELAYED;
-    }
-
-    if (work->type & RT_WORK_TYPE_DELAYED)
-    {
-        return _workqueue_submit_work(queue, work, time);
-    }
-    else
-    {
-        return _workqueue_submit_work(queue, work, 0);
-    }
+    return _workqueue_submit_work(queue, work, time);
 }
 
 rt_err_t rt_workqueue_critical_work(struct rt_workqueue *queue, struct rt_work *work)
@@ -289,17 +277,8 @@ rt_err_t rt_workqueue_critical_work(struct rt_workqueue *queue, struct rt_work *
 
 rt_err_t rt_workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *work)
 {
-    RT_ASSERT(queue != RT_NULL);
     RT_ASSERT(work != RT_NULL);
-
-    if (work->type & RT_WORK_TYPE_DELAYED)
-    {
-        return _workqueue_cancel_work(work);
-    }
-    else
-    {
-        return _workqueue_cancel_work(work);
-    }
+    return _workqueue_cancel_work(work);
 }
 
 rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_work *work)

From 0230d32ca0a794c4564360fb37006837d1e8f42f Mon Sep 17 00:00:00 2001
From: tangyuxin <tangyuxin@rt-thread.com>
Date: Mon, 1 Feb 2021 14:44:49 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=AD=E8=A8=80?=
 =?UTF-8?q?=E5=8F=8A=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/drivers/src/workqueue.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index 4dc08bb2ea..1b7dbea0c1 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -304,6 +304,7 @@ rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue)
     struct rt_list_node *node, *next;
     RT_ASSERT(queue != RT_NULL);
 
+    // TODO: cancel delay work
     rt_enter_critical();
     for (node = queue->work_list.next; node != &(queue->work_list); node = next)
     {
@@ -337,14 +338,15 @@ rt_err_t rt_work_cancel(struct rt_work *work)
 int rt_work_sys_workqueue_init(void)
 {
     if (sys_workq != RT_NULL)
-        return 0;
+        return RT_EOK;
 
     sys_workq = rt_workqueue_create("sys_work", RT_SYSTEM_WORKQUEUE_STACKSIZE,
                                     RT_SYSTEM_WORKQUEUE_PRIORITY);
+    RT_ASSERT(sys_workq != RT_NULL);
 
     return RT_EOK;
 }
 
-INIT_PREV_EXPORT(rt_work_sys_workqueue_init);
+INIT_DEVICE_EXPORT(rt_work_sys_workqueue_init);
 #endif
 #endif

From d6b44ca52ed2ddc27e447ae2fe2914b9eb38687f Mon Sep 17 00:00:00 2001
From: tangyuxin <462747508@qq.com>
Date: Sat, 6 Feb 2021 20:08:31 +0800
Subject: [PATCH 08/15] =?UTF-8?q?[workqueue]=20=E6=94=AF=E6=8C=81=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=BB=B6=E6=97=B6=E5=B7=A5=E4=BD=9C=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/drivers/include/ipc/workqueue.h |  1 +
 components/drivers/src/workqueue.c         | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/components/drivers/include/ipc/workqueue.h b/components/drivers/include/ipc/workqueue.h
index 23e256c420..51976b4de7 100644
--- a/components/drivers/include/ipc/workqueue.h
+++ b/components/drivers/include/ipc/workqueue.h
@@ -29,6 +29,7 @@ enum
 struct rt_workqueue
 {
     rt_list_t      work_list;
+    rt_list_t      delayed_list;
     struct rt_work *work_current; /* current work */
 
     struct rt_semaphore sem;
diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index 1b7dbea0c1..eb6cefc006 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -135,6 +135,8 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
             work->flags |= RT_WORK_STATE_SUBMITTING;
         }
         work->workqueue = queue;
+        /* insert delay work list */
+        rt_list_insert_after(queue->delayed_list.prev, &(work->list));
         rt_hw_interrupt_enable(level);
         rt_timer_start(&(work->timer));
         return RT_EOK;
@@ -175,6 +177,8 @@ static void _delayed_work_timeout_handler(void *parameter)
     level = rt_hw_interrupt_disable();
     rt_timer_detach(&(work->timer));
     work->flags &= ~RT_WORK_STATE_SUBMITTING;
+    /* remove delay list */
+    rt_list_remove(&(work->list));
     /* insert work queue */
     if (queue->work_current != work)
     {
@@ -205,6 +209,7 @@ struct rt_workqueue *rt_workqueue_create(const char *name, rt_uint16_t stack_siz
     {
         /* initialize work list */
         rt_list_init(&(queue->work_list));
+        rt_list_init(&(queue->delayed_list));
         queue->work_current = RT_NULL;
         rt_sem_init(&(queue->sem), "wqueue", 0, RT_IPC_FLAG_FIFO);
 
@@ -302,14 +307,22 @@ rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_wor
 rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue)
 {
     struct rt_list_node *node, *next;
+    struct rt_work *work;
+
     RT_ASSERT(queue != RT_NULL);
 
-    // TODO: cancel delay work
+    // cancel work
     rt_enter_critical();
-    for (node = queue->work_list.next; node != &(queue->work_list); node = next)
+    while (rt_list_isempty(&queue->work_list) != RT_FALSE)
     {
-        next = node->next;
-        rt_list_remove(node);
+        work = rt_list_first_entry(&queue->work_list, struct rt_work, list);
+        _workqueue_cancel_work(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);
+        _workqueue_cancel_work(work);
     }
     rt_exit_critical();
 

From 3ef3fb50afdb388918fe7514d287aca753030f27 Mon Sep 17 00:00:00 2001
From: tangyuxin <462747508@qq.com>
Date: Sat, 6 Feb 2021 20:15:50 +0800
Subject: [PATCH 09/15] =?UTF-8?q?[workqueue]=20=E9=98=9F=E5=88=97=E9=94=80?=
 =?UTF-8?q?=E6=AF=81=E6=97=B6=E5=8F=96=E6=B6=88=E6=89=80=E6=9C=89=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=B9=B6=E9=87=8A=E6=94=BE=E5=86=85=E6=A0=B8=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/drivers/src/workqueue.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index eb6cefc006..474eae556b 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -231,7 +231,9 @@ rt_err_t rt_workqueue_destroy(struct rt_workqueue *queue)
 {
     RT_ASSERT(queue != RT_NULL);
 
+    rt_workqueue_cancel_all_work();
     rt_thread_delete(queue->work_thread);
+    rt_sem_detach(&(queue->sem));
     RT_KERNEL_FREE(queue);
 
     return RT_EOK;

From 7eabe5c9e9a2a93aa7303bee15c156e623986194 Mon Sep 17 00:00:00 2001
From: tangyuxin <462747508@qq.com>
Date: Sat, 6 Feb 2021 20:39:52 +0800
Subject: [PATCH 10/15] =?UTF-8?q?[workqueue]=20=E5=8F=96=E6=B6=88=E6=AD=A3?=
 =?UTF-8?q?=E5=9C=A8=E6=89=A7=E8=A1=8C=E7=9A=84=E5=B7=A5=E4=BD=9C=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9EBUSY?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/drivers/src/workqueue.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index 474eae556b..3feeaea0be 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -145,9 +145,10 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
     return -RT_ERROR;
 }
 
-static rt_err_t _workqueue_cancel_work(struct rt_work *work)
+static rt_err_t _workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *work)
 {
     rt_base_t level;
+    rt_err_t err;
 
     level = rt_hw_interrupt_disable();
     rt_list_remove(&(work->list));
@@ -159,9 +160,10 @@ static rt_err_t _workqueue_cancel_work(struct rt_work *work)
         rt_timer_detach(&(work->timer));
         work->flags &= ~RT_WORK_STATE_SUBMITTING;
     }
+    err = queue->work_current != work ? RT_EOK : -RT_EBUSY;
     work->workqueue = RT_NULL;
     rt_hw_interrupt_enable(level);
-    return 0;
+    return err;
 }
 
 static void _delayed_work_timeout_handler(void *parameter)
@@ -231,7 +233,7 @@ rt_err_t rt_workqueue_destroy(struct rt_workqueue *queue)
 {
     RT_ASSERT(queue != RT_NULL);
 
-    rt_workqueue_cancel_all_work();
+    rt_workqueue_cancel_all_work(queue);
     rt_thread_delete(queue->work_thread);
     rt_sem_detach(&(queue->sem));
     RT_KERNEL_FREE(queue);
@@ -285,7 +287,8 @@ rt_err_t rt_workqueue_critical_work(struct rt_workqueue *queue, struct rt_work *
 rt_err_t rt_workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *work)
 {
     RT_ASSERT(work != RT_NULL);
-    return _workqueue_cancel_work(work);
+    RT_ASSERT(queue != RT_NULL);
+    return _workqueue_cancel_work(queue, work);
 }
 
 rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_work *work)
@@ -300,7 +303,7 @@ rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_wor
     }
     else
     {
-        _workqueue_cancel_work(work);
+        _workqueue_cancel_work(queue, work);
     }
 
     return RT_EOK;
@@ -308,23 +311,22 @@ rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_wor
 
 rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue)
 {
-    struct rt_list_node *node, *next;
     struct rt_work *work;
 
     RT_ASSERT(queue != RT_NULL);
 
     // cancel work
     rt_enter_critical();
-    while (rt_list_isempty(&queue->work_list) != RT_FALSE)
+    while (rt_list_isempty(&queue->work_list) == RT_FALSE)
     {
         work = rt_list_first_entry(&queue->work_list, struct rt_work, list);
-        _workqueue_cancel_work(work);
+        _workqueue_cancel_work(queue, work);
     }
     // cancel delay work
-    while (rt_list_isempty(&queue->delayed_list) != RT_FALSE)
+    while (rt_list_isempty(&queue->delayed_list) == RT_FALSE)
     {
         work = rt_list_first_entry(&queue->delayed_list, struct rt_work, list);
-        _workqueue_cancel_work(work);
+        _workqueue_cancel_work(queue, work);
     }
     rt_exit_critical();
 

From 83dca09e1c31637583b99823c86ed86fa3e12491 Mon Sep 17 00:00:00 2001
From: tangyuxin <462747508@qq.com>
Date: Sat, 6 Feb 2021 21:54:25 +0800
Subject: [PATCH 11/15] =?UTF-8?q?[workqueue]=20=E4=BF=AE=E5=A4=8D=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=B7=A5=E4=BD=9C=E5=90=8E=E7=AB=8B=E5=8D=B3=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=97=A0=E6=95=88=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E4=BB=BB=E5=8A=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

当高优先级任务提交工作后，立即取消。此时队列被唤醒，下面紧接着获取链表中第一个任务。但此时已经是空链表了。

每次线程被唤醒。检查当前任务链表是否未空
---
 components/drivers/src/workqueue.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index 3feeaea0be..ce1ca071c3 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -58,15 +58,17 @@ static void _workqueue_thread_entry(void *parameter)
 
     while (1)
     {
+        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_schedule();
+            continue;
         }
 
         /* we have work to do with. */
-        level = rt_hw_interrupt_disable();
         work = rt_list_entry(queue->work_list.next, struct rt_work, list);
         rt_list_remove(&(work->list));
         queue->work_current = work;
@@ -76,10 +78,8 @@ static void _workqueue_thread_entry(void *parameter)
 
         /* do work */
         work->work_func(work, work->work_data);
-        level = rt_hw_interrupt_disable();
         /* clean current work */
         queue->work_current = RT_NULL;
-        rt_hw_interrupt_enable(level);
 
         /* ack work completion */
         _workqueue_work_completion(queue);

From a96156faf11d97e50687732f95a2d589c39dc194 Mon Sep 17 00:00:00 2001
From: tangyuxin <462747508@qq.com>
Date: Sun, 7 Feb 2021 10:30:25 +0800
Subject: [PATCH 12/15] =?UTF-8?q?[workqueue]=20=E6=8F=90=E4=BA=A4=E6=AD=A3?=
 =?UTF-8?q?=E5=9C=A8=E6=89=A7=E8=A1=8C=E7=9A=84=E5=B7=A5=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=20BUSY?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/drivers/src/workqueue.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index ce1ca071c3..f6bb6114aa 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -90,6 +90,7 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
         struct rt_work *work, rt_tick_t ticks)
 {
     rt_base_t level;
+    rt_err_t err;
 
     level = rt_hw_interrupt_disable();
     /* remove list */
@@ -103,6 +104,11 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
             rt_list_insert_after(queue->work_list.prev, &(work->list));
             work->flags |= RT_WORK_STATE_PENDING;
             work->workqueue = queue;
+            err = RT_EOK;
+        }
+        else
+        {
+            err = -RT_EBUSY;
         }
 
         /* whether the workqueue is doing work */
@@ -118,7 +124,7 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
         {
             rt_hw_interrupt_enable(level);
         }
-        return RT_EOK;
+        return err;
     }
     else if (ticks < RT_TICK_MAX / 2)
     {

From 83692a54c444f07eb4a5e980f696f050f5e924e1 Mon Sep 17 00:00:00 2001
From: tangyuxin <462747508@qq.com>
Date: Sun, 7 Feb 2021 11:14:59 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E3=80=90workqueue=E3=80=91=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=87=BD=E6=95=B0=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue);
---
 components/drivers/include/ipc/workqueue.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/drivers/include/ipc/workqueue.h b/components/drivers/include/ipc/workqueue.h
index 51976b4de7..11fee489bd 100644
--- a/components/drivers/include/ipc/workqueue.h
+++ b/components/drivers/include/ipc/workqueue.h
@@ -63,6 +63,7 @@ rt_err_t rt_workqueue_dowork(struct rt_workqueue *queue, struct rt_work *work);
 rt_err_t rt_workqueue_submit_work(struct rt_workqueue *queue, struct rt_work *work, rt_tick_t time);
 rt_err_t rt_workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *work);
 rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_work *work);
+rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue);
 
 #ifdef RT_USING_SYSTEM_WORKQUEUE
 rt_err_t rt_work_submit(struct rt_work *work, rt_tick_t time);

From 791b8a35deba00ca334ca81c4e451037d05ae883 Mon Sep 17 00:00:00 2001
From: tangyuxin <462747508@qq.com>
Date: Mon, 22 Feb 2021 11:23:20 +0800
Subject: [PATCH 14/15] =?UTF-8?q?[workqueue]=20=E7=B3=BB=E7=BB=9F=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=B7=A5=E4=BD=9C=E9=98=9F=E5=88=97=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E9=98=B6=E6=AE=B5=E6=8F=90=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/drivers/src/workqueue.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index f6bb6114aa..d852b7a4d8 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -369,7 +369,6 @@ int rt_work_sys_workqueue_init(void)
 
     return RT_EOK;
 }
-
-INIT_DEVICE_EXPORT(rt_work_sys_workqueue_init);
+INIT_PREV_EXPORT(rt_work_sys_workqueue_init);
 #endif
 #endif

From 4f2359d34c502901c56c84ee0b08561aa12f8113 Mon Sep 17 00:00:00 2001
From: tangyuxin <462747508@qq.com>
Date: Mon, 22 Feb 2021 17:10:33 +0800
Subject: [PATCH 15/15] =?UTF-8?q?[workqueue]=20=E4=BF=AE=E5=A4=8D=E4=B8=B4?=
 =?UTF-8?q?=E7=95=8C=E6=9D=A1=E4=BB=B6=E7=BA=BF=E7=A8=8B=E6=84=8F=E5=A4=96?=
 =?UTF-8?q?=E6=8C=82=E8=B5=B7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

将线程的挂起与恢复放在中断保护内，确保挂起挂起恢复是一个完整的过程
---
 components/drivers/src/workqueue.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c
index d852b7a4d8..7aea647703 100644
--- a/components/drivers/src/workqueue.c
+++ b/components/drivers/src/workqueue.c
@@ -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);