Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
RT-Thread
rt-thread
提交
76be91c7
R
rt-thread
项目概览
RT-Thread
/
rt-thread
大约 1 年 前同步成功
通知
775
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,发现更多精彩内容 >>
提交
76be91c7
编写于
4月 14, 2021
作者:
armink_ztl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[libc/time] Add microseconds time get feature in gettimeofday.
上级
2a66024b
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
34 addition
and
25 deletion
+34
-25
components/libc/compilers/common/time.c
components/libc/compilers/common/time.c
+34
-25
未找到文件。
components/libc/compilers/common/time.c
浏览文件 @
76be91c7
...
...
@@ -120,7 +120,7 @@ struct tm* localtime_r(const time_t* t, struct tm* r)
time_t
local_tz
;
int
utc_plus
;
utc_plus
=
0
;
/* GTM: UTC+0
*/
utc_plus
=
8
;
/* GMT: UTC+8
*/
local_tz
=
*
t
+
utc_plus
*
3600
;
return
gmtime_r
(
&
local_tz
,
r
);
}
...
...
@@ -183,18 +183,14 @@ char* ctime(const time_t *tim_p)
}
RTM_EXPORT
(
ctime
);
/**
* Returns the current time.
*
* @param time_t * t the timestamp pointer, if not used, keep NULL.
*
* @return The value ((time_t)-1) is returned if the calendar time is not available.
* If timer is not a NULL pointer, the return value is also stored in timer.
*
*/
RT_WEAK
time_t
time
(
time_t
*
t
)
static
void
get_timeval
(
struct
timeval
*
tv
)
{
time_t
time_now
=
((
time_t
)
-
1
);
/* default is not available */
if
(
tv
==
RT_NULL
)
return
;
/* default is not available */
tv
->
tv_sec
=
-
1
;
/* default is 0 */
tv
->
tv_usec
=
0
;
#ifdef RT_USING_RTC
static
rt_device_t
device
=
RT_NULL
;
...
...
@@ -210,26 +206,41 @@ RT_WEAK time_t time(time_t *t)
{
if
(
rt_device_open
(
device
,
0
)
==
RT_EOK
)
{
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_GET_TIME
,
&
time_now
);
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_GET_TIME
,
&
tv
->
tv_sec
);
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_GET_TIME_US
,
&
tv
->
tv_usec
);
rt_device_close
(
device
);
}
}
#endif
/* RT_USING_RTC */
/* if t is not NULL, write timestamp to *t */
if
(
t
!=
RT_NULL
)
{
*
t
=
time_now
;
}
if
(
time_now
==
(
time_t
)
-
1
)
if
(
tv
->
tv_sec
==
(
time_t
)
-
1
)
{
/* LOG_W will cause a recursive printing if ulog timestamp function is turned on */
rt_kprintf
(
"Cannot find a RTC device to provide time!
\r\n
"
);
errno
=
ENOSYS
;
}
}
return
time_now
;
/**
* Returns the current time.
*
* @param time_t * t the timestamp pointer, if not used, keep NULL.
*
* @return The value ((time_t)-1) is returned if the calendar time is not available.
* If timer is not a NULL pointer, the return value is also stored in timer.
*
*/
RT_WEAK
time_t
time
(
time_t
*
t
)
{
struct
timeval
now
;
get_timeval
(
&
now
);
if
(
t
)
{
*
t
=
now
.
tv_sec
;
}
return
now
.
tv_sec
;
}
RTM_EXPORT
(
time
);
...
...
@@ -344,12 +355,10 @@ RTM_EXPORT(timegm);
/* TODO: timezone */
int
gettimeofday
(
struct
timeval
*
tv
,
struct
timezone
*
tz
)
{
time_t
t
=
time
(
RT_NULL
);
get_timeval
(
tv
);
if
(
tv
!=
RT_NULL
&&
t
!=
(
time_t
)
-
1
)
if
(
tv
!=
RT_NULL
&&
t
v
->
tv_sec
!=
(
time_t
)
-
1
)
{
tv
->
tv_sec
=
t
;
tv
->
tv_usec
=
0
;
return
0
;
}
else
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录