Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Mozi
rt-thread
提交
598aa86f
R
rt-thread
项目概览
Mozi
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
0
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
598aa86f
编写于
2月 12, 2021
作者:
mysterywolf
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move clock_time_to_tick to time.c
上级
40bb949c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
36 addition
and
35 deletion
+36
-35
components/libc/compilers/common/sys/time.h
components/libc/compilers/common/sys/time.h
+1
-0
components/libc/compilers/common/time.c
components/libc/compilers/common/time.c
+34
-0
components/libc/pthreads/pthread.c
components/libc/pthreads/pthread.c
+0
-33
components/libc/pthreads/pthread_internal.h
components/libc/pthreads/pthread_internal.h
+1
-2
未找到文件。
components/libc/compilers/common/sys/time.h
浏览文件 @
598aa86f
...
...
@@ -86,6 +86,7 @@ int settimeofday(const struct timeval *tv, const struct timezone *tz);
int
clock_getres
(
clockid_t
clockid
,
struct
timespec
*
res
);
int
clock_gettime
(
clockid_t
clockid
,
struct
timespec
*
tp
);
int
clock_settime
(
clockid_t
clockid
,
const
struct
timespec
*
tp
);
int
clock_time_to_tick
(
const
struct
timespec
*
time
);
#endif
/* RT_USING_POSIX */
#ifdef __cplusplus
...
...
components/libc/compilers/common/time.c
浏览文件 @
598aa86f
...
...
@@ -512,4 +512,38 @@ int clock_settime(clockid_t clockid, const struct timespec *tp)
return
0
;
}
RTM_EXPORT
(
clock_settime
);
int
clock_time_to_tick
(
const
struct
timespec
*
time
)
{
int
tick
;
int
nsecond
,
second
;
struct
timespec
tp
;
RT_ASSERT
(
time
!=
RT_NULL
);
tick
=
RT_WAITING_FOREVER
;
if
(
time
!=
NULL
)
{
/* get current tp */
clock_gettime
(
CLOCK_REALTIME
,
&
tp
);
if
((
time
->
tv_nsec
-
tp
.
tv_nsec
)
<
0
)
{
nsecond
=
NANOSECOND_PER_SECOND
-
(
tp
.
tv_nsec
-
time
->
tv_nsec
);
second
=
time
->
tv_sec
-
tp
.
tv_sec
-
1
;
}
else
{
nsecond
=
time
->
tv_nsec
-
tp
.
tv_nsec
;
second
=
time
->
tv_sec
-
tp
.
tv_sec
;
}
tick
=
second
*
RT_TICK_PER_SECOND
+
nsecond
*
RT_TICK_PER_SECOND
/
NANOSECOND_PER_SECOND
;
if
(
tick
<
0
)
tick
=
0
;
}
return
tick
;
}
RTM_EXPORT
(
clock_time_to_tick
);
#endif
/* RT_USING_POSIX */
components/libc/pthreads/pthread.c
浏览文件 @
598aa86f
...
...
@@ -688,36 +688,3 @@ int pthread_cancel(pthread_t thread)
return
0
;
}
RTM_EXPORT
(
pthread_cancel
);
int
clock_time_to_tick
(
const
struct
timespec
*
time
)
{
int
tick
;
int
nsecond
,
second
;
struct
timespec
tp
;
RT_ASSERT
(
time
!=
RT_NULL
);
tick
=
RT_WAITING_FOREVER
;
if
(
time
!=
NULL
)
{
/* get current tp */
clock_gettime
(
CLOCK_REALTIME
,
&
tp
);
if
((
time
->
tv_nsec
-
tp
.
tv_nsec
)
<
0
)
{
nsecond
=
NANOSECOND_PER_SECOND
-
(
tp
.
tv_nsec
-
time
->
tv_nsec
);
second
=
time
->
tv_sec
-
tp
.
tv_sec
-
1
;
}
else
{
nsecond
=
time
->
tv_nsec
-
tp
.
tv_nsec
;
second
=
time
->
tv_sec
-
tp
.
tv_sec
;
}
tick
=
second
*
RT_TICK_PER_SECOND
+
nsecond
*
RT_TICK_PER_SECOND
/
NANOSECOND_PER_SECOND
;
if
(
tick
<
0
)
tick
=
0
;
}
return
tick
;
}
RTM_EXPORT
(
clock_time_to_tick
);
components/libc/pthreads/pthread_internal.h
浏览文件 @
598aa86f
...
...
@@ -13,6 +13,7 @@
#include <rtthread.h>
#include <pthread.h>
#include <sys/time.h>
struct
_pthread_cleanup
{
...
...
@@ -62,8 +63,6 @@ typedef struct _pthread_data _pthread_data_t;
_pthread_data_t
*
_pthread_get_data
(
pthread_t
thread
);
int
clock_time_to_tick
(
const
struct
timespec
*
time
);
void
posix_mq_system_init
(
void
);
void
posix_sem_system_init
(
void
);
void
pthread_key_system_init
(
void
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录