Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76519099
rt-thread
提交
75e0ec12
R
rt-thread
项目概览
2301_76519099
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
3
Star
1
Fork
1
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
75e0ec12
编写于
9月 29, 2021
作者:
armink_ztl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[components][time] Revert the old code.
上级
0beb9b3a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
110 addition
and
34 deletion
+110
-34
components/libc/compilers/common/time.c
components/libc/compilers/common/time.c
+110
-34
未找到文件。
components/libc/compilers/common/time.c
浏览文件 @
75e0ec12
...
...
@@ -18,23 +18,21 @@
* 2021-02-12 Meco Man move all of the functions located in <clock_time.c> to this file
* 2021-03-15 Meco Man fixed a bug of leaking memory in asctime()
* 2021-05-01 Meco Man support fixed timezone
* 2021-07-21 Meco Man implement that change/set timezone APIs
*/
#include "sys/time.h"
#include <sys/errno.h>
#include <rtthread.h>
#include <rthw.h>
#ifdef RT_USING_DEVICE
#include <rtdevice.h>
#endif
#define DBG_TAG "
TIME
"
#define DBG_TAG "
time
"
#define DBG_LVL DBG_INFO
#include <rtdbg.h>
#ifndef RT_LIBC_FIXED_TIMEZONE
#define RT_LIBC_FIXED_TIMEZONE 8
/* UTC+8 */
#endif
/* seconds per day */
#define SPD 24*60*60
...
...
@@ -201,7 +199,7 @@ struct tm *gmtime_r(const time_t *timep, struct tm *r)
r
->
tm_mon
=
i
;
r
->
tm_mday
+=
work
-
__spm
[
i
];
r
->
tm_isdst
=
0
;
r
->
tm_isdst
=
tz_is_dst
()
;
return
r
;
}
RTM_EXPORT
(
gmtime_r
);
...
...
@@ -217,7 +215,7 @@ struct tm* localtime_r(const time_t* t, struct tm* r)
{
time_t
local_tz
;
local_tz
=
*
t
+
RT_LIBC_FIXED_TIMEZONE
*
3600
;
local_tz
=
*
t
+
tz_get
()
*
3600
;
return
gmtime_r
(
&
local_tz
,
r
);
}
RTM_EXPORT
(
localtime_r
);
...
...
@@ -234,13 +232,36 @@ time_t mktime(struct tm * const t)
time_t
timestamp
;
timestamp
=
timegm
(
t
);
timestamp
=
timestamp
-
3600
*
RT_LIBC_FIXED_TIMEZONE
;
timestamp
=
timestamp
-
3600
*
tz_get
()
;
return
timestamp
;
}
RTM_EXPORT
(
mktime
);
char
*
asctime_r
(
const
struct
tm
*
t
,
char
*
buf
)
{
/* Checking input validity */
if
(
rt_strlen
(
days
)
<=
(
t
->
tm_wday
<<
2
)
||
rt_strlen
(
months
)
<=
(
t
->
tm_mon
<<
2
))
{
LOG_W
(
"asctime_r: the input parameters exceeded the limit, please check it."
);
*
(
int
*
)
buf
=
*
(
int
*
)
days
;
*
(
int
*
)
(
buf
+
4
)
=
*
(
int
*
)
months
;
num2str
(
buf
+
8
,
t
->
tm_mday
);
if
(
buf
[
8
]
==
'0'
)
buf
[
8
]
=
' '
;
buf
[
10
]
=
' '
;
num2str
(
buf
+
11
,
t
->
tm_hour
);
buf
[
13
]
=
':'
;
num2str
(
buf
+
14
,
t
->
tm_min
);
buf
[
16
]
=
':'
;
num2str
(
buf
+
17
,
t
->
tm_sec
);
buf
[
19
]
=
' '
;
num2str
(
buf
+
20
,
2000
/
100
);
num2str
(
buf
+
22
,
2000
%
100
);
buf
[
24
]
=
'\n'
;
buf
[
25
]
=
'\0'
;
return
buf
;
}
/* "Wed Jun 30 21:49:08 1993\n" */
*
(
int
*
)
buf
=
*
(
int
*
)
(
days
+
(
t
->
tm_wday
<<
2
));
*
(
int
*
)
(
buf
+
4
)
=
*
(
int
*
)
(
months
+
(
t
->
tm_mon
<<
2
));
...
...
@@ -425,7 +446,7 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
if
(
tz
!=
RT_NULL
)
{
tz
->
tz_dsttime
=
DST_NONE
;
tz
->
tz_minuteswest
=
-
(
RT_LIBC_FIXED_TIMEZONE
*
60
);
tz
->
tz_minuteswest
=
-
(
tz_get
()
*
60
);
}
if
(
tv
!=
RT_NULL
&&
get_timeval
(
tv
)
==
RT_EOK
)
...
...
@@ -448,7 +469,6 @@ int settimeofday(const struct timeval *tv, const struct timezone *tz)
* Thus, the following is purely of historic interest.
*/
if
(
tv
!=
RT_NULL
&&
tv
->
tv_sec
>=
0
&&
tv
->
tv_usec
>=
0
&&
set_timeval
((
struct
timeval
*
)
tv
)
==
RT_EOK
)
{
...
...
@@ -467,33 +487,47 @@ RTM_EXPORT(difftime);
RTM_EXPORT
(
strftime
);
#ifdef RT_USING_POSIX
static
struct
timeval
_timevalue
;
static
int
clock_time_system_init
()
#ifdef RT_USING_RTC
static
volatile
struct
timeval
_timevalue
;
static
int
_rt_clock_time_system_init
()
{
time_t
time
;
register
rt_base_t
level
;
time_t
time
=
0
;
rt_tick_t
tick
;
rt_device_t
device
;
time
=
0
;
device
=
rt_device_find
(
"rtc"
);
if
(
device
!=
RT_NULL
)
{
/* get realtime seconds */
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_GET_TIME
,
&
time
);
if
(
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_GET_TIME
,
&
time
)
==
RT_EOK
)
{
level
=
rt_hw_interrupt_disable
();
tick
=
rt_tick_get
();
/* get tick */
_timevalue
.
tv_usec
=
(
tick
%
RT_TICK_PER_SECOND
)
*
MICROSECOND_PER_TICK
;
_timevalue
.
tv_sec
=
time
-
tick
/
RT_TICK_PER_SECOND
-
1
;
rt_hw_interrupt_enable
(
level
);
return
0
;
}
}
/* get tick */
tick
=
rt_tick_get
();
_timevalue
.
tv_usec
=
(
tick
%
RT_TICK_PER_SECOND
)
*
MICROSECOND_PER_TICK
;
_timevalue
.
tv_sec
=
time
-
tick
/
RT_TICK_PER_SECOND
-
1
;
level
=
rt_hw_interrupt_disable
();
_timevalue
.
tv_usec
=
0
;
_timevalue
.
tv_sec
=
0
;
rt_hw_interrupt_enable
(
level
);
return
0
;
return
-
1
;
}
INIT_COMPONENT_EXPORT
(
clock_time_system_init
);
INIT_COMPONENT_EXPORT
(
_rt_clock_time_system_init
);
#endif
/* RT_USING_RTC */
int
clock_getres
(
clockid_t
clockid
,
struct
timespec
*
res
)
{
#ifndef RT_USING_RTC
LOG_W
(
"Cannot find a RTC device to save time!"
);
return
-
1
;
#else
int
ret
=
0
;
if
(
res
==
RT_NULL
)
...
...
@@ -523,11 +557,16 @@ int clock_getres(clockid_t clockid, struct timespec *res)
}
return
ret
;
#endif
/* RT_USING_RTC */
}
RTM_EXPORT
(
clock_getres
);
int
clock_gettime
(
clockid_t
clockid
,
struct
timespec
*
tp
)
{
#ifndef RT_USING_RTC
LOG_W
(
"Cannot find a RTC device to save time!"
);
return
-
1
;
#else
int
ret
=
0
;
if
(
tp
==
RT_NULL
)
...
...
@@ -540,11 +579,14 @@ int clock_gettime(clockid_t clockid, struct timespec *tp)
{
case
CLOCK_REALTIME
:
{
/* get tick */
int
tick
=
rt_tick_get
()
;
int
tick
;
register
rt_base_t
level
;
level
=
rt_hw_interrupt_disable
();
tick
=
rt_tick_get
();
/* get tick */
tp
->
tv_sec
=
_timevalue
.
tv_sec
+
tick
/
RT_TICK_PER_SECOND
;
tp
->
tv_nsec
=
(
_timevalue
.
tv_usec
+
(
tick
%
RT_TICK_PER_SECOND
)
*
MICROSECOND_PER_TICK
)
*
1000
;
rt_hw_interrupt_enable
(
level
);
}
break
;
...
...
@@ -568,11 +610,17 @@ int clock_gettime(clockid_t clockid, struct timespec *tp)
}
return
ret
;
#endif
/* RT_USING_RTC */
}
RTM_EXPORT
(
clock_gettime
);
int
clock_settime
(
clockid_t
clockid
,
const
struct
timespec
*
tp
)
{
#ifndef RT_USING_RTC
LOG_W
(
"Cannot find a RTC device to save time!"
);
return
-
1
;
#else
register
rt_base_t
level
;
int
second
;
rt_tick_t
tick
;
rt_device_t
device
;
...
...
@@ -580,34 +628,36 @@ int clock_settime(clockid_t clockid, const struct timespec *tp)
if
((
clockid
!=
CLOCK_REALTIME
)
||
(
tp
==
RT_NULL
))
{
rt_set_errno
(
EINVAL
);
return
-
1
;
}
/* get second */
second
=
tp
->
tv_sec
;
/* get tick */
tick
=
rt_tick_get
();
level
=
rt_hw_interrupt_disable
();
tick
=
rt_tick_get
();
/* get tick */
/* update timevalue */
_timevalue
.
tv_usec
=
MICROSECOND_PER_SECOND
-
(
tick
%
RT_TICK_PER_SECOND
)
*
MICROSECOND_PER_TICK
;
_timevalue
.
tv_sec
=
second
-
tick
/
RT_TICK_PER_SECOND
-
1
;
rt_hw_interrupt_enable
(
level
);
/* update for RTC device */
device
=
rt_device_find
(
"rtc"
);
if
(
device
!=
RT_NULL
)
{
/* set realtime seconds */
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_SET_TIME
,
&
second
);
if
(
rt_device_control
(
device
,
RT_DEVICE_CTRL_RTC_SET_TIME
,
&
second
)
==
RT_EOK
)
{
return
0
;
}
}
else
return
-
1
;
return
0
;
return
-
1
;
#endif
/* RT_USING_RTC */
}
RTM_EXPORT
(
clock_settime
);
int
clock_time
_to_tick
(
const
struct
timespec
*
time
)
int
rt_timespec
_to_tick
(
const
struct
timespec
*
time
)
{
int
tick
;
int
nsecond
,
second
;
...
...
@@ -638,6 +688,32 @@ int clock_time_to_tick(const struct timespec *time)
return
tick
;
}
RTM_EXPORT
(
clock_time
_to_tick
);
RTM_EXPORT
(
rt_timespec
_to_tick
);
#endif
/* RT_USING_POSIX */
/* timezone */
#ifndef RT_LIBC_DEFAULT_TIMEZONE
#define RT_LIBC_DEFAULT_TIMEZONE 8
#endif
static
volatile
int8_t
_current_timezone
=
RT_LIBC_DEFAULT_TIMEZONE
;
void
tz_set
(
int8_t
tz
)
{
register
rt_base_t
level
;
level
=
rt_hw_interrupt_disable
();
_current_timezone
=
tz
;
rt_hw_interrupt_enable
(
level
);
}
int8_t
tz_get
(
void
)
{
return
_current_timezone
;
}
int8_t
tz_is_dst
(
void
)
{
return
0
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录