diff --git a/kernel/extended/trace/cnv/trace_cnv.c b/kernel/extended/trace/cnv/trace_cnv.c index 6d94eeed..cb67b112 100644 --- a/kernel/extended/trace/cnv/trace_cnv.c +++ b/kernel/extended/trace/cnv/trace_cnv.c @@ -211,7 +211,7 @@ STATIC VOID LOS_TraceSwtmrExpired(const SWTMR_CTRL_S *swtmr) STATIC VOID LOS_TraceSwtmrStart(const SWTMR_CTRL_S *swtmr) { - LOS_TRACE(SWTMR_START, swtmr->usTimerID, swtmr->ucMode, swtmr->uwCount, swtmr->uwInterval, 0); + LOS_TRACE(SWTMR_START, swtmr->usTimerID, swtmr->ucMode, swtmr->uwInterval); } STATIC VOID LOS_TraceSwtmrStop(const SWTMR_CTRL_S *swtmr) diff --git a/kernel/extended/trace/los_trace.c b/kernel/extended/trace/los_trace.c index 4088b0be..cd3a47ab 100644 --- a/kernel/extended/trace/los_trace.c +++ b/kernel/extended/trace/los_trace.c @@ -265,10 +265,15 @@ STATIC UINT32 OsTraceInit(VOID) } #endif +#ifdef LOSCFG_RECORDER_MODE_OFFLINE ret = OsTraceBufInit(LOSCFG_TRACE_BUFFER_SIZE); if (ret != LOS_OK) { - goto LOS_RELEASE; +#ifdef LOSCFG_TRACE_CONTROL_AGENT + (VOID)LOS_TaskDelete(g_traceTaskId); +#endif + goto LOS_ERREND; } +#endif OsTraceHookInstall(); OsTraceCnvInit(); @@ -283,10 +288,6 @@ STATIC UINT32 OsTraceInit(VOID) g_traceState = TRACE_STARTED; #endif return LOS_OK; -LOS_RELEASE: -#ifdef LOSCFG_TRACE_CONTROL_AGENT - LOS_TaskDelete(g_traceTaskId); -#endif LOS_ERREND: return ret; } diff --git a/kernel/extended/trace/los_trace_pri.h b/kernel/extended/trace/los_trace_pri.h index 95c2fddd..e1167a5c 100644 --- a/kernel/extended/trace/los_trace_pri.h +++ b/kernel/extended/trace/los_trace_pri.h @@ -120,7 +120,6 @@ typedef struct { extern UINT32 OsTraceGetMaskTid(UINT32 taskId); extern VOID OsTraceSetObj(ObjData *obj, const LosTaskCB *tcb); extern VOID OsTraceWriteOrSendEvent(const TraceEventFrame *frame); -extern UINT32 OsTraceBufInit(UINT32 size); extern VOID OsTraceObjAdd(UINT32 eventType, UINT32 taskId); extern BOOL OsTraceIsEnable(VOID); extern OfflineHead *OsTraceRecordGet(VOID); @@ -143,6 +142,7 @@ extern VOID OsTraceSendNotify(UINT32 type, UINT32 value); #define OsTraceReset() #define OsTraceRecordDump(toClient) #else +extern UINT32 OsTraceBufInit(UINT32 size); extern VOID OsTraceReset(VOID); extern VOID OsTraceRecordDump(BOOL toClient); #define OsTraceNotifyStart() diff --git a/kernel/extended/trace/trace_online.c b/kernel/extended/trace/trace_online.c index 2e674ef6..f24d5eb0 100644 --- a/kernel/extended/trace/trace_online.c +++ b/kernel/extended/trace/trace_online.c @@ -37,12 +37,6 @@ UINT32 OsTraceGetMaskTid(UINT32 taskId) return taskId; } -UINT32 OsTraceBufInit(UINT32 size) -{ - (VOID)size; - return LOS_OK; -} - VOID OsTraceSendHead(VOID) { TraceBaseHeaderInfo head = { diff --git a/kernel/include/los_trace.h b/kernel/include/los_trace.h index f5376c75..d7b952d5 100644 --- a/kernel/include/los_trace.h +++ b/kernel/include/los_trace.h @@ -347,7 +347,7 @@ extern TRACE_EVENT_HOOK g_traceEventHook; #define TASK_RESUME_PARAMS(taskId, taskStatus, prio) taskId, taskStatus, prio #define TASK_SIGNAL_PARAMS(taskId, signal, schedFlag) // taskId, signal, schedFlag -#define SWTMR_START_PARAMS(swtmrId, mode, overrun, interval, expiry) swtmrId, mode, overrun, interval, expiry +#define SWTMR_START_PARAMS(swtmrId, mode, interval) swtmrId, mode, interval #define SWTMR_DELETE_PARAMS(swtmrId) swtmrId #define SWTMR_EXPIRED_PARAMS(swtmrId) swtmrId #define SWTMR_STOP_PARAMS(swtmrId) swtmrId