Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-21 02:06:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[components][drivers]fix workqueue bug

Browse Source 
fix workqueue bug
This commit is contained in:
zms123456
2024-04-15 23:15:37 -04:00
committed by GitHub
parent d10fb37c05
commit 6ad0b2bd09
4 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/drivers/ipc/workqueue.c
+12 -4
View File
@@ -94,6 +94,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_spin_lock_irqsave(&(queue->spinlock));
@@ -125,7 +126,6 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
/* 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
@@ -137,9 +137,11 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue,
work->workqueue = queue;
/* insert delay work list */
rt_list_insert_after(queue->delayed_list.prev, &(work->list));
err = rt_timer_start(&(work->timer));
rt_spin_unlock_irqrestore(&(queue->spinlock), level);
rt_timer_start(&(work->timer));
return RT_EOK;
return err;
}
rt_spin_unlock_irqrestore(&(queue->spinlock), level);
return -RT_ERROR;
@@ -156,7 +158,11 @@ static rt_err_t _workqueue_cancel_work(struct rt_workqueue *queue, struct rt_wor
/* Timer started */
if (work->flags & RT_WORK_STATE_SUBMITTING)
{
rt_timer_stop(&(work->timer));
if ((err = rt_timer_stop(&(work->timer))) != RT_EOK)
{
rt_spin_unlock_irqrestore(&(queue->spinlock), level);
return err;
}
rt_timer_detach(&(work->timer));
work->flags &= ~RT_WORK_STATE_SUBMITTING;
}
@@ -174,6 +180,8 @@ static void _delayed_work_timeout_handler(void *parameter)
work = (struct rt_work *)parameter;
queue = work->workqueue;
RT_ASSERT(work->flags & RT_WORK_STATE_SUBMITTING);
RT_ASSERT(queue != RT_NULL);
level = rt_spin_lock_irqsave(&(queue->spinlock));
components/drivers/serial/serial_tty.c
+1 -1
View File
@@ -146,7 +146,6 @@ rt_inline void _setup_serial(struct rt_serial_device *serial, lwp_tty_t tp,
rt_device_init(&serial->parent);
rt_work_init(&softc->work, _tty_rx_worker, tp);
rt_device_control(&serial->parent, RT_DEVICE_CTRL_NOTIFY_SET, &notify);
}
@@ -295,6 +294,7 @@ rt_err_t rt_hw_serial_register_tty(struct rt_serial_device *serial)
if (tty)
{
rc = lwp_tty_register(tty, dev_name);
rt_work_init(&softc->work, _tty_rx_worker, tty);
if (rc != RT_EOK)
{