Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Kernel Liteos A
提交
6c0e1b1f
K
Kernel Liteos A
项目概览
OpenHarmony
/
Kernel Liteos A
大约 1 年 前同步成功
通知
452
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
6c0e1b1f
编写于
3月 18, 2022
作者:
O
openharmony_ci
提交者:
Gitee
3月 18, 2022
浏览文件
操作
浏览文件
下载
差异文件
!836 内核内源代码检视问题修改
Merge pull request !836 from wangchen/0317_lfx_a
上级
e4cad073
b06520ac
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
8 deletion
+8
-8
kernel/base/mem/membox/los_membox.c
kernel/base/mem/membox/los_membox.c
+1
-1
kernel/base/mem/tlsf/los_memory.c
kernel/base/mem/tlsf/los_memory.c
+3
-3
kernel/base/mp/los_lockdep.c
kernel/base/mp/los_lockdep.c
+2
-2
kernel/include/los_membox.h
kernel/include/los_membox.h
+2
-2
未找到文件。
kernel/base/mem/membox/los_membox.c
浏览文件 @
6c0e1b1f
...
@@ -93,7 +93,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_MemboxInit(VOID *pool, UINT32 poolSize, UINT32
...
@@ -93,7 +93,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_MemboxInit(VOID *pool, UINT32 poolSize, UINT32
}
}
MEMBOX_LOCK
(
intSave
);
MEMBOX_LOCK
(
intSave
);
boxInfo
->
uwBlkSize
=
LOS_MEMBOX_AL
L
IGNED
(
blkSize
+
OS_MEMBOX_NODE_HEAD_SIZE
);
boxInfo
->
uwBlkSize
=
LOS_MEMBOX_ALIGNED
(
blkSize
+
OS_MEMBOX_NODE_HEAD_SIZE
);
boxInfo
->
uwBlkNum
=
(
poolSize
-
sizeof
(
LOS_MEMBOX_INFO
))
/
boxInfo
->
uwBlkSize
;
boxInfo
->
uwBlkNum
=
(
poolSize
-
sizeof
(
LOS_MEMBOX_INFO
))
/
boxInfo
->
uwBlkSize
;
boxInfo
->
uwBlkCnt
=
0
;
boxInfo
->
uwBlkCnt
=
0
;
if
(
boxInfo
->
uwBlkNum
==
0
)
{
if
(
boxInfo
->
uwBlkNum
==
0
)
{
...
...
kernel/base/mem/tlsf/los_memory.c
浏览文件 @
6c0e1b1f
...
@@ -169,7 +169,7 @@ struct OsMemPoolHead {
...
@@ -169,7 +169,7 @@ struct OsMemPoolHead {
/* The memory pool support expand. */
/* The memory pool support expand. */
#define OS_MEM_POOL_EXPAND_ENABLE 0x01
#define OS_MEM_POOL_EXPAND_ENABLE 0x01
/* The memory pool s
s
upport no lock. */
/* The memory pool support no lock. */
#define OS_MEM_POOL_LOCK_ENABLE 0x02
#define OS_MEM_POOL_LOCK_ENABLE 0x02
#define OS_MEM_NODE_MAGIC 0xABCDDCBA
#define OS_MEM_NODE_MAGIC 0xABCDDCBA
...
@@ -486,7 +486,7 @@ STATIC INLINE VOID OsLmsAllocAlignMark(VOID *ptr, VOID *alignedPtr, UINT32 size)
...
@@ -486,7 +486,7 @@ STATIC INLINE VOID OsLmsAllocAlignMark(VOID *ptr, VOID *alignedPtr, UINT32 size)
g_lms
->
simpleMark
((
UINTPTR
)
ptr
+
sizeof
(
UINT32
),
(
UINTPTR
)
alignedPtr
,
LMS_SHADOW_REDZONE_U8
);
g_lms
->
simpleMark
((
UINTPTR
)
ptr
+
sizeof
(
UINT32
),
(
UINTPTR
)
alignedPtr
,
LMS_SHADOW_REDZONE_U8
);
}
}
/* mark remining as redzone */
/* mark rem
a
ining as redzone */
g_lms
->
simpleMark
(
LMS_ADDR_ALIGN
((
UINTPTR
)
alignedPtr
+
size
),
(
UINTPTR
)
OS_MEM_NEXT_NODE
(
allocNode
),
g_lms
->
simpleMark
(
LMS_ADDR_ALIGN
((
UINTPTR
)
alignedPtr
+
size
),
(
UINTPTR
)
OS_MEM_NEXT_NODE
(
allocNode
),
LMS_SHADOW_REDZONE_U8
);
LMS_SHADOW_REDZONE_U8
);
}
}
...
@@ -1804,7 +1804,7 @@ STATIC VOID OsMemIntegrityCheckError(struct OsMemPoolHead *pool,
...
@@ -1804,7 +1804,7 @@ STATIC VOID OsMemIntegrityCheckError(struct OsMemPoolHead *pool,
tmpNode
,
preNode
,
taskCB
->
taskName
);
tmpNode
,
preNode
,
taskCB
->
taskName
);
#else
#else
MEM_UNLOCK
(
pool
,
intSave
);
MEM_UNLOCK
(
pool
,
intSave
);
LOS_Panic
(
"Memory interity check error, cur node: %#x, pre node: %#x
\n
"
,
tmpNode
,
preNode
);
LOS_Panic
(
"Memory inte
g
rity check error, cur node: %#x, pre node: %#x
\n
"
,
tmpNode
,
preNode
);
#endif
#endif
}
}
...
...
kernel/base/mp/los_lockdep.c
浏览文件 @
6c0e1b1f
...
@@ -165,7 +165,7 @@ STATIC VOID OsLockDepDumpLock(const LosTaskCB *task, const SPIN_LOCK_S *lock,
...
@@ -165,7 +165,7 @@ STATIC VOID OsLockDepDumpLock(const LosTaskCB *task, const SPIN_LOCK_S *lock,
}
}
}
}
STATIC
BOOL
OsLockDepCheckDepend
a
ncy
(
const
LosTaskCB
*
current
,
LosTaskCB
*
lockOwner
)
STATIC
BOOL
OsLockDepCheckDepend
e
ncy
(
const
LosTaskCB
*
current
,
LosTaskCB
*
lockOwner
)
{
{
BOOL
checkResult
=
TRUE
;
BOOL
checkResult
=
TRUE
;
SPIN_LOCK_S
*
lockTemp
=
NULL
;
SPIN_LOCK_S
*
lockTemp
=
NULL
;
...
@@ -217,7 +217,7 @@ VOID OsLockDepCheckIn(SPIN_LOCK_S *lock)
...
@@ -217,7 +217,7 @@ VOID OsLockDepCheckIn(SPIN_LOCK_S *lock)
goto
OUT
;
goto
OUT
;
}
}
if
(
OsLockDepCheckDepend
a
ncy
(
current
,
lockOwner
)
!=
TRUE
)
{
if
(
OsLockDepCheckDepend
e
ncy
(
current
,
lockOwner
)
!=
TRUE
)
{
checkResult
=
LOCKDEP_ERR_DEAD_LOCK
;
checkResult
=
LOCKDEP_ERR_DEAD_LOCK
;
goto
OUT
;
goto
OUT
;
}
}
...
...
kernel/include/los_membox.h
浏览文件 @
6c0e1b1f
...
@@ -74,14 +74,14 @@ typedef LOS_MEMBOX_INFO OS_MEMBOX_S;
...
@@ -74,14 +74,14 @@ typedef LOS_MEMBOX_INFO OS_MEMBOX_S;
* @ingroup los_membox
* @ingroup los_membox
* Memory pool alignment
* Memory pool alignment
*/
*/
#define LOS_MEMBOX_AL
L
IGNED(memAddr) (((UINTPTR)(memAddr) + sizeof(UINTPTR) - 1) & (~(sizeof(UINTPTR) - 1)))
#define LOS_MEMBOX_ALIGNED(memAddr) (((UINTPTR)(memAddr) + sizeof(UINTPTR) - 1) & (~(sizeof(UINTPTR) - 1)))
/**
/**
* @ingroup los_membox
* @ingroup los_membox
* Memory pool size
* Memory pool size
*/
*/
#define LOS_MEMBOX_SIZE(blkSize, blkNum) \
#define LOS_MEMBOX_SIZE(blkSize, blkNum) \
(sizeof(LOS_MEMBOX_INFO) + (LOS_MEMBOX_AL
L
IGNED((blkSize) + OS_MEMBOX_NODE_HEAD_SIZE) * (blkNum)))
(sizeof(LOS_MEMBOX_INFO) + (LOS_MEMBOX_ALIGNED((blkSize) + OS_MEMBOX_NODE_HEAD_SIZE) * (blkNum)))
/**
/**
* @ingroup los_membox
* @ingroup los_membox
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录