From 58d4366e1d5c3c6a1338665685837c9bca62c661 Mon Sep 17 00:00:00 2001 From: kenneth Date: Wed, 21 Jul 2021 08:47:41 +0800 Subject: [PATCH] chore: fix function and variable name spell issues fix some spell issues in files under folder kernel/base/core: change Recyle to Recycle, ilde to idle and Porcess to Process close #I3R28X Signed-off-by: kenneth --- kernel/base/core/los_process.c | 26 +++++++++++++------------- kernel/base/core/los_sortlink.c | 6 +++--- kernel/base/core/los_task.c | 14 +++++++------- kernel/base/include/los_process_pri.h | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/kernel/base/core/los_process.c b/kernel/base/core/los_process.c index 8d00696b..a4bf395c 100644 --- a/kernel/base/core/los_process.c +++ b/kernel/base/core/los_process.c @@ -57,7 +57,7 @@ LITE_OS_SEC_BSS LosProcessCB *g_processCBArray = NULL; LITE_OS_SEC_DATA_INIT STATIC LOS_DL_LIST g_freeProcess; -LITE_OS_SEC_DATA_INIT STATIC LOS_DL_LIST g_processRecyleList; +LITE_OS_SEC_DATA_INIT STATIC LOS_DL_LIST g_processRecycleList; LITE_OS_SEC_BSS UINT32 g_userInitProcess = OS_INVALID_VALUE; LITE_OS_SEC_BSS UINT32 g_kernelInitProcess = OS_INVALID_VALUE; LITE_OS_SEC_BSS UINT32 g_kernelIdleProcess = OS_INVALID_VALUE; @@ -331,9 +331,9 @@ LITE_OS_SEC_TEXT STATIC VOID OsRecycleZombiesProcess(LosProcessCB *childCB, Proc LOS_ListDelete(&childCB->pendList); if (childCB->processStatus & OS_PROCESS_FLAG_EXIT) { - LOS_ListHeadInsert(&g_processRecyleList, &childCB->pendList); + LOS_ListHeadInsert(&g_processRecycleList, &childCB->pendList); } else if (childCB->processStatus & OS_PROCESS_FLAG_GROUP_LEADER) { - LOS_ListTailInsert(&g_processRecyleList, &childCB->pendList); + LOS_ListTailInsert(&g_processRecycleList, &childCB->pendList); } else { OsInsertPCBToFreeList(childCB); } @@ -413,7 +413,7 @@ STATIC VOID OsProcessNaturalExit(LosTaskCB *runTask, UINT32 status) #ifdef LOSCFG_KERNEL_VM (VOID)OsKill(processCB->parentProcessID, SIGCHLD, OS_KERNEL_KILL_PERMISSION); #endif - LOS_ListHeadInsert(&g_processRecyleList, &processCB->pendList); + LOS_ListHeadInsert(&g_processRecycleList, &processCB->pendList); OsRunTaskToDelete(runTask); return; } @@ -437,7 +437,7 @@ STATIC UINT32 OsProcessInit(VOID) (VOID)memset_s(g_processCBArray, size, 0, size); LOS_ListInit(&g_freeProcess); - LOS_ListInit(&g_processRecyleList); + LOS_ListInit(&g_processRecycleList); for (index = 0; index < g_processMaxNum; index++) { g_processCBArray[index].processID = index; @@ -457,14 +457,14 @@ STATIC UINT32 OsProcessInit(VOID) return LOS_OK; } -LITE_OS_SEC_TEXT VOID OsProcessCBRecyleToFree(VOID) +LITE_OS_SEC_TEXT VOID OsProcessCBRecycleToFree(VOID) { UINT32 intSave; LosProcessCB *processCB = NULL; SCHEDULER_LOCK(intSave); - while (!LOS_ListEmpty(&g_processRecyleList)) { - processCB = OS_PCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_processRecyleList)); + while (!LOS_ListEmpty(&g_processRecycleList)) { + processCB = OS_PCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_processRecycleList)); if (!(processCB->processStatus & OS_PROCESS_FLAG_EXIT)) { break; } @@ -487,7 +487,7 @@ LITE_OS_SEC_TEXT VOID OsProcessCBRecyleToFree(VOID) LOS_ListDelete(&processCB->pendList); if ((processCB->processStatus & OS_PROCESS_FLAG_GROUP_LEADER) || (processCB->processStatus & OS_PROCESS_STATUS_ZOMBIES)) { - LOS_ListTailInsert(&g_processRecyleList, &processCB->pendList); + LOS_ListTailInsert(&g_processRecycleList, &processCB->pendList); } else { /* Clear the bottom 4 bits of process status */ OsInsertPCBToFreeList(processCB); @@ -525,7 +525,7 @@ STATIC VOID OsDeInitPCB(LosProcessCB *processCB) processCB->processStatus &= ~OS_PROCESS_STATUS_INIT; processCB->processStatus |= OS_PROCESS_FLAG_EXIT; - LOS_ListHeadInsert(&g_processRecyleList, &processCB->pendList); + LOS_ListHeadInsert(&g_processRecycleList, &processCB->pendList); SCHEDULER_UNLOCK(intSave); (VOID)LOS_MemFree(m_aucSysMem1, group); @@ -1005,7 +1005,7 @@ WAIT_BACK: return LOS_OK; } -STATIC UINT32 OsWaitRecycleChildPorcess(const LosProcessCB *childCB, UINT32 intSave, INT32 *status) +STATIC UINT32 OsWaitRecycleChildProcess(const LosProcessCB *childCB, UINT32 intSave, INT32 *status) { ProcessGroup *group = NULL; UINT32 pid = childCB->processID; @@ -1081,7 +1081,7 @@ LITE_OS_SEC_TEXT INT32 LOS_Wait(INT32 pid, USER INT32 *status, UINT32 options, V } if (childCB != NULL) { - return (INT32)OsWaitRecycleChildPorcess(childCB, intSave, status); + return (INT32)OsWaitRecycleChildProcess(childCB, intSave, status); } if ((options & LOS_WAIT_WNOHANG) != 0) { @@ -1104,7 +1104,7 @@ LITE_OS_SEC_TEXT INT32 LOS_Wait(INT32 pid, USER INT32 *status, UINT32 options, V goto ERROR; } - return (INT32)OsWaitRecycleChildPorcess(childCB, intSave, status); + return (INT32)OsWaitRecycleChildProcess(childCB, intSave, status); ERROR: SCHEDULER_UNLOCK(intSave); diff --git a/kernel/base/core/los_sortlink.c b/kernel/base/core/los_sortlink.c index 6cb8b82b..2f818dfd 100644 --- a/kernel/base/core/los_sortlink.c +++ b/kernel/base/core/los_sortlink.c @@ -122,10 +122,10 @@ STATIC INLINE UINT64 OsGetSortLinkNextExpireTime(SortLinkAttribute *sortHeader, return expirTime; } -STATIC Percpu *OsFindIdleCpu(UINT16 *ildeCpuID) +STATIC Percpu *OsFindIdleCpu(UINT16 *idleCpuID) { Percpu *idleCpu = OsPercpuGetByID(0); - *ildeCpuID = 0; + *idleCpuID = 0; #ifdef LOSCFG_KERNEL_SMP UINT16 cpuID = 1; @@ -136,7 +136,7 @@ STATIC Percpu *OsFindIdleCpu(UINT16 *ildeCpuID) UINT32 temp = cpu->taskSortLink.nodeNum + cpu->swtmrSortLink.nodeNum; if (nodeNum > temp) { idleCpu = cpu; - *ildeCpuID = cpuID; + *idleCpuID = cpuID; } cpuID++; diff --git a/kernel/base/core/los_task.c b/kernel/base/core/los_task.c index f7b3b1a9..48e2e74d 100644 --- a/kernel/base/core/los_task.c +++ b/kernel/base/core/los_task.c @@ -67,7 +67,7 @@ LITE_OS_SEC_BSS LosTaskCB *g_taskCBArray; LITE_OS_SEC_BSS LOS_DL_LIST g_losFreeTask; -LITE_OS_SEC_BSS LOS_DL_LIST g_taskRecyleList; +LITE_OS_SEC_BSS LOS_DL_LIST g_taskRecycleList; LITE_OS_SEC_BSS UINT32 g_taskMaxNum; LITE_OS_SEC_BSS UINT32 g_taskScheduled; /* one bit for each cores */ LITE_OS_SEC_BSS EVENT_CB_S g_resourceEvent; @@ -201,7 +201,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsTaskInit(VOID) (VOID)memset_s(g_taskCBArray, size, 0, size); LOS_ListInit(&g_losFreeTask); - LOS_ListInit(&g_taskRecyleList); + LOS_ListInit(&g_taskRecycleList); for (index = 0; index < g_taskMaxNum; index++) { g_taskCBArray[index].taskStatus = OS_TASK_STATUS_UNUSED; g_taskCBArray[index].taskID = index; @@ -450,8 +450,8 @@ LITE_OS_SEC_TEXT VOID OsTaskCBRecycleToFree() UINT32 intSave; SCHEDULER_LOCK(intSave); - while (!LOS_ListEmpty(&g_taskRecyleList)) { - taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_taskRecyleList)); + while (!LOS_ListEmpty(&g_taskRecycleList)) { + taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_taskRecycleList)); LOS_ListDelete(&taskCB->pendList); SCHEDULER_UNLOCK(intSave); @@ -888,7 +888,7 @@ LITE_OS_SEC_TEXT VOID OsRunTaskToDelete(LosTaskCB *runTask) LOS_ListDelete(&runTask->threadList); processCB->threadNumber--; - LOS_ListTailInsert(&g_taskRecyleList, &runTask->pendList); + LOS_ListTailInsert(&g_taskRecycleList, &runTask->pendList); OsEventWriteUnsafe(&g_resourceEvent, OS_RESOURCE_EVENT_FREE, FALSE, NULL); OsSchedResched(); @@ -962,7 +962,7 @@ STATIC VOID OsTaskDeleteInactive(LosProcessCB *processCB, LosTaskCB *taskCB) LOS_ListDelete(&taskCB->threadList); processCB->threadNumber--; - LOS_ListTailInsert(&g_taskRecyleList, &taskCB->pendList); + LOS_ListTailInsert(&g_taskRecycleList, &taskCB->pendList); return; } @@ -1650,7 +1650,7 @@ STATIC VOID OsResourceRecoveryTask(VOID) if (ret & (OS_RESOURCE_EVENT_FREE | OS_RESOURCE_EVENT_OOM)) { OsTaskCBRecycleToFree(); - OsProcessCBRecyleToFree(); + OsProcessCBRecycleToFree(); } #ifdef LOSCFG_ENABLE_OOM_LOOP_TASK diff --git a/kernel/base/include/los_process_pri.h b/kernel/base/include/los_process_pri.h index 8cf6b7c0..27e80cf4 100644 --- a/kernel/base/include/los_process_pri.h +++ b/kernel/base/include/los_process_pri.h @@ -441,7 +441,7 @@ extern UINTPTR __user_init_bss; extern UINTPTR __user_init_end; extern UINTPTR __user_init_load_addr; extern UINT32 OsSystemProcessCreate(VOID); -extern VOID OsProcessCBRecyleToFree(VOID); +extern VOID OsProcessCBRecycleToFree(VOID); extern VOID OsProcessResourcesToFree(LosProcessCB *processCB); extern VOID OsProcessExit(LosTaskCB *runTask, INT32 status); extern UINT32 OsUserInitProcess(VOID); -- GitLab