yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复內源检视问题 

Signed-off-by: zhushengle <zhushengle@huawei.com>
Change-Id: I3e4e26d55dedc1eb079911eaee59a8bddf4e8eee
This commit is contained in:
zhushengle 2022-03-19 17:50:04 +08:00
parent cb67dd5498
commit f7a8630584
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/perf/src/main.c
View File

@ -63,9 +63,12 @@ int main(int argc, char **argv)
} else if ((argc == THREE_ARGS) && strcmp(argv[1], "read") == 0) { } else if ((argc == THREE_ARGS) && strcmp(argv[1], "read") == 0) {
size_t size = strtoul(argv[THREE_ARGS - 1], NULL, 0); size_t size = strtoul(argv[THREE_ARGS - 1], NULL, 0);
char *buf = (char *)malloc(size); char *buf = (char *)malloc(size);
int len = PerfRead(fd, buf, size); if (buf != NULL) {
PerfPrintBuffer(buf, len); int len = PerfRead(fd, buf, size);
free(buf); PerfPrintBuffer(buf, len);
free(buf);
buf = NULL;
}
} else if ((argc == TWO_ARGS) && strcmp(argv[1], "list") == 0) { } else if ((argc == TWO_ARGS) && strcmp(argv[1], "list") == 0) {
PerfList(); PerfList();
} else if ((argc >= THREE_ARGS) && strcmp(argv[1], "stat") == 0) { } else if ((argc >= THREE_ARGS) && strcmp(argv[1], "stat") == 0) {

2
kernel/common/los_config.c
View File

@ -183,7 +183,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsSystemInfo(VOID)
KERNEL_NAME, KERNEL_MAJOR, KERNEL_MINOR, KERNEL_PATCH, KERNEL_ITRE, buildType); KERNEL_NAME, KERNEL_MAJOR, KERNEL_MINOR, KERNEL_PATCH, KERNEL_ITRE, buildType);
} }
LITE_OS_SEC_TEXT_INIT INT32 OsMain(VOID) LITE_OS_SEC_TEXT_INIT UINT32 OsMain(VOID)
{ {
UINT32 ret; UINT32 ret;
#ifdef LOS_INIT_STATISTICS #ifdef LOS_INIT_STATISTICS

2
kernel/common/los_config.h
View File

@ -453,7 +453,7 @@ typedef VOID (*log_read_write_fn)(UINT32 startAddr, UINT32 space, UINT32 rwFlag,
VOID LOS_ExcInfoRegHook(UINT32 startAddr, UINT32 space, CHAR *buf, log_read_write_fn hook); VOID LOS_ExcInfoRegHook(UINT32 startAddr, UINT32 space, CHAR *buf, log_read_write_fn hook);
#endif #endif
extern INT32 OsMain(VOID); extern UINT32 OsMain(VOID);
typedef VOID (*SystemRebootFunc)(VOID); typedef VOID (*SystemRebootFunc)(VOID);
VOID OsSetRebootHook(SystemRebootFunc func); VOID OsSetRebootHook(SystemRebootFunc func);

8
kernel/common/main.c
View File

@ -34,11 +34,9 @@
LITE_OS_SEC_TEXT_INIT INT32 main(VOID) LITE_OS_SEC_TEXT_INIT INT32 main(VOID)
{ {
UINT32 uwRet; UINT32 ret = OsMain();
if (ret != LOS_OK) {
uwRet = OsMain(); return (INT32)LOS_NOK;
if (uwRet != LOS_OK) {
return LOS_NOK;
} }
CPU_MAP_SET(0, OsHwIDGet()); CPU_MAP_SET(0, OsHwIDGet());

2
kernel/extended/trace/pipeline/trace_pipeline.c
View File

@ -132,7 +132,7 @@ VOID OsTraceDataSend(UINT8 type, UINT16 len, UINT8 *data)
UINT32 intSave; UINT32 intSave;
UINT8 outBuf[LOSCFG_TRACE_TLV_BUF_SIZE] = {0}; UINT8 outBuf[LOSCFG_TRACE_TLV_BUF_SIZE] = {0};
if ((type > TRACE_MSG_MAX) || (len > LOSCFG_TRACE_TLV_BUF_SIZE)) { if ((type >= TRACE_MSG_MAX) || (len > LOSCFG_TRACE_TLV_BUF_SIZE)) {
return; return;
} }