From b551270ef50cb206360e2eee3dd20ace5cecccb7 Mon Sep 17 00:00:00 2001
From: LiteOS2021 <dinglu@huawei.com>
Date: Wed, 13 Oct 2021 17:01:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96trace=20buffer?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=EF=BC=8C=E5=88=A0=E9=99=A4swtmr=20?=
 =?UTF-8?q?=E6=A1=A9=E4=B8=AD=E7=9A=84=E6=97=A0=E6=95=88=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=20=20=20=20=20close=20#I4DQ1X=20Signed-off-by:=20LiteOS2021=20?=
 =?UTF-8?q?<dinglu@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I79b416720f5327749a5884a65a5e61db07f2a17c
---
 kernel/extended/trace/cnv/trace_cnv.c |  2 +-
 kernel/extended/trace/los_trace.c     | 11 ++++++-----
 kernel/extended/trace/los_trace_pri.h |  2 +-
 kernel/extended/trace/trace_online.c  |  6 ------
 kernel/include/los_trace.h            |  2 +-
 5 files changed, 9 insertions(+), 14 deletions(-)

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