Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
SummerGao.
rt-thread
提交
bdd68112
R
rt-thread
项目概览
SummerGao.
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
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,发现更多精彩内容 >>
提交
bdd68112
编写于
2月 02, 2023
作者:
Z
zhkag
提交者:
guo
2月 07, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
移除无用代码
上级
edd9c672
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
4 addition
and
10 deletion
+4
-10
components/libc/compilers/common/ctime.c
components/libc/compilers/common/ctime.c
+4
-10
未找到文件。
components/libc/compilers/common/ctime.c
浏览文件 @
bdd68112
...
@@ -954,8 +954,8 @@ struct timer_obj *timer_id_get(int timerid)
...
@@ -954,8 +954,8 @@ struct timer_obj *timer_id_get(int timerid)
timer_id_lock
();
timer_id_lock
();
if
(
_g_timerid
[
timerid
]
==
NULL
)
if
(
_g_timerid
[
timerid
]
==
NULL
)
{
{
LOG_E
(
"can not find timer!"
);
timer_id_unlock
();
timer_id_unlock
();
LOG_E
(
"can not find timer!"
);
return
NULL
;
return
NULL
;
}
}
timer
=
_g_timerid
[
timerid
];
timer
=
_g_timerid
[
timerid
];
...
@@ -1035,14 +1035,13 @@ int timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid)
...
@@ -1035,14 +1035,13 @@ int timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid)
_timerid
=
timer_id_alloc
();
_timerid
=
timer_id_alloc
();
if
(
_timerid
<
0
)
if
(
_timerid
<
0
)
{
{
timer_id_unlock
();
LOG_E
(
"_timerid overflow!"
);
LOG_E
(
"_timerid overflow!"
);
return
-
1
;
/* todo:memory leak */
return
-
1
;
/* todo:memory leak */
}
}
_g_timerid
[
_timerid
]
=
timer
;
_g_timerid
[
_timerid
]
=
timer
;
*
timerid
=
_timerid
;
*
timerid
=
_timerid
;
timer_id_unlock
();
timer_id_unlock
();
rt_kprintf
(
"_timerid %d
\r\n
"
,
_timerid
);
// *timerid = (timer_t)((uintptr_t)timer >> 1);
return
0
;
return
0
;
}
}
...
@@ -1055,14 +1054,13 @@ RTM_EXPORT(timer_create);
...
@@ -1055,14 +1054,13 @@ RTM_EXPORT(timer_create);
*/
*/
int
timer_delete
(
timer_t
timerid
)
int
timer_delete
(
timer_t
timerid
)
{
{
// struct timer_obj *timer = (struct timer_obj *)((uintptr_t)timerid << 1);
struct
timer_obj
*
timer
;
struct
timer_obj
*
timer
;
timer_id_lock
();
timer_id_lock
();
if
(
_g_timerid
[(
int
)
timerid
]
==
NULL
)
if
(
_g_timerid
[(
int
)
timerid
]
==
NULL
)
{
{
LOG_E
(
"can not find timer!"
);
rt_set_errno
(
EINVAL
);
timer_id_unlock
();
timer_id_unlock
();
rt_set_errno
(
EINVAL
);
LOG_E
(
"can not find timer!"
);
return
-
1
;
return
-
1
;
}
}
timer
=
_g_timerid
[(
int
)
timerid
];
timer
=
_g_timerid
[(
int
)
timerid
];
...
@@ -1105,7 +1103,6 @@ int timer_getoverrun(timer_t timerid)
...
@@ -1105,7 +1103,6 @@ int timer_getoverrun(timer_t timerid)
*/
*/
int
timer_gettime
(
timer_t
timerid
,
struct
itimerspec
*
its
)
int
timer_gettime
(
timer_t
timerid
,
struct
itimerspec
*
its
)
{
{
// struct timer_obj *timer = (struct timer_obj *)((uintptr_t)timerid << 1);
struct
timer_obj
*
timer
=
timer_id_get
(
timerid
);
struct
timer_obj
*
timer
=
timer_id_get
(
timerid
);
rt_tick_t
remaining
;
rt_tick_t
remaining
;
rt_uint32_t
seconds
,
nanoseconds
;
rt_uint32_t
seconds
,
nanoseconds
;
...
@@ -1173,9 +1170,6 @@ RTM_EXPORT(timer_gettime);
...
@@ -1173,9 +1170,6 @@ RTM_EXPORT(timer_gettime);
int
timer_settime
(
timer_t
timerid
,
int
flags
,
const
struct
itimerspec
*
value
,
int
timer_settime
(
timer_t
timerid
,
int
flags
,
const
struct
itimerspec
*
value
,
struct
itimerspec
*
ovalue
)
struct
itimerspec
*
ovalue
)
{
{
// struct timer_obj *timer = (struct timer_obj *)((uintptr_t)timerid << 1);
rt_kprintf
(
"timerid %d
\r\n
"
,
timerid
);
struct
timer_obj
*
timer
=
timer_id_get
(
timerid
);
struct
timer_obj
*
timer
=
timer_id_get
(
timerid
);
if
(
timer
==
NULL
||
if
(
timer
==
NULL
||
rt_object_get_type
(
&
timer
->
timer
.
parent
)
!=
RT_Object_Class_Timer
||
rt_object_get_type
(
&
timer
->
timer
.
parent
)
!=
RT_Object_Class_Timer
||
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录