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

!816 fix：trace模块编译修复 

Merge pull request !816 from Zhaotianyu/20220902trace_fix
This commit is contained in:
openharmony_ci 2022-09-23 09:39:15 +00:00 committed by Gitee
parent 044cf59583 6377f98e9e
commit 1a764df92a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/shell/src/base/shcmd.c
View File

@ -43,6 +43,10 @@
#include "los_debugtools.h" #include "los_debugtools.h"
#endif #endif
#if (LOSCFG_KERNEL_TRACE == 1)
#include "los_trace_pri.h"
#endif
#define SHELL_INIT_MAGIC_FLAG 0xABABABAB #define SHELL_INIT_MAGIC_FLAG 0xABABABAB
STATIC CmdModInfo cmdInfo; STATIC CmdModInfo cmdInfo;
@ -75,6 +79,13 @@ CmdItem g_shellcmdAll[] = {
{CMD_TYPE_EX, "st", 1, (CmdCallBackFunc)OsShellCmdSchedTrace}, {CMD_TYPE_EX, "st", 1, (CmdCallBackFunc)OsShellCmdSchedTrace},
#endif #endif
{CMD_TYPE_EX, "help", 0, (CmdCallBackFunc)OsShellCmdHelp}, {CMD_TYPE_EX, "help", 0, (CmdCallBackFunc)OsShellCmdHelp},
#if (LOSCFG_KERNEL_TRACE == 1)
{CMD_TYPE_EX, "trace_start", 0, (CmdCallBackFunc)LOS_TraceStart},
{CMD_TYPE_EX, "trace_stop", 0, (CmdCallBackFunc)LOS_TraceStop},
{CMD_TYPE_EX, "trace_mask", 1, (CmdCallBackFunc)OsShellCmdTraceSetMask},
{CMD_TYPE_EX, "trace_reset", 0, (CmdCallBackFunc)LOS_TraceReset},
{CMD_TYPE_EX, "trace_dump", 1, (CmdCallBackFunc)OsShellCmdTraceDump},
#endif
}; };
CmdModInfo *OsCmdInfoGet(VOID) CmdModInfo *OsCmdInfoGet(VOID)

8
components/trace/BUILD.gn
View File

@ -64,3 +64,11 @@ kernel_module(module_name) {
include_dirs += [ "pipeline/serial" ] include_dirs += [ "pipeline/serial" ]
} }
} }
config("public") {
include_dirs = [
".",
"cnv",
"pipeline",
]
}

6
components/trace/los_trace.c
View File

@ -411,12 +411,6 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdTraceDump(INT32 argc, const CHAR **argv)
LOS_TraceRecordDump(toClient); LOS_TraceRecordDump(toClient);
return LOS_OK; return LOS_OK;
} }
SHELLCMD_ENTRY(tracestart_shellcmd, CMD_TYPE_EX, "trace_start", 0, (CmdCallBackFunc)LOS_TraceStart);
SHELLCMD_ENTRY(tracestop_shellcmd, CMD_TYPE_EX, "trace_stop", 0, (CmdCallBackFunc)LOS_TraceStop);
SHELLCMD_ENTRY(tracesetmask_shellcmd, CMD_TYPE_EX, "trace_mask", 1, (CmdCallBackFunc)OsShellCmdTraceSetMask);
SHELLCMD_ENTRY(tracereset_shellcmd, CMD_TYPE_EX, "trace_reset", 0, (CmdCallBackFunc)LOS_TraceReset);
SHELLCMD_ENTRY(tracedump_shellcmd, CMD_TYPE_EX, "trace_dump", 1, (CmdCallBackFunc)OsShellCmdTraceDump);
#endif #endif
#endif /* LOSCFG_KERNEL_TRACE == 1 */ #endif /* LOSCFG_KERNEL_TRACE == 1 */

5
components/trace/los_trace_pri.h
View File

@ -152,6 +152,11 @@ extern VOID OsTraceRecordDump(BOOL toClient);
#define OsTraceNotifyStop() #define OsTraceNotifyStop()
#endif #endif
#if (LOSCFG_SHELL == 1)
extern UINT32 OsShellCmdTraceSetMask(INT32 argc, const CHAR **argv);
extern UINT32 OsShellCmdTraceDump(INT32 argc, const CHAR **argv);
#endif
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus
} }

2
components/trace/trace_offline.c
View File

@ -31,6 +31,8 @@
#include "los_trace_pri.h" #include "los_trace_pri.h"
#include "trace_pipeline.h" #include "trace_pipeline.h"
#include "los_memory.h"
#include "securec.h"
#if (LOSCFG_RECORDER_MODE_OFFLINE == 1) #if (LOSCFG_RECORDER_MODE_OFFLINE == 1)
#define BITS_NUM_FOR_TASK_ID 16 #define BITS_NUM_FOR_TASK_ID 16