提交 d9774e01 编写于 作者: O openharmony_ci 提交者: Gitee

!447 chore: fix function and variable name spell issues

Merge pull request !447 from kenneth/chore
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
LITE_OS_SEC_BSS LosProcessCB *g_processCBArray = NULL; 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_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_userInitProcess = OS_INVALID_VALUE;
LITE_OS_SEC_BSS UINT32 g_kernelInitProcess = OS_INVALID_VALUE; LITE_OS_SEC_BSS UINT32 g_kernelInitProcess = OS_INVALID_VALUE;
LITE_OS_SEC_BSS UINT32 g_kernelIdleProcess = 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 ...@@ -331,9 +331,9 @@ LITE_OS_SEC_TEXT STATIC VOID OsRecycleZombiesProcess(LosProcessCB *childCB, Proc
LOS_ListDelete(&childCB->pendList); LOS_ListDelete(&childCB->pendList);
if (childCB->processStatus & OS_PROCESS_FLAG_EXIT) { 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) { } else if (childCB->processStatus & OS_PROCESS_FLAG_GROUP_LEADER) {
LOS_ListTailInsert(&g_processRecyleList, &childCB->pendList); LOS_ListTailInsert(&g_processRecycleList, &childCB->pendList);
} else { } else {
OsInsertPCBToFreeList(childCB); OsInsertPCBToFreeList(childCB);
} }
...@@ -413,7 +413,7 @@ STATIC VOID OsProcessNaturalExit(LosTaskCB *runTask, UINT32 status) ...@@ -413,7 +413,7 @@ STATIC VOID OsProcessNaturalExit(LosTaskCB *runTask, UINT32 status)
#ifdef LOSCFG_KERNEL_VM #ifdef LOSCFG_KERNEL_VM
(VOID)OsKill(processCB->parentProcessID, SIGCHLD, OS_KERNEL_KILL_PERMISSION); (VOID)OsKill(processCB->parentProcessID, SIGCHLD, OS_KERNEL_KILL_PERMISSION);
#endif #endif
LOS_ListHeadInsert(&g_processRecyleList, &processCB->pendList); LOS_ListHeadInsert(&g_processRecycleList, &processCB->pendList);
OsRunTaskToDelete(runTask); OsRunTaskToDelete(runTask);
return; return;
} }
...@@ -437,7 +437,7 @@ STATIC UINT32 OsProcessInit(VOID) ...@@ -437,7 +437,7 @@ STATIC UINT32 OsProcessInit(VOID)
(VOID)memset_s(g_processCBArray, size, 0, size); (VOID)memset_s(g_processCBArray, size, 0, size);
LOS_ListInit(&g_freeProcess); LOS_ListInit(&g_freeProcess);
LOS_ListInit(&g_processRecyleList); LOS_ListInit(&g_processRecycleList);
for (index = 0; index < g_processMaxNum; index++) { for (index = 0; index < g_processMaxNum; index++) {
g_processCBArray[index].processID = index; g_processCBArray[index].processID = index;
...@@ -457,14 +457,14 @@ STATIC UINT32 OsProcessInit(VOID) ...@@ -457,14 +457,14 @@ STATIC UINT32 OsProcessInit(VOID)
return LOS_OK; return LOS_OK;
} }
LITE_OS_SEC_TEXT VOID OsProcessCBRecyleToFree(VOID) LITE_OS_SEC_TEXT VOID OsProcessCBRecycleToFree(VOID)
{ {
UINT32 intSave; UINT32 intSave;
LosProcessCB *processCB = NULL; LosProcessCB *processCB = NULL;
SCHEDULER_LOCK(intSave); SCHEDULER_LOCK(intSave);
while (!LOS_ListEmpty(&g_processRecyleList)) { while (!LOS_ListEmpty(&g_processRecycleList)) {
processCB = OS_PCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_processRecyleList)); processCB = OS_PCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_processRecycleList));
if (!(processCB->processStatus & OS_PROCESS_FLAG_EXIT)) { if (!(processCB->processStatus & OS_PROCESS_FLAG_EXIT)) {
break; break;
} }
...@@ -487,7 +487,7 @@ LITE_OS_SEC_TEXT VOID OsProcessCBRecyleToFree(VOID) ...@@ -487,7 +487,7 @@ LITE_OS_SEC_TEXT VOID OsProcessCBRecyleToFree(VOID)
LOS_ListDelete(&processCB->pendList); LOS_ListDelete(&processCB->pendList);
if ((processCB->processStatus & OS_PROCESS_FLAG_GROUP_LEADER) || if ((processCB->processStatus & OS_PROCESS_FLAG_GROUP_LEADER) ||
(processCB->processStatus & OS_PROCESS_STATUS_ZOMBIES)) { (processCB->processStatus & OS_PROCESS_STATUS_ZOMBIES)) {
LOS_ListTailInsert(&g_processRecyleList, &processCB->pendList); LOS_ListTailInsert(&g_processRecycleList, &processCB->pendList);
} else { } else {
/* Clear the bottom 4 bits of process status */ /* Clear the bottom 4 bits of process status */
OsInsertPCBToFreeList(processCB); OsInsertPCBToFreeList(processCB);
...@@ -525,7 +525,7 @@ STATIC VOID OsDeInitPCB(LosProcessCB *processCB) ...@@ -525,7 +525,7 @@ STATIC VOID OsDeInitPCB(LosProcessCB *processCB)
processCB->processStatus &= ~OS_PROCESS_STATUS_INIT; processCB->processStatus &= ~OS_PROCESS_STATUS_INIT;
processCB->processStatus |= OS_PROCESS_FLAG_EXIT; processCB->processStatus |= OS_PROCESS_FLAG_EXIT;
LOS_ListHeadInsert(&g_processRecyleList, &processCB->pendList); LOS_ListHeadInsert(&g_processRecycleList, &processCB->pendList);
SCHEDULER_UNLOCK(intSave); SCHEDULER_UNLOCK(intSave);
(VOID)LOS_MemFree(m_aucSysMem1, group); (VOID)LOS_MemFree(m_aucSysMem1, group);
...@@ -1005,7 +1005,7 @@ WAIT_BACK: ...@@ -1005,7 +1005,7 @@ WAIT_BACK:
return LOS_OK; 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; ProcessGroup *group = NULL;
UINT32 pid = childCB->processID; UINT32 pid = childCB->processID;
...@@ -1081,7 +1081,7 @@ LITE_OS_SEC_TEXT INT32 LOS_Wait(INT32 pid, USER INT32 *status, UINT32 options, V ...@@ -1081,7 +1081,7 @@ LITE_OS_SEC_TEXT INT32 LOS_Wait(INT32 pid, USER INT32 *status, UINT32 options, V
} }
if (childCB != NULL) { if (childCB != NULL) {
return (INT32)OsWaitRecycleChildPorcess(childCB, intSave, status); return (INT32)OsWaitRecycleChildProcess(childCB, intSave, status);
} }
if ((options & LOS_WAIT_WNOHANG) != 0) { 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 ...@@ -1104,7 +1104,7 @@ LITE_OS_SEC_TEXT INT32 LOS_Wait(INT32 pid, USER INT32 *status, UINT32 options, V
goto ERROR; goto ERROR;
} }
return (INT32)OsWaitRecycleChildPorcess(childCB, intSave, status); return (INT32)OsWaitRecycleChildProcess(childCB, intSave, status);
ERROR: ERROR:
SCHEDULER_UNLOCK(intSave); SCHEDULER_UNLOCK(intSave);
......
...@@ -122,10 +122,10 @@ STATIC INLINE UINT64 OsGetSortLinkNextExpireTime(SortLinkAttribute *sortHeader, ...@@ -122,10 +122,10 @@ STATIC INLINE UINT64 OsGetSortLinkNextExpireTime(SortLinkAttribute *sortHeader,
return expirTime; return expirTime;
} }
STATIC Percpu *OsFindIdleCpu(UINT16 *ildeCpuID) STATIC Percpu *OsFindIdleCpu(UINT16 *idleCpuID)
{ {
Percpu *idleCpu = OsPercpuGetByID(0); Percpu *idleCpu = OsPercpuGetByID(0);
*ildeCpuID = 0; *idleCpuID = 0;
#ifdef LOSCFG_KERNEL_SMP #ifdef LOSCFG_KERNEL_SMP
UINT16 cpuID = 1; UINT16 cpuID = 1;
...@@ -136,7 +136,7 @@ STATIC Percpu *OsFindIdleCpu(UINT16 *ildeCpuID) ...@@ -136,7 +136,7 @@ STATIC Percpu *OsFindIdleCpu(UINT16 *ildeCpuID)
UINT32 temp = cpu->taskSortLink.nodeNum + cpu->swtmrSortLink.nodeNum; UINT32 temp = cpu->taskSortLink.nodeNum + cpu->swtmrSortLink.nodeNum;
if (nodeNum > temp) { if (nodeNum > temp) {
idleCpu = cpu; idleCpu = cpu;
*ildeCpuID = cpuID; *idleCpuID = cpuID;
} }
cpuID++; cpuID++;
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
LITE_OS_SEC_BSS LosTaskCB *g_taskCBArray; LITE_OS_SEC_BSS LosTaskCB *g_taskCBArray;
LITE_OS_SEC_BSS LOS_DL_LIST g_losFreeTask; 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_taskMaxNum;
LITE_OS_SEC_BSS UINT32 g_taskScheduled; /* one bit for each cores */ LITE_OS_SEC_BSS UINT32 g_taskScheduled; /* one bit for each cores */
LITE_OS_SEC_BSS EVENT_CB_S g_resourceEvent; LITE_OS_SEC_BSS EVENT_CB_S g_resourceEvent;
...@@ -201,7 +201,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsTaskInit(VOID) ...@@ -201,7 +201,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsTaskInit(VOID)
(VOID)memset_s(g_taskCBArray, size, 0, size); (VOID)memset_s(g_taskCBArray, size, 0, size);
LOS_ListInit(&g_losFreeTask); LOS_ListInit(&g_losFreeTask);
LOS_ListInit(&g_taskRecyleList); LOS_ListInit(&g_taskRecycleList);
for (index = 0; index < g_taskMaxNum; index++) { for (index = 0; index < g_taskMaxNum; index++) {
g_taskCBArray[index].taskStatus = OS_TASK_STATUS_UNUSED; g_taskCBArray[index].taskStatus = OS_TASK_STATUS_UNUSED;
g_taskCBArray[index].taskID = index; g_taskCBArray[index].taskID = index;
...@@ -450,8 +450,8 @@ LITE_OS_SEC_TEXT VOID OsTaskCBRecycleToFree() ...@@ -450,8 +450,8 @@ LITE_OS_SEC_TEXT VOID OsTaskCBRecycleToFree()
UINT32 intSave; UINT32 intSave;
SCHEDULER_LOCK(intSave); SCHEDULER_LOCK(intSave);
while (!LOS_ListEmpty(&g_taskRecyleList)) { while (!LOS_ListEmpty(&g_taskRecycleList)) {
taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_taskRecyleList)); taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_taskRecycleList));
LOS_ListDelete(&taskCB->pendList); LOS_ListDelete(&taskCB->pendList);
SCHEDULER_UNLOCK(intSave); SCHEDULER_UNLOCK(intSave);
...@@ -888,7 +888,7 @@ LITE_OS_SEC_TEXT VOID OsRunTaskToDelete(LosTaskCB *runTask) ...@@ -888,7 +888,7 @@ LITE_OS_SEC_TEXT VOID OsRunTaskToDelete(LosTaskCB *runTask)
LOS_ListDelete(&runTask->threadList); LOS_ListDelete(&runTask->threadList);
processCB->threadNumber--; processCB->threadNumber--;
LOS_ListTailInsert(&g_taskRecyleList, &runTask->pendList); LOS_ListTailInsert(&g_taskRecycleList, &runTask->pendList);
OsEventWriteUnsafe(&g_resourceEvent, OS_RESOURCE_EVENT_FREE, FALSE, NULL); OsEventWriteUnsafe(&g_resourceEvent, OS_RESOURCE_EVENT_FREE, FALSE, NULL);
OsSchedResched(); OsSchedResched();
...@@ -962,7 +962,7 @@ STATIC VOID OsTaskDeleteInactive(LosProcessCB *processCB, LosTaskCB *taskCB) ...@@ -962,7 +962,7 @@ STATIC VOID OsTaskDeleteInactive(LosProcessCB *processCB, LosTaskCB *taskCB)
LOS_ListDelete(&taskCB->threadList); LOS_ListDelete(&taskCB->threadList);
processCB->threadNumber--; processCB->threadNumber--;
LOS_ListTailInsert(&g_taskRecyleList, &taskCB->pendList); LOS_ListTailInsert(&g_taskRecycleList, &taskCB->pendList);
return; return;
} }
...@@ -1650,7 +1650,7 @@ STATIC VOID OsResourceRecoveryTask(VOID) ...@@ -1650,7 +1650,7 @@ STATIC VOID OsResourceRecoveryTask(VOID)
if (ret & (OS_RESOURCE_EVENT_FREE | OS_RESOURCE_EVENT_OOM)) { if (ret & (OS_RESOURCE_EVENT_FREE | OS_RESOURCE_EVENT_OOM)) {
OsTaskCBRecycleToFree(); OsTaskCBRecycleToFree();
OsProcessCBRecyleToFree(); OsProcessCBRecycleToFree();
} }
#ifdef LOSCFG_ENABLE_OOM_LOOP_TASK #ifdef LOSCFG_ENABLE_OOM_LOOP_TASK
......
...@@ -441,7 +441,7 @@ extern UINTPTR __user_init_bss; ...@@ -441,7 +441,7 @@ extern UINTPTR __user_init_bss;
extern UINTPTR __user_init_end; extern UINTPTR __user_init_end;
extern UINTPTR __user_init_load_addr; extern UINTPTR __user_init_load_addr;
extern UINT32 OsSystemProcessCreate(VOID); extern UINT32 OsSystemProcessCreate(VOID);
extern VOID OsProcessCBRecyleToFree(VOID); extern VOID OsProcessCBRecycleToFree(VOID);
extern VOID OsProcessResourcesToFree(LosProcessCB *processCB); extern VOID OsProcessResourcesToFree(LosProcessCB *processCB);
extern VOID OsProcessExit(LosTaskCB *runTask, INT32 status); extern VOID OsProcessExit(LosTaskCB *runTask, INT32 status);
extern UINT32 OsUserInitProcess(VOID); extern UINT32 OsUserInitProcess(VOID);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册