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

Merge pull request #2600 from EvalZero/master 

[components][workqueue]improve delayed work for reinit.
This commit is contained in:
Bernard Xiong 2019-04-22 19:28:25 +08:00 committed by GitHub
parent b2f39ab81c 3ada52e353
commit ca7ebe6175
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/drivers/include/ipc/workqueue.h
View File

@ -13,7 +13,8 @@
enum
{
RT_WORK_STATE_PENDING, /* Work item pending state */
RT_WORK_STATE_PENDING = 0x0001, /* Work item pending state */
RT_WORK_STATE_SUBMITTING = 0x0002, /* Work item submitting state */
};
/**
@ -21,7 +22,7 @@ enum
*/
enum
{
RT_WORK_TYPE_DELAYED,
RT_WORK_TYPE_DELAYED = 0x0001,
};
/* workqueue implementation */
@ -81,4 +82,3 @@ void rt_delayed_work_init(struct rt_delayed_work *work, void (*work_func)(struct
#endif
#endif

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

@ -14,6 +14,8 @@
#ifdef RT_USING_HEAP
static void _delayed_work_timeout_handler(void *parameter);
rt_inline rt_err_t _workqueue_work_completion(struct rt_workqueue *queue)
{
rt_err_t result;
@ -161,7 +163,14 @@ static rt_err_t _workqueue_cancel_delayed_work(struct rt_delayed_work *work)
}
else
{
rt_timer_stop(&(work->timer));
if (work->work.flags & RT_WORK_STATE_SUBMITTING)
{
level = rt_hw_interrupt_disable();
rt_timer_stop(&(work->timer));
rt_timer_detach(&(work->timer));
work->work.flags &= ~RT_WORK_STATE_SUBMITTING;
rt_hw_interrupt_enable(level);
}
}
level = rt_hw_interrupt_disable();
@ -210,8 +219,12 @@ static rt_err_t _workqueue_submit_delayed_work(struct rt_workqueue *queue,
}
else
{
level = rt_hw_interrupt_disable();
/* Add timeout */
rt_timer_control(&(work->timer), RT_TIMER_CTRL_SET_TIME, &ticks);
work->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));
}
@ -222,9 +235,14 @@ __exit:
static void _delayed_work_timeout_handler(void *parameter)
{
struct rt_delayed_work *delayed_work;
rt_base_t level;
delayed_work = (struct rt_delayed_work *)parameter;
level = rt_hw_interrupt_disable();
rt_timer_stop(&(delayed_work->timer));
rt_timer_detach(&(delayed_work->timer));
delayed_work->work.flags &= ~RT_WORK_STATE_SUBMITTING;
rt_hw_interrupt_enable(level);
_workqueue_submit_work(delayed_work->workqueue, &(delayed_work->work));
}
@ -375,8 +393,6 @@ void rt_delayed_work_init(struct rt_delayed_work *work, void (*work_func)(struct
{
rt_work_init(&(work->work), work_func, work_data);
work->work.type = RT_WORK_TYPE_DELAYED;
rt_timer_init(&(work->timer), "work", _delayed_work_timeout_handler, work, 0,
RT_TIMER_FLAG_ONE_SHOT | RT_TIMER_FLAG_SOFT_TIMER);
}
#ifdef RT_USING_SYSTEM_WORKQUEUE

1
components/net/sal_socket/src/sal_socket.c
View File

@ -157,7 +157,6 @@ static void check_netdev_internet_up_work(struct rt_work *work, void *work_data)
if (work)
{
rt_timer_detach(&(delay_work->timer));
rt_free(delay_work);
}