From 1c605a338ad2317aeb464bdac85df5b9a79c99fd Mon Sep 17 00:00:00 2001
From: wangchen <253227059@qq.com>
Date: Sat, 15 Jan 2022 08:14:53 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20OsGetAllTskInfo=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E5=92=8C=E5=BC=82=E5=B8=B8=E6=97=B6=E6=97=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=87=BD=E6=95=B0=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【背景】OsGetAllTskInfo调用和异常时无任务回调函数地址

【修改方案】
1，新增tskinfo内容

【影响】
对现有的产品编译不会有影响。

re #I4MG2T
Signed-off-by: wangchen <wangchen64@huawei.com>
---
 kernel/src/los_task.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/kernel/src/los_task.c b/kernel/src/los_task.c
index 8632df9f..8afa6b1f 100644
--- a/kernel/src/los_task.c
+++ b/kernel/src/los_task.c
@@ -291,17 +291,17 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskCpupInfo(CPUP_INFO_S **cpuLessOneSec,
 
 LITE_OS_SEC_TEXT_MINOR VOID OsPrintAllTskInfoHeader()
 {
-    PRINTK("\r\n TID  Priority Status   StackSize WaterLine StackPoint TopOfStack EventMask  SemID");
+    PRINTK("\r\n TID  Priority   Status StackSize WaterLine StackPoint TopOfStack EventMask  SemID");
 #if (LOSCFG_BASE_CORE_CPUP == 1)
-    PRINTK(" CPUUSE  CPUUSE10s CPUUSE1s  ");
+    PRINTK("  CPUUSE CPUUSE10s CPUUSE1s ");
 #endif /* LOSCFG_BASE_CORE_CPUP */
-    PRINTK("name\n");
+    PRINTK("  TaskEntry name\n");
     PRINTK(" ---  -------- -------- ");
     PRINTK("--------- --------- ---------- ---------- --------- ------ ");
 #if (LOSCFG_BASE_CORE_CPUP == 1)
     PRINTK("------- --------- --------  ");
 #endif /* LOSCFG_BASE_CORE_CPUP */
-    PRINTK("----\n");
+    PRINTK("---------- ----\n");
 }
 
 /*****************************************************************************
@@ -352,7 +352,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskInfo(VOID)
                cpuOneSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT,
                cpuOneSec[taskCB->taskID].uwUsage % LOS_CPUP_PRECISION_MULT);
 #endif /* LOSCFG_BASE_CORE_CPUP */
-        PRINTK("%-32s\n", taskCB->taskName);
+        PRINTK("%#10x %-32s\n", (UINT32)(UINTPTR)taskCB->taskEntry, taskCB->taskName);
     }
 
 #if (LOSCFG_BASE_CORE_CPUP == 1)
@@ -749,9 +749,9 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskCreateOnly(UINT32 *taskID, TSK_INIT_PARAM_S
     if (retVal != LOS_OK) {
         return retVal;
     }
-    
+
     LOSCFG_TASK_CREATE_EXTENSION_HOOK(taskCB);
-    
+
 #if (LOSCFG_BASE_CORE_CPUP == 1)
     intSave = LOS_IntLock();
     g_cpup[taskCB->taskID].cpupID = taskCB->taskID;
@@ -1087,9 +1087,9 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskDelete(UINT32 taskID)
     // Ignore the return code when matching CSEC rule 6.6(4).
     (VOID)memset_s((VOID *)&g_cpup[taskCB->taskID], sizeof(OsCpupCB), 0, sizeof(OsCpupCB));
 #endif
-    
+
     LOSCFG_TASK_DELETE_EXTENSION_HOOK(taskCB);
-    
+
     if (taskCB->taskStatus & OS_TASK_STATUS_RUNNING) {
         if (!(taskCB->taskStatus & OS_TASK_STATUS_EXIT)) {
             taskCB->taskStatus = OS_TASK_STATUS_UNUSED;