Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2345VOR
rt-thread
提交
657cbfda
R
rt-thread
项目概览
2345VOR
/
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,发现更多精彩内容 >>
提交
657cbfda
编写于
2月 09, 2023
作者:
Z
zhkag
提交者:
guo
2月 09, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复编译警告
上级
7c6c12cb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
19 deletion
+20
-19
components/drivers/cputime/cputime.c
components/drivers/cputime/cputime.c
+1
-1
components/drivers/include/drivers/cputime.h
components/drivers/include/drivers/cputime.h
+2
-2
components/libc/compilers/common/ctime.c
components/libc/compilers/common/ctime.c
+16
-15
components/lwp/lwp_syscall.c
components/lwp/lwp_syscall.c
+1
-1
未找到文件。
components/drivers/cputime/cputime.c
浏览文件 @
657cbfda
...
...
@@ -52,7 +52,7 @@ uint64_t clock_cpu_gettime(void)
* @param parameter the Parameters of timeout function
*
*/
void
clock_cpu_settimeout
(
uint64_t
tick
,
void
(
*
timeout
)(
void
*
param
),
void
*
param
)
int
clock_cpu_settimeout
(
uint64_t
tick
,
void
(
*
timeout
)(
void
*
param
),
void
*
param
)
{
if
(
_cputime_ops
)
return
_cputime_ops
->
cputime_settimeout
(
tick
,
timeout
,
param
);
...
...
components/drivers/include/drivers/cputime.h
浏览文件 @
657cbfda
...
...
@@ -17,12 +17,12 @@ struct rt_clock_cputime_ops
{
double
(
*
cputime_getres
)(
void
);
uint64_t
(
*
cputime_gettime
)(
void
);
void
(
*
cputime_settimeout
)(
uint64_t
tick
,
void
(
*
timeout
)(
void
*
param
),
void
*
param
);
int
(
*
cputime_settimeout
)(
uint64_t
tick
,
void
(
*
timeout
)(
void
*
param
),
void
*
param
);
};
double
clock_cpu_getres
(
void
);
uint64_t
clock_cpu_gettime
(
void
);
void
clock_cpu_settimeout
(
uint64_t
tick
,
void
(
*
timeout
)(
void
*
param
),
void
*
param
);
int
clock_cpu_settimeout
(
uint64_t
tick
,
void
(
*
timeout
)(
void
*
param
),
void
*
param
);
uint64_t
clock_cpu_microsecond
(
uint64_t
cpu_tick
);
uint64_t
clock_cpu_millisecond
(
uint64_t
cpu_tick
);
...
...
components/libc/compilers/common/ctime.c
浏览文件 @
657cbfda
...
...
@@ -950,6 +950,16 @@ int timer_id_alloc(void)
return
-
1
;
}
void
timer_id_lock
()
{
rt_hw_spin_lock
(
&
_timer_id_lock
);
}
void
timer_id_unlock
()
{
rt_hw_spin_unlock
(
&
_timer_id_lock
);
}
struct
timer_obj
*
timer_id_get
(
int
timerid
)
{
struct
timer_obj
*
timer
;
...
...
@@ -972,15 +982,6 @@ int timer_id_put(int id)
_g_timerid
[
id
]
=
NULL
;
return
0
;
}
void
timer_id_lock
()
{
rt_hw_spin_lock
(
&
_timer_id_lock
);
}
void
timer_id_unlock
()
{
rt_hw_spin_unlock
(
&
_timer_id_lock
);
}
/**
* @brief Create a per-process timer.
*
...
...
@@ -1042,7 +1043,7 @@ int timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid)
return
-
1
;
/* todo:memory leak */
}
_g_timerid
[
_timerid
]
=
timer
;
*
timerid
=
_timerid
;
*
timerid
=
(
timer_t
*
)(
rt_ubase_t
)
_timerid
;
timer_id_unlock
();
return
0
;
...
...
@@ -1058,15 +1059,15 @@ int timer_delete(timer_t timerid)
{
struct
timer_obj
*
timer
;
timer_id_lock
();
if
(
_g_timerid
[(
in
t
)
timerid
]
==
NULL
)
if
(
_g_timerid
[(
rt_ubase_
t
)
timerid
]
==
NULL
)
{
timer_id_unlock
();
rt_set_errno
(
EINVAL
);
LOG_E
(
"can not find timer!"
);
return
-
1
;
}
timer
=
_g_timerid
[(
in
t
)
timerid
];
timer_id_put
(
timerid
);
timer
=
_g_timerid
[(
rt_ubase_
t
)
timerid
];
timer_id_put
(
(
rt_ubase_t
)
timerid
);
timer_id_unlock
();
if
(
timer
==
RT_NULL
||
rt_object_get_type
(
&
timer
->
timer
.
parent
)
!=
RT_Object_Class_Timer
)
...
...
@@ -1105,7 +1106,7 @@ int timer_getoverrun(timer_t timerid)
*/
int
timer_gettime
(
timer_t
timerid
,
struct
itimerspec
*
its
)
{
struct
timer_obj
*
timer
=
timer_id_get
(
timerid
);
struct
timer_obj
*
timer
=
timer_id_get
(
(
rt_ubase_t
)
timerid
);
rt_tick_t
remaining
;
rt_uint32_t
seconds
,
nanoseconds
;
...
...
@@ -1172,7 +1173,7 @@ RTM_EXPORT(timer_gettime);
int
timer_settime
(
timer_t
timerid
,
int
flags
,
const
struct
itimerspec
*
value
,
struct
itimerspec
*
ovalue
)
{
struct
timer_obj
*
timer
=
timer_id_get
(
timerid
);
struct
timer_obj
*
timer
=
timer_id_get
(
(
rt_ubase_t
)
timerid
);
if
(
timer
==
NULL
||
rt_object_get_type
(
&
timer
->
timer
.
parent
)
!=
RT_Object_Class_Timer
||
value
->
it_interval
.
tv_nsec
<
0
||
...
...
components/lwp/lwp_syscall.c
浏览文件 @
657cbfda
...
...
@@ -4338,7 +4338,7 @@ int sys_mq_unlink(const char *name)
lwp_get_from_user
(
kname
,
(
void
*
)
name
,
len
+
1
);
ret
=
mq_unlink
(
kname
);
if
(
err
<
0
)
if
(
ret
<
0
)
{
ret
=
GET_ERRNO
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录