From 397f24dd6f583e37384b7c56d5b06f9397a1e0df Mon Sep 17 00:00:00 2001 From: wangchen <253227059@qq.com> Date: Tue, 7 Jun 2022 10:17:32 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20debugtools=20=E8=87=AA=E9=AA=8C=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=20=E3=80=90=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E3=80=91debugtools=20=E8=87=AA=E9=AA=8C=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【修改方案】 1，hwi打印可能存在负数，不能使用%u 2，LOS_SchedTraceStop函数可能被单独调用，导致重复释放 影响范围: 【影响】 对现有的产品编译不会有影响。 re #I5B668 Signed-off-by: wangchen --- components/debugtools/los_hwidump.c | 2 +- components/debugtools/los_schedtrace.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/components/debugtools/los_hwidump.c b/components/debugtools/los_hwidump.c index 2c60058c..d72edc40 100644 --- a/components/debugtools/los_hwidump.c +++ b/components/debugtools/los_hwidump.c @@ -84,7 +84,7 @@ STATIC VOID ShellCmdHwiInfoShow(OsIrqCpupCB *irqData, CPUP_INFO_S *hwiCpup1s, } irqName = OsGetHwiFormName(i); - PRINTK(" %10u:%11u%11llu%10llu%9u.%-2u%9u.%-2u %-12s\n", i - OS_SYS_VECTOR_CNT, count, cycles, timeMax, + PRINTK(" %10d:%11u%11llu%10llu%9u.%-2u%9u.%-2u %-12s\n", i - OS_SYS_VECTOR_CNT, count, cycles, timeMax, hwiCpup1s[i].uwUsage / CPUP_PRECISION_MULT, hwiCpup1s[i].uwUsage % CPUP_PRECISION_MULT, hwiCpup10s[i].uwUsage / CPUP_PRECISION_MULT, hwiCpup10s[i].uwUsage % CPUP_PRECISION_MULT, (irqName != NULL) ? irqName : NULL); diff --git a/components/debugtools/los_schedtrace.c b/components/debugtools/los_schedtrace.c index 7de17e59..c6f1462b 100644 --- a/components/debugtools/los_schedtrace.c +++ b/components/debugtools/los_schedtrace.c @@ -126,8 +126,10 @@ VOID LOS_SchedTraceStop(VOID) ShowFormat(g_traceRingBuf, g_schedCount); g_schedCount = 0; - (VOID)LOS_MemFree(OS_SYS_MEM_ADDR, g_traceRingBuf); - g_traceRingBuf = NULL; + if (g_traceRingBuf != NULL) { + (VOID)LOS_MemFree(OS_SYS_MEM_ADDR, g_traceRingBuf); + g_traceRingBuf = NULL; + } return; }