Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Kernel Liteos A
提交
37d80146
K
Kernel Liteos A
项目概览
OpenHarmony
/
Kernel Liteos A
大约 1 年 前同步成功
通知
456
Star
414
Fork
55
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
4
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel Liteos A
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
4
Issue
4
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
37d80146
编写于
6月 17, 2021
作者:
O
openharmony_ci
提交者:
Gitee
6月 17, 2021
浏览文件
操作
浏览文件
下载
差异文件
!321 chore: fix typos
Merge pull request !321 from kenneth/destroy
上级
91696370
81f3d597
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
11 addition
and
11 deletion
+11
-11
compat/posix/src/map_error.c
compat/posix/src/map_error.c
+1
-1
kernel/base/ipc/los_event.c
kernel/base/ipc/los_event.c
+1
-1
kernel/include/los_event.h
kernel/include/los_event.h
+2
-2
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_004.c
...l/sample/kernel_base/ipc/event/smp/It_smp_los_event_004.c
+1
-1
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_005.c
...l/sample/kernel_base/ipc/event/smp/It_smp_los_event_005.c
+1
-1
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_006.c
...l/sample/kernel_base/ipc/event/smp/It_smp_los_event_006.c
+1
-1
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_007.c
...l/sample/kernel_base/ipc/event/smp/It_smp_los_event_007.c
+1
-1
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_009.c
...l/sample/kernel_base/ipc/event/smp/It_smp_los_event_009.c
+1
-1
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_031.c
...l/sample/kernel_base/ipc/event/smp/It_smp_los_event_031.c
+1
-1
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_032.c
...l/sample/kernel_base/ipc/event/smp/It_smp_los_event_032.c
+1
-1
未找到文件。
compat/posix/src/map_error.c
浏览文件 @
37d80146
...
@@ -91,7 +91,7 @@ int map_errno(UINT32 err)
...
@@ -91,7 +91,7 @@ int map_errno(UINT32 err)
errno
=
ENOMEM
;
errno
=
ENOMEM
;
break
;
break
;
case
LOS_ERRNO_SEM_PENDED
:
case
LOS_ERRNO_SEM_PENDED
:
case
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
OR
Y
:
case
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
RO
Y
:
errno
=
EBUSY
;
errno
=
EBUSY
;
break
;
break
;
case
LOS_ERRNO_SEM_PEND_IN_LOCK
:
case
LOS_ERRNO_SEM_PEND_IN_LOCK
:
...
...
kernel/base/ipc/los_event.c
浏览文件 @
37d80146
...
@@ -286,7 +286,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_EventDestroy(PEVENT_CB_S eventCB)
...
@@ -286,7 +286,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_EventDestroy(PEVENT_CB_S eventCB)
SCHEDULER_LOCK
(
intSave
);
SCHEDULER_LOCK
(
intSave
);
if
(
!
LOS_ListEmpty
(
&
eventCB
->
stEventList
))
{
if
(
!
LOS_ListEmpty
(
&
eventCB
->
stEventList
))
{
SCHEDULER_UNLOCK
(
intSave
);
SCHEDULER_UNLOCK
(
intSave
);
return
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
OR
Y
;
return
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
RO
Y
;
}
}
eventCB
->
uwEventID
=
0
;
eventCB
->
uwEventID
=
0
;
...
...
kernel/include/los_event.h
浏览文件 @
37d80146
...
@@ -149,13 +149,13 @@ extern "C" {
...
@@ -149,13 +149,13 @@ extern "C" {
/**
/**
* @ingroup los_event
* @ingroup los_event
* Event reading error code: should not be d
istor
y.
* Event reading error code: should not be d
estro
y.
*
*
* Value: 0x02001c08
* Value: 0x02001c08
*
*
* Solution: Check whether the event list is not empty.
* Solution: Check whether the event list is not empty.
*/
*/
#define LOS_ERRNO_EVENT_SHOULD_NOT_DEST
OR
Y LOS_ERRNO_OS_ERROR(LOS_MOD_EVENT, 0x08)
#define LOS_ERRNO_EVENT_SHOULD_NOT_DEST
RO
Y LOS_ERRNO_OS_ERROR(LOS_MOD_EVENT, 0x08)
/**
/**
* @ingroup los_event
* @ingroup los_event
...
...
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_004.c
浏览文件 @
37d80146
...
@@ -70,7 +70,7 @@ static UINT32 Testcase(VOID)
...
@@ -70,7 +70,7 @@ static UINT32 Testcase(VOID)
ICUNIT_ASSERT_EQUAL
(
ret
,
LOS_OK
,
ret
);
ICUNIT_ASSERT_EQUAL
(
ret
,
LOS_OK
,
ret
);
ret
=
LOS_EventDestroy
(
&
g_event
);
ret
=
LOS_EventDestroy
(
&
g_event
);
ICUNIT_ASSERT_EQUAL
(
ret
,
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
OR
Y
,
ret
);
ICUNIT_ASSERT_EQUAL
(
ret
,
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
RO
Y
,
ret
);
ICUNIT_GOTO_EQUAL
(
g_testCount
,
1
,
g_testCount
,
EXIT
);
ICUNIT_GOTO_EQUAL
(
g_testCount
,
1
,
g_testCount
,
EXIT
);
...
...
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_005.c
浏览文件 @
37d80146
...
@@ -57,7 +57,7 @@ static VOID TaskF02(VOID)
...
@@ -57,7 +57,7 @@ static VOID TaskF02(VOID)
{
{
UINT32
ret
;
UINT32
ret
;
ret
=
LOS_EventDestroy
(
&
g_event
);
ret
=
LOS_EventDestroy
(
&
g_event
);
ICUNIT_ASSERT_EQUAL_VOID
(
ret
,
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
OR
Y
,
ret
);
ICUNIT_ASSERT_EQUAL_VOID
(
ret
,
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
RO
Y
,
ret
);
TestDumpCpuid
();
TestDumpCpuid
();
return
;
return
;
}
}
...
...
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_006.c
浏览文件 @
37d80146
...
@@ -81,7 +81,7 @@ static UINT32 Testcase(VOID)
...
@@ -81,7 +81,7 @@ static UINT32 Testcase(VOID)
ICUNIT_GOTO_NOT_EQUAL
((
ret
&
OS_TASK_STATUS_PEND
),
0
,
ret
,
EXIT
);
ICUNIT_GOTO_NOT_EQUAL
((
ret
&
OS_TASK_STATUS_PEND
),
0
,
ret
,
EXIT
);
ret
=
LOS_EventDestroy
(
&
g_event
);
ret
=
LOS_EventDestroy
(
&
g_event
);
ICUNIT_GOTO_EQUAL
(
ret
,
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
OR
Y
,
ret
,
EXIT
);
ICUNIT_GOTO_EQUAL
(
ret
,
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
RO
Y
,
ret
,
EXIT
);
ICUNIT_GOTO_EQUAL
(
g_testCount
,
1
,
g_testCount
,
EXIT
);
ICUNIT_GOTO_EQUAL
(
g_testCount
,
1
,
g_testCount
,
EXIT
);
EXIT:
EXIT:
...
...
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_007.c
浏览文件 @
37d80146
...
@@ -57,7 +57,7 @@ static VOID TaskF02(VOID)
...
@@ -57,7 +57,7 @@ static VOID TaskF02(VOID)
{
{
UINT32
ret
;
UINT32
ret
;
ret
=
LOS_EventDestroy
(
&
g_event
);
ret
=
LOS_EventDestroy
(
&
g_event
);
ICUNIT_ASSERT_EQUAL_VOID
(
ret
,
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
OR
Y
,
ret
);
ICUNIT_ASSERT_EQUAL_VOID
(
ret
,
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
RO
Y
,
ret
);
LOS_AtomicInc
(
&
g_testCount
);
LOS_AtomicInc
(
&
g_testCount
);
TestDumpCpuid
();
TestDumpCpuid
();
return
;
return
;
...
...
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_009.c
浏览文件 @
37d80146
...
@@ -57,7 +57,7 @@ static VOID HwiF01(VOID)
...
@@ -57,7 +57,7 @@ static VOID HwiF01(VOID)
{
{
UINT32
ret
;
UINT32
ret
;
ret
=
LOS_EventDestroy
(
&
g_event
);
ret
=
LOS_EventDestroy
(
&
g_event
);
ICUNIT_ASSERT_EQUAL_VOID
(
ret
,
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
OR
Y
,
ret
);
ICUNIT_ASSERT_EQUAL_VOID
(
ret
,
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
RO
Y
,
ret
);
TestDumpCpuid
();
TestDumpCpuid
();
LOS_AtomicInc
(
&
g_testCount
);
LOS_AtomicInc
(
&
g_testCount
);
return
;
return
;
...
...
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_031.c
浏览文件 @
37d80146
...
@@ -107,7 +107,7 @@ static UINT32 Testcase(VOID)
...
@@ -107,7 +107,7 @@ static UINT32 Testcase(VOID)
ICUNIT_GOTO_EQUAL
(
g_testCount
,
4
,
g_testCount
,
EXIT
);
// 4, Here, assert that g_testCount is equal to 4.
ICUNIT_GOTO_EQUAL
(
g_testCount
,
4
,
g_testCount
,
EXIT
);
// 4, Here, assert that g_testCount is equal to 4.
if
((
g_ret
!=
LOS_OK
)
&&
(
g_ret
!=
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
OR
Y
))
{
if
((
g_ret
!=
LOS_OK
)
&&
(
g_ret
!=
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
RO
Y
))
{
ICUNIT_GOTO_EQUAL
(
1
,
0
,
g_ret
,
EXIT
);
ICUNIT_GOTO_EQUAL
(
1
,
0
,
g_ret
,
EXIT
);
}
}
...
...
testsuites/kernel/sample/kernel_base/ipc/event/smp/It_smp_los_event_032.c
浏览文件 @
37d80146
...
@@ -105,7 +105,7 @@ static UINT32 Testcase(void)
...
@@ -105,7 +105,7 @@ static UINT32 Testcase(void)
if
((
g_ret1
==
0x11
)
&&
(
g_ret2
==
LOS_OK
)
&&
(
g_ret3
==
LOS_OK
))
{
// pend-post-del ///post-pend-del
if
((
g_ret1
==
0x11
)
&&
(
g_ret2
==
LOS_OK
)
&&
(
g_ret3
==
LOS_OK
))
{
// pend-post-del ///post-pend-del
}
else
if
((
g_ret1
==
0x11
)
&&
(
g_ret2
==
LOS_OK
)
&&
(
g_ret3
==
LOS_OK
))
{
// del-pend-post//del-post-pend
}
else
if
((
g_ret1
==
0x11
)
&&
(
g_ret2
==
LOS_OK
)
&&
(
g_ret3
==
LOS_OK
))
{
// del-pend-post//del-post-pend
}
else
if
((
g_ret1
==
0x11
)
&&
(
g_ret2
==
LOS_OK
)
&&
}
else
if
((
g_ret1
==
0x11
)
&&
(
g_ret2
==
LOS_OK
)
&&
(
g_ret3
==
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
OR
Y
))
{
// pend-delete-post
(
g_ret3
==
LOS_ERRNO_EVENT_SHOULD_NOT_DEST
RO
Y
))
{
// pend-delete-post
}
else
if
((
g_ret1
==
0xff
)
&&
(
g_ret2
==
LOS_OK
)
&&
(
g_ret3
==
LOS_OK
))
{
// post-del-pend
}
else
if
((
g_ret1
==
0xff
)
&&
(
g_ret2
==
LOS_OK
)
&&
(
g_ret3
==
LOS_OK
))
{
// post-del-pend
LOS_TaskDelete
(
g_szId
[
0
]);
// delete the pend task
LOS_TaskDelete
(
g_szId
[
0
]);
// delete the pend task
}
else
if
((
g_ret1
==
0x00
)
&&
(
g_ret2
==
LOS_OK
)
&&
(
g_ret3
==
LOS_OK
))
{
}
else
if
((
g_ret1
==
0x00
)
&&
(
g_ret2
==
LOS_OK
)
&&
(
g_ret3
==
LOS_OK
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录