Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Kernel Liteos A
提交
a706de2f
K
Kernel Liteos A
项目概览
OpenHarmony
/
Kernel Liteos A
1 年多 前同步成功
通知
460
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看板
提交
a706de2f
编写于
12月 06, 2020
作者:
L
laokz
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix hilog, vm_syscall etc. typos
上级
f5f823ba
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
18 addition
and
17 deletion
+18
-17
kernel/base/ipc/los_sem_debug.c
kernel/base/ipc/los_sem_debug.c
+1
-1
kernel/base/mem/common/los_memstat.c
kernel/base/mem/common/los_memstat.c
+2
-2
kernel/base/vm/los_vm_scan.c
kernel/base/vm/los_vm_scan.c
+1
-1
kernel/base/vm/los_vm_syscall.c
kernel/base/vm/los_vm_syscall.c
+6
-7
kernel/common/los_hilog.c
kernel/common/los_hilog.c
+4
-3
security/vid/vid.c
security/vid/vid.c
+1
-0
syscall/time_syscall.c
syscall/time_syscall.c
+3
-3
未找到文件。
kernel/base/ipc/los_sem_debug.c
浏览文件 @
a706de2f
...
...
@@ -71,7 +71,7 @@ STATIC VOID OsSemPendedTaskNamePrint(LosSemCB *semNode)
PRINTK
(
"Pended task list : "
);
for
(
i
=
0
;
i
<
num
;
i
++
)
{
if
(
i
==
0
)
{
PRINTK
(
"
%s
\n
"
,
nameArr
[
i
]);
PRINTK
(
"
\n
%s
"
,
nameArr
[
i
]);
}
else
{
PRINTK
(
", %s"
,
nameArr
[
i
]);
}
...
...
kernel/base/mem/common/los_memstat.c
浏览文件 @
a706de2f
...
...
@@ -83,7 +83,7 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTaskMemClear(UINT32 taskID)
}
if
(
g_tskMemUsedInfo
[
taskID
].
memUsed
!=
0
)
{
PRINT_WARN
(
"mem used of task '%s' is:0x%x, not zero when task being deleted
\n
"
,
O
sCurrTaskGet
(
)
->
taskName
,
g_tskMemUsedInfo
[
taskID
].
memUsed
);
O
S_TCB_FROM_TID
(
taskID
)
->
taskName
,
g_tskMemUsedInfo
[
taskID
].
memUsed
);
}
g_tskMemUsedInfo
[
taskID
].
memUsed
=
0
;
}
...
...
kernel/base/vm/los_vm_scan.c
浏览文件 @
a706de2f
...
...
@@ -337,7 +337,7 @@ int OsTryShrinkMemory(size_t nPage)
return
nReclaimed
;
}
#else
int
TryShrinkMemory
(
size_t
nPage
)
int
Os
TryShrinkMemory
(
size_t
nPage
)
{
return
0
;
}
...
...
kernel/base/vm/los_vm_syscall.c
浏览文件 @
a706de2f
...
...
@@ -179,11 +179,15 @@ VOID *LOS_DoBrk(VOID *addr)
if
(
LOS_UnMMap
(
newBrk
,
(
oldBrk
-
newBrk
))
<
0
)
{
return
(
void
*
)(
UINTPTR
)
space
->
heapNow
;
}
space
->
heapNow
=
(
VADDR_T
)(
UINTPTR
)
addr
;
return
addr
;
space
->
heapNow
=
(
VADDR_T
)(
UINTPTR
)
a
lignA
ddr
;
return
a
lignA
ddr
;
}
(
VOID
)
LOS_MuxAcquire
(
&
space
->
regionMux
);
if
((
UINTPTR
)
alignAddr
>=
space
->
mapBase
)
{
VM_ERR
(
"Process heap memory space is insufficient"
);
return
(
VOID
*
)
-
ENOMEM
;
}
if
(
space
->
heapBase
==
space
->
heapNow
)
{
region
=
LOS_RegionAlloc
(
space
,
space
->
heapBase
,
size
,
VM_MAP_REGION_FLAG_PERM_READ
|
VM_MAP_REGION_FLAG_PERM_WRITE
|
...
...
@@ -197,11 +201,6 @@ VOID *LOS_DoBrk(VOID *addr)
space
->
heap
=
region
;
}
if
((
UINTPTR
)
alignAddr
>=
space
->
mapBase
)
{
VM_ERR
(
"Process heap memory space is insufficient"
);
goto
REGION_ALLOC_FAILED
;
}
space
->
heapNow
=
(
VADDR_T
)(
UINTPTR
)
alignAddr
;
space
->
heap
->
range
.
size
=
size
;
ret
=
(
VOID
*
)(
UINTPTR
)
space
->
heapNow
;
...
...
kernel/common/los_hilog.c
浏览文件 @
a706de2f
...
...
@@ -178,7 +178,7 @@ static ssize_t HiLogRead(FAR struct file *filep, char *buffer, size_t bufLen)
}
if
(
bufLen
<
header
.
len
+
sizeof
(
header
))
{
dprintf
(
"buffer too small,bufLen=%d, header.len=%d,%d
\n
"
,
bufLen
,
header
.
len
,
header
.
hdrSize
,
header
.
nsec
);
dprintf
(
"buffer too small,bufLen=%d, header.len=%d,%d
\n
"
,
bufLen
,
header
.
len
,
header
.
hdrSize
);
retval
=
-
ENOMEM
;
goto
out
;
}
...
...
@@ -248,13 +248,14 @@ static void HiLogCoverOldLog(size_t bufLen)
struct
HiLogEntry
header
;
size_t
totalSize
=
bufLen
+
sizeof
(
struct
HiLogEntry
);
while
(
totalSize
+
g_hiLogDev
.
size
>
=
HILOG_BUFFER
)
{
while
(
totalSize
+
g_hiLogDev
.
size
>
HILOG_BUFFER
)
{
retval
=
HiLogReadRingBuffer
((
unsigned
char
*
)
&
header
,
sizeof
(
header
));
if
(
retval
<
0
)
{
break
;
}
HiLogBufferDec
(
sizeof
(
header
)
+
header
.
len
);
HiLogBufferDec
(
sizeof
(
header
));
HiLogBufferDec
(
header
.
len
);
}
}
...
...
security/vid/vid.c
浏览文件 @
a706de2f
...
...
@@ -138,6 +138,7 @@ static UINT16 GetFreeVid(VOID)
}
(
void
)
memcpy_s
(
tmp
,
mapMaxNum
*
sizeof
(
UINT32
),
idMap
->
bitMap
,
(
mapMaxNum
-
1
)
*
sizeof
(
UINT32
));
LOS_MemFree
(
m_aucSysMem0
,
idMap
->
bitMap
);
idMap
->
bitMap
=
tmp
;
idMap
->
mapCount
=
mapMaxNum
;
idMap
->
bitMap
[
i
]
=
1
;
...
...
syscall/time_syscall.c
浏览文件 @
a706de2f
...
...
@@ -330,7 +330,7 @@ int SysClockNanoSleep(clockid_t clk, int flags, const struct timespec *req, stru
{
int
ret
;
struct
timespec
sreq
;
struct
timespec
srem
;
struct
timespec
srem
=
{
0
}
;
if
(
!
req
||
LOS_ArchCopyFromUser
(
&
sreq
,
req
,
sizeof
(
struct
timespec
)))
{
errno
=
EFAULT
;
...
...
@@ -354,7 +354,7 @@ int SysNanoSleep(const struct timespec *rqtp, struct timespec *rmtp)
{
int
ret
;
struct
timespec
srqtp
;
struct
timespec
srmtp
;
struct
timespec
srmtp
=
{
0
}
;
if
(
!
rqtp
||
LOS_ArchCopyFromUser
(
&
srqtp
,
rqtp
,
sizeof
(
struct
timespec
)))
{
errno
=
EFAULT
;
...
...
@@ -477,7 +477,7 @@ int SysClockNanoSleep64(clockid_t clk, int flags, const struct timespec64 *req,
{
int
ret
;
struct
timespec
rq
;
struct
timespec
rm
;
struct
timespec
rm
=
{
0
}
;
struct
timespec64
sreq
;
struct
timespec64
srem
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录