!687 feat: liteipc 静态内存优化

Merge pull request !687 from zhushengle/liteipc

kernel/base/core/los_process.c

@@ -373,10 +373,7 @@ LITE_OS_SEC_TEXT VOID OsProcessResourcesToFree(LosProcessCB *processCB)
 #endif
 
 #ifdef LOSCFG_KERNEL_LITEIPC
-    if (OsProcessIsUserMode(processCB)) {
-        LiteIpcPoolDelete(&(processCB->ipcInfo), processCB->processID);
-        (VOID)memset_s(&(processCB->ipcInfo), sizeof(ProcIpcInfo), 0, sizeof(ProcIpcInfo));
-    }
+    (VOID)LiteIpcPoolDestroy(processCB->processID);
 #endif
 
     if (processCB->resourceLimit != NULL) {
@@ -750,16 +747,6 @@ STATIC UINT32 OsProcessCreateInit(LosProcessCB *processCB, UINT32 flags, const C
         goto EXIT;
     }
 
-#ifdef LOSCFG_KERNEL_LITEIPC
-    if (OsProcessIsUserMode(processCB)) {
-        ret = LiteIpcPoolInit(&(processCB->ipcInfo));
-        if (ret != LOS_OK) {
-            ret = LOS_ENOMEM;
-            goto EXIT;
-        }
-    }
-#endif
-
 #ifdef LOSCFG_FS_VFS
     processCB->files = alloc_files();
     if (processCB->files == NULL) {
@@ -1439,10 +1426,7 @@ LITE_OS_SEC_TEXT UINT32 OsExecRecycleAndInit(LosProcessCB *processCB, const CHAR
     }
 
 #ifdef LOSCFG_KERNEL_LITEIPC
-    ret = LiteIpcPoolInit(&(processCB->ipcInfo));
-    if (ret != LOS_OK) {
-        return LOS_NOK;
-    }
+    (VOID)LiteIpcPoolDestroy(processCB->processID);
 #endif
 
     processCB->sigHandler = 0;
@@ -1833,9 +1817,9 @@ STATIC UINT32 OsCopyProcessResources(UINT32 flags, LosProcessCB *child, LosProce
     }
 
 #ifdef LOSCFG_KERNEL_LITEIPC
-    if (OsProcessIsUserMode(child)) {
-        ret = LiteIpcPoolReInit(&child->ipcInfo, (const ProcIpcInfo *)(&run->ipcInfo));
-        if (ret != LOS_OK) {
+    if (run->ipcInfo != NULL) {
+        child->ipcInfo = LiteIpcPoolReInit((const ProcIpcInfo *)(run->ipcInfo));
+        if (child->ipcInfo == NULL) {
             return LOS_ENOMEM;
         }
     }

kernel/base/core/los_task.c

@@ -510,7 +510,7 @@ LITE_OS_SEC_TEXT VOID OsTaskResourcesToFree(LosTaskCB *taskCB)
         }
 
 #ifdef LOSCFG_KERNEL_LITEIPC
-        LiteIpcRemoveServiceHandle(taskCB);
+        LiteIpcRemoveServiceHandle(taskCB->taskID);
 #endif
     }
 #endif
@@ -552,9 +552,6 @@ LITE_OS_SEC_TEXT_INIT STATIC VOID OsTaskCBInitBase(LosTaskCB *taskCB,
     taskCB->currCpu      = OS_TASK_INVALID_CPUID;
     taskCB->cpuAffiMask  = (initParam->usCpuAffiMask) ?
                             initParam->usCpuAffiMask : LOSCFG_KERNEL_CPU_MASK;
-#endif
-#ifdef LOSCFG_KERNEL_LITEIPC
-    LOS_ListInit(&(taskCB->msgListHead));
 #endif
     taskCB->policy = (initParam->policy == LOS_SCHED_FIFO) ? LOS_SCHED_FIFO : LOS_SCHED_RR;
     taskCB->taskStatus = OS_TASK_STATUS_INIT;

kernel/base/include/los_process_pri.h

@@ -103,7 +103,7 @@ typedef struct ProcessCB {
     UINTPTR              sigHandler;   /**< Signal handler */
     sigset_t             sigShare;     /**< Signal share bit */
 #ifdef LOSCFG_KERNEL_LITEIPC
-    ProcIpcInfo          ipcInfo;      /**< Memory pool for lite ipc */
+    ProcIpcInfo          *ipcInfo;      /**< Memory pool for lite ipc */
 #endif
 #ifdef LOSCFG_KERNEL_VM
     LosVmSpace           *vmSpace;     /**< VMM space for processes */

kernel/base/include/los_task_pri.h

@@ -44,7 +44,9 @@
 #ifdef LOSCFG_KERNEL_CPUP
 #include "los_cpup_pri.h"
 #endif
-
+#ifdef LOSCFG_KERNEL_LITEIPC
+#include "hm_liteipc.h"
+#endif
 #ifdef __cplusplus
 #if __cplusplus
 extern "C" {
@@ -359,8 +361,7 @@ typedef struct {
     UINT16          waitFlag;           /**< The type of child process that is waiting, belonging to a group or parent,
                                              a specific child process, or any child process */
 #ifdef LOSCFG_KERNEL_LITEIPC
-    LOS_DL_LIST     msgListHead;
-    BOOL            accessMap[LOSCFG_BASE_CORE_TSK_LIMIT];
+    IpcTaskInfo     *ipcTaskInfo;
 #endif
 #ifdef LOSCFG_KERNEL_PERF
     UINTPTR         pc;

kernel/extended/liteipc/hm_liteipc.h

@@ -34,7 +34,6 @@
 
 #include "sys/ioctl.h"
 #include "los_config.h"
-#include "los_task_pri.h"
 #include "los_typedef.h"
 #include "los_vm_map.h"
 
@@ -70,9 +69,15 @@ typedef struct {
 typedef struct {
     IpcPool pool;
     UINT32 ipcTaskID;
+    LOS_DL_LIST ipcUsedNodelist;
     UINT32 access[LOSCFG_BASE_CORE_TSK_LIMIT];
 } ProcIpcInfo;
 
+typedef struct {
+    LOS_DL_LIST     msgListHead;
+    BOOL            accessMap[LOSCFG_BASE_CORE_TSK_LIMIT];
+} IpcTaskInfo;
+
 typedef enum {
     OBJ_FD,
     OBJ_PTR,
@@ -172,17 +177,13 @@ typedef struct {
 /* init liteipc driver */
 extern UINT32 OsLiteIpcInit(VOID);
 
-/* init process liteipc memory pool */
-extern UINT32 LiteIpcPoolInit(ProcIpcInfo *ipcInfo);
-
 /* reinit process liteipc memory pool, using in fork situation */
-extern UINT32 LiteIpcPoolReInit(ProcIpcInfo *childIpcInfo, const ProcIpcInfo *parentIpcInfo);
-
-/* delete process liteipc memory pool */
-extern VOID LiteIpcPoolDelete(ProcIpcInfo *ipcInfo, UINT32 processID);
+extern ProcIpcInfo *LiteIpcPoolReInit(const ProcIpcInfo *parentIpcInfo);
 
 /* remove service handle and send death notify */
-extern VOID LiteIpcRemoveServiceHandle(LosTaskCB *taskCB);
+extern VOID LiteIpcRemoveServiceHandle(UINT32 taskID);
+
+extern UINT32 LiteIpcPoolDestroy(UINT32 processID);
 
 #ifdef __cplusplus
 #if __cplusplus