Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
RT-Thread
rt-thread
提交
36cbc1fd
R
rt-thread
项目概览
RT-Thread
/
rt-thread
大约 1 年 前同步成功
通知
774
Star
8911
Fork
4735
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
36cbc1fd
编写于
1月 16, 2022
作者:
mysterywolf
提交者:
Bernard Xiong
1月 20, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[workqueue] time参数改为ticks,防止误解单位为ms
上级
3a789b33
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
42 addition
and
31 deletion
+42
-31
components/drivers/include/ipc/workqueue.h
components/drivers/include/ipc/workqueue.h
+5
-20
components/drivers/src/workqueue.c
components/drivers/src/workqueue.c
+35
-9
src/timer.c
src/timer.c
+2
-2
未找到文件。
components/drivers/include/ipc/workqueue.h
浏览文件 @
36cbc1fd
/*
* Copyright (c) 2006-202
1
, RT-Thread Development Team
* Copyright (c) 2006-202
2
, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
...
...
@@ -54,37 +54,22 @@ struct rt_work
/**
* WorkQueue for DeviceDriver
*/
void
rt_work_init
(
struct
rt_work
*
work
,
void
(
*
work_func
)(
struct
rt_work
*
work
,
void
*
work_data
),
void
*
work_data
);
struct
rt_workqueue
*
rt_workqueue_create
(
const
char
*
name
,
rt_uint16_t
stack_size
,
rt_uint8_t
priority
);
rt_err_t
rt_workqueue_destroy
(
struct
rt_workqueue
*
queue
);
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
ti
me
);
rt_err_t
rt_workqueue_submit_work
(
struct
rt_workqueue
*
queue
,
struct
rt_work
*
work
,
rt_tick_t
ti
cks
);
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
);
rt_err_t
rt_workqueue_urgent_work
(
struct
rt_workqueue
*
queue
,
struct
rt_work
*
work
);
#ifdef RT_USING_SYSTEM_WORKQUEUE
rt_err_t
rt_work_submit
(
struct
rt_work
*
work
,
rt_tick_t
ti
me
);
rt_err_t
rt_work_submit
(
struct
rt_work
*
work
,
rt_tick_t
ti
cks
);
rt_err_t
rt_work_cancel
(
struct
rt_work
*
work
);
#endif
/* RT_USING_SYSTEM_WORKQUEUE */
/**
* @brief Initialize a work item, binding with a callback function.
*
* @param work A pointer to the work item object.
* @param work_func A callback function that will be called when this work item is executed.
* @param work_data A user data passed to the callback function as the second parameter.
*/
rt_inline
void
rt_work_init
(
struct
rt_work
*
work
,
void
(
*
work_func
)(
struct
rt_work
*
work
,
void
*
work_data
),
void
*
work_data
)
{
rt_list_init
(
&
(
work
->
list
));
work
->
work_func
=
work_func
;
work
->
work_data
=
work_data
;
work
->
workqueue
=
RT_NULL
;
work
->
flags
=
0
;
work
->
type
=
0
;
}
#endif
/* RT_USING_HEAP */
...
...
components/drivers/src/workqueue.c
浏览文件 @
36cbc1fd
...
...
@@ -210,6 +210,30 @@ static void _delayed_work_timeout_handler(void *parameter)
}
}
/**
* @brief Initialize a work item, binding with a callback function.
*
* @param work is a pointer to the work item object.
*
* @param work_func is a callback function that will be called when this work item is executed.
*
* @param work_data is a user data passed to the callback function as the second parameter.
*/
void
rt_work_init
(
struct
rt_work
*
work
,
void
(
*
work_func
)(
struct
rt_work
*
work
,
void
*
work_data
),
void
*
work_data
)
{
RT_ASSERT
(
work
!=
RT_NULL
);
RT_ASSERT
(
work_func
!=
RT_NULL
);
rt_list_init
(
&
(
work
->
list
));
work
->
work_func
=
work_func
;
work
->
work_data
=
work_data
;
work
->
workqueue
=
RT_NULL
;
work
->
flags
=
0
;
work
->
type
=
0
;
}
/**
* @brief Create a work queue with a thread inside.
*
...
...
@@ -292,20 +316,21 @@ rt_err_t rt_workqueue_dowork(struct rt_workqueue *queue, struct rt_work *work)
*
* @param work is a pointer to the work item object.
*
* @param ti
me is the delay time (unit: OS ticks)
for the work item to be submitted to the work queue.
* @param ti
cks is the delay ticks
for the work item to be submitted to the work queue.
*
* NOTE: The max timeout tick should be no more than (RT_TICK_MAX/2 - 1)
*
* @return RT_EOK Success.
* -RT_EBUSY This work item is executing.
* -RT_ERROR The ti
me
parameter is invalid.
* -RT_ERROR The ti
cks
parameter is invalid.
*/
rt_err_t
rt_workqueue_submit_work
(
struct
rt_workqueue
*
queue
,
struct
rt_work
*
work
,
rt_tick_t
ti
me
)
rt_err_t
rt_workqueue_submit_work
(
struct
rt_workqueue
*
queue
,
struct
rt_work
*
work
,
rt_tick_t
ti
cks
)
{
RT_ASSERT
(
queue
!=
RT_NULL
);
RT_ASSERT
(
work
!=
RT_NULL
);
RT_ASSERT
(
ticks
<
RT_TICK_MAX
/
2
);
return
_workqueue_submit_work
(
queue
,
work
,
ti
me
);
return
_workqueue_submit_work
(
queue
,
work
,
ti
cks
);
}
/**
...
...
@@ -422,24 +447,25 @@ rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue)
}
#ifdef RT_USING_SYSTEM_WORKQUEUE
static
struct
rt_workqueue
*
sys_workq
;
static
struct
rt_workqueue
*
sys_workq
;
/* system work queue */
/**
* @brief Submit a work item to the system work queue with a delay.
*
* @param work is a pointer to the work item object.
*
* @param ti
me is the delay time (unit: OS ticks)
for the work item to be submitted to the work queue.
* @param ti
cks is the delay OS ticks
for the work item to be submitted to the work queue.
*
* NOTE: The max timeout tick should be no more than (RT_TICK_MAX/2 - 1)
*
* @return RT_EOK Success.
* -RT_EBUSY This work item is executing.
* -RT_ERROR The ti
me
parameter is invalid.
* -RT_ERROR The ti
cks
parameter is invalid.
*/
rt_err_t
rt_work_submit
(
struct
rt_work
*
work
,
rt_tick_t
ti
me
)
rt_err_t
rt_work_submit
(
struct
rt_work
*
work
,
rt_tick_t
ti
cks
)
{
return
rt_workqueue_submit_work
(
sys_workq
,
work
,
ti
me
);
return
rt_workqueue_submit_work
(
sys_workq
,
work
,
ti
cks
);
}
/**
...
...
src/timer.c
浏览文件 @
36cbc1fd
...
...
@@ -263,7 +263,7 @@ void rt_timer_init(rt_timer_t timer,
/* parameter check */
RT_ASSERT
(
timer
!=
RT_NULL
);
RT_ASSERT
(
timeout
!=
RT_NULL
);
RT_ASSERT
(
time
r
->
init_tick
<
RT_TICK_MAX
/
2
);
RT_ASSERT
(
time
<
RT_TICK_MAX
/
2
);
/* timer object initialization */
rt_object_init
(
&
(
timer
->
parent
),
RT_Object_Class_Timer
,
name
);
...
...
@@ -332,7 +332,7 @@ rt_timer_t rt_timer_create(const char *name,
/* parameter check */
RT_ASSERT
(
timeout
!=
RT_NULL
);
RT_ASSERT
(
time
r
->
init_tick
<
RT_TICK_MAX
/
2
);
RT_ASSERT
(
time
<
RT_TICK_MAX
/
2
);
/* allocate a object */
timer
=
(
struct
rt_timer
*
)
rt_object_allocate
(
RT_Object_Class_Timer
,
name
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录