Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
红岛
rt-thread
提交
01fa184f
R
rt-thread
项目概览
红岛
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
01fa184f
编写于
12月 19, 2019
作者:
B
Bernard Xiong
提交者:
GitHub
12月 19, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3275 from BernardXiong/delayUtil
Delay until
上级
c05d9dfe
2c1f7b73
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
71 addition
and
7 deletion
+71
-7
components/dfs/src/dfs_file.c
components/dfs/src/dfs_file.c
+3
-5
components/drivers/src/pipe.c
components/drivers/src/pipe.c
+10
-2
include/rtthread.h
include/rtthread.h
+1
-0
src/thread.c
src/thread.c
+57
-0
未找到文件。
components/dfs/src/dfs_file.c
浏览文件 @
01fa184f
...
...
@@ -369,8 +369,7 @@ int dfs_file_stat(const char *path, struct stat *buf)
if
((
fs
=
dfs_filesystem_lookup
(
fullpath
))
==
NULL
)
{
LOG_E
(
"can't find mounted filesystem on this path:%s"
,
fullpath
);
LOG_E
(
"can't find mounted filesystem on this path:%s"
,
fullpath
);
rt_free
(
fullpath
);
return
-
ENOENT
;
...
...
@@ -399,8 +398,7 @@ int dfs_file_stat(const char *path, struct stat *buf)
if
(
fs
->
ops
->
stat
==
NULL
)
{
rt_free
(
fullpath
);
LOG_E
(
"the filesystem didn't implement this function"
);
LOG_E
(
"the filesystem didn't implement this function"
);
return
-
ENOSYS
;
}
...
...
@@ -565,7 +563,7 @@ void ls(const char *pathname)
}
else
{
rt_kprintf
(
"%-25lu
\n
"
,
stat
.
st_size
);
rt_kprintf
(
"%-25lu
\n
"
,
(
unsigned
long
)
stat
.
st_size
);
}
}
else
...
...
components/drivers/src/pipe.c
浏览文件 @
01fa184f
...
...
@@ -19,6 +19,7 @@
static
int
pipe_fops_open
(
struct
dfs_fd
*
fd
)
{
int
rc
=
0
;
rt_device_t
device
;
rt_pipe_t
*
pipe
;
...
...
@@ -31,6 +32,11 @@ static int pipe_fops_open(struct dfs_fd *fd)
if
(
device
->
ref_count
==
0
)
{
pipe
->
fifo
=
rt_ringbuffer_create
(
pipe
->
bufsz
);
if
(
pipe
->
fifo
==
RT_NULL
)
{
rc
=
-
RT_ENOMEM
;
goto
__exit
;
}
}
switch
(
fd
->
flags
&
O_ACCMODE
)
...
...
@@ -48,9 +54,10 @@ static int pipe_fops_open(struct dfs_fd *fd)
}
device
->
ref_count
++
;
__exit:
rt_mutex_release
(
&
(
pipe
->
lock
));
return
0
;
return
rc
;
}
static
int
pipe_fops_close
(
struct
dfs_fd
*
fd
)
...
...
@@ -90,7 +97,8 @@ static int pipe_fops_close(struct dfs_fd *fd)
if
(
device
->
ref_count
==
1
)
{
rt_ringbuffer_destroy
(
pipe
->
fifo
);
if
(
pipe
->
fifo
!=
RT_NULL
)
rt_ringbuffer_destroy
(
pipe
->
fifo
);
pipe
->
fifo
=
RT_NULL
;
}
device
->
ref_count
--
;
...
...
include/rtthread.h
浏览文件 @
01fa184f
...
...
@@ -138,6 +138,7 @@ rt_err_t rt_thread_delete(rt_thread_t thread);
rt_err_t
rt_thread_yield
(
void
);
rt_err_t
rt_thread_delay
(
rt_tick_t
tick
);
rt_err_t
rt_thread_delay_until
(
rt_tick_t
*
tick
,
rt_tick_t
inc_tick
);
rt_err_t
rt_thread_mdelay
(
rt_int32_t
ms
);
rt_err_t
rt_thread_control
(
rt_thread_t
thread
,
int
cmd
,
void
*
arg
);
rt_err_t
rt_thread_suspend
(
rt_thread_t
thread
);
...
...
src/thread.c
浏览文件 @
01fa184f
...
...
@@ -530,6 +530,63 @@ rt_err_t rt_thread_delay(rt_tick_t tick)
}
RTM_EXPORT
(
rt_thread_delay
);
/**
* This function will let current thread delay until (*tick + inc_tick).
*
* @param tick the tick of last wakeup.
* @param inc_tick the increment tick
*
* @return RT_EOK
*/
rt_err_t
rt_thread_delay_until
(
rt_tick_t
*
tick
,
rt_tick_t
inc_tick
)
{
register
rt_base_t
level
;
struct
rt_thread
*
thread
;
RT_ASSERT
(
tick
!=
RT_NULL
);
/* set to current thread */
thread
=
rt_thread_self
();
RT_ASSERT
(
thread
!=
RT_NULL
);
RT_ASSERT
(
rt_object_get_type
((
rt_object_t
)
thread
)
==
RT_Object_Class_Thread
);
/* disable interrupt */
level
=
rt_hw_interrupt_disable
();
if
(
rt_tick_get
()
-
*
tick
<
inc_tick
)
{
*
tick
=
rt_tick_get
()
-
*
tick
+
inc_tick
;
/* suspend thread */
rt_thread_suspend
(
thread
);
/* reset the timeout of thread timer and start it */
rt_timer_control
(
&
(
thread
->
thread_timer
),
RT_TIMER_CTRL_SET_TIME
,
tick
);
rt_timer_start
(
&
(
thread
->
thread_timer
));
/* enable interrupt */
rt_hw_interrupt_enable
(
level
);
rt_schedule
();
/* clear error number of this thread to RT_EOK */
if
(
thread
->
error
==
-
RT_ETIMEOUT
)
{
thread
->
error
=
RT_EOK
;
}
}
else
{
rt_hw_interrupt_enable
(
level
);
}
/* get the wakeup tick */
*
tick
=
rt_tick_get
();
return
RT_EOK
;
}
RTM_EXPORT
(
rt_thread_delay_util
);
/**
* This function will let current thread delay for some milliseconds.
*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录