From c66fe0313f76ba41992b4864c93cf82934378ad3 Mon Sep 17 00:00:00 2001 From: rtos-lover Date: Sat, 8 May 2021 11:23:08 +0800 Subject: [PATCH] fix: correct spelling correct some typos in los_task.c and other files close https://gitee.com/openharmony/kernel_liteos_a/issues/I3QDB8 --- compat/posix/src/pthread.c | 2 +- kernel/base/core/los_process.c | 2 +- kernel/base/core/los_task.c | 20 ++++++++++---------- kernel/base/include/los_process_pri.h | 2 +- kernel/base/include/los_task_pri.h | 6 +++--- syscall/process_syscall.c | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/compat/posix/src/pthread.c b/compat/posix/src/pthread.c index 507a3eea..b985da4f 100644 --- a/compat/posix/src/pthread.c +++ b/compat/posix/src/pthread.c @@ -435,7 +435,7 @@ int pthread_detach(pthread_t thread) /* Set state to detached and kick any joinees to make them return. */ SCHEDULER_LOCK(intSave); if (!(detached->task->taskStatus & OS_TASK_STATUS_EXIT)) { - ret = OsTaskSetDeatchUnsafe(detached->task); + ret = OsTaskSetDetachUnsafe(detached->task); if (ret == ESRCH) { ret = LOS_OK; } else if (ret == LOS_OK) { diff --git a/kernel/base/core/los_process.c b/kernel/base/core/los_process.c index a8c8130f..40d5329e 100644 --- a/kernel/base/core/los_process.c +++ b/kernel/base/core/los_process.c @@ -468,7 +468,7 @@ LITE_OS_SEC_TEXT VOID OsProcessCBRecyleToFree(VOID) } SCHEDULER_UNLOCK(intSave); - OsTaskCBRecyleToFree(); + OsTaskCBRecycleToFree(); SCHEDULER_LOCK(intSave); processCB->processStatus &= ~OS_PROCESS_FLAG_EXIT; diff --git a/kernel/base/core/los_task.c b/kernel/base/core/los_task.c index ac0c5e12..290658f3 100644 --- a/kernel/base/core/los_task.c +++ b/kernel/base/core/los_task.c @@ -162,7 +162,7 @@ LITE_OS_SEC_TEXT UINT32 OsTaskJoinPendUnsafe(LosTaskCB *taskCB) return LOS_EINVAL; } -LITE_OS_SEC_TEXT UINT32 OsTaskSetDeatchUnsafe(LosTaskCB *taskCB) +LITE_OS_SEC_TEXT UINT32 OsTaskSetDetachUnsafe(LosTaskCB *taskCB) { LosProcessCB *processCB = OS_PCB_FROM_PID(taskCB->processID); if (!(processCB->processStatus & OS_PROCESS_STATUS_RUNNING)) { @@ -450,7 +450,7 @@ STATIC VOID OsTaskKernelResourcesToFree(UINT32 syncSignal, UINTPTR topOfStack) (VOID)LOS_MemFree(poolTmp, (VOID *)topOfStack); } -LITE_OS_SEC_TEXT VOID OsTaskCBRecyleToFree() +LITE_OS_SEC_TEXT VOID OsTaskCBRecycleToFree() { LosTaskCB *taskCB = NULL; UINT32 intSave; @@ -764,7 +764,7 @@ LOS_ERREND: /* * Check if needs to do the suspend operation on the running task. * Return TRUE, if needs to do the suspension. - * Rerturn FALSE, if meets following circumstances: + * Return FALSE, if meets following circumstances: * 1. Do the suspension across cores, if SMP is enabled * 2. Do the suspension when preemption is disabled * 3. Do the suspension in hard-irq @@ -902,7 +902,7 @@ LITE_OS_SEC_TEXT VOID OsRunTaskToDelete(LosTaskCB *taskCB) /* * Check if needs to do the delete operation on the running task. * Return TRUE, if needs to do the deletion. - * Rerturn FALSE, if meets following circumstances: + * Return FALSE, if meets following circumstances: * 1. Do the deletion across cores, if SMP is enabled * 2. Do the deletion when preemption is disabled * 3. Do the deletion in hard-irq @@ -1167,7 +1167,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskYield(VOID) } SCHEDULER_LOCK(intSave); - /* reset timeslice of yeilded task */ + /* reset timeslice of yielded task */ OsSchedYield(); SCHEDULER_UNLOCK(intSave); return LOS_OK; @@ -1327,7 +1327,7 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTaskProcSignal(VOID) /* * private and uninterruptable, no protection needed. * while this task is always running when others cores see it, - * so it keeps recieving signals while follow code excuting. + * so it keeps receiving signals while follow code executing. */ LosTaskCB *runTask = OsCurrTaskGet(); if (runTask->signal == SIGNAL_NONE) { @@ -1465,7 +1465,7 @@ LITE_OS_SEC_TEXT VOID OsTaskExitGroup(UINT32 status) LITE_OS_SEC_TEXT VOID OsExecDestroyTaskGroup(VOID) { OsTaskExitGroup(OS_PRO_EXIT_OK); - OsTaskCBRecyleToFree(); + OsTaskCBRecycleToFree(); } LITE_OS_SEC_TEXT VOID OsProcessSuspendAllTask(VOID) @@ -1557,7 +1557,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsCreateUserTask(UINT32 processID, TSK_INIT_PARAM_S return ret; } - initParam->uwStackSize = OS_USER_TASK_SYSCALL_SATCK_SIZE; + initParam->uwStackSize = OS_USER_TASK_SYSCALL_STACK_SIZE; initParam->usTaskPrio = OS_TASK_PRIORITY_LOWEST; initParam->policy = LOS_SCHED_RR; if (processID == OS_INVALID_VALUE) { @@ -1654,7 +1654,7 @@ STATIC VOID OsResourceRecoveryTask(VOID) ret = LOS_EventRead(&g_resourceEvent, OS_RESOURCE_EVENT_MASK, LOS_WAITMODE_OR | LOS_WAITMODE_CLR, LOS_WAIT_FOREVER); if (ret & (OS_RESOURCE_EVENT_FREE | OS_RESOURCE_EVENT_OOM)) { - OsTaskCBRecyleToFree(); + OsTaskCBRecycleToFree(); OsProcessCBRecyleToFree(); } @@ -1680,7 +1680,7 @@ LITE_OS_SEC_TEXT UINT32 OsCreateResourceFreeTask(VOID) (VOID)memset_s((VOID *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)OsResourceRecoveryTask; - taskInitParam.uwStackSize = OS_TASK_RESOURCE_STATCI_SIZE; + taskInitParam.uwStackSize = OS_TASK_RESOURCE_STATIC_SIZE; taskInitParam.pcName = "ResourcesTask"; taskInitParam.usTaskPrio = OS_TASK_RESOURCE_FREE_PRIORITY; ret = LOS_TaskCreate(&taskID, &taskInitParam); diff --git a/kernel/base/include/los_process_pri.h b/kernel/base/include/los_process_pri.h index 944bf264..80ad6bec 100644 --- a/kernel/base/include/los_process_pri.h +++ b/kernel/base/include/los_process_pri.h @@ -303,7 +303,7 @@ STATIC INLINE BOOL OsProcessIsDead(const LosProcessCB *processCB) ((OS_PROCESS_GET_RUNTASK_COUNT(status) - 1) & OS_PROCESS_RUNTASK_COUNT_MASK)) #define OS_TASK_DEFAULT_STACK_SIZE 0x2000 -#define OS_USER_TASK_SYSCALL_SATCK_SIZE 0x3000 +#define OS_USER_TASK_SYSCALL_STACK_SIZE 0x3000 #define OS_USER_TASK_STACK_SIZE 0x100000 #define OS_KERNEL_MODE 0x0U diff --git a/kernel/base/include/los_task_pri.h b/kernel/base/include/los_task_pri.h index d40c9511..e5b81cb0 100644 --- a/kernel/base/include/los_task_pri.h +++ b/kernel/base/include/los_task_pri.h @@ -293,7 +293,7 @@ extern SPIN_LOCK_S g_taskSpin; #define LOSCFG_STACK_POINT_ALIGN_SIZE (sizeof(UINTPTR) * 2) #endif -#define OS_TASK_RESOURCE_STATCI_SIZE 0x1000 +#define OS_TASK_RESOURCE_STATIC_SIZE 0x1000 #define OS_TASK_RESOURCE_FREE_PRIORITY 5 #define OS_RESOURCE_EVENT_MASK 0xFF #define OS_RESOURCE_EVENT_OOM 0x02 @@ -458,7 +458,7 @@ STATIC INLINE BOOL OsTaskIsInactive(const LosTaskCB *taskCB) /* get task info */ #define OS_ALL_TASK_MASK 0xFFFFFFFF -extern UINT32 OsTaskSetDeatchUnsafe(LosTaskCB *taskCB); +extern UINT32 OsTaskSetDetachUnsafe(LosTaskCB *taskCB); extern VOID OsTaskJoinPostUnsafe(LosTaskCB *taskCB); extern UINT32 OsTaskJoinPendUnsafe(LosTaskCB *taskCB); extern BOOL OsTaskCpuAffiSetUnsafe(UINT32 taskID, UINT16 newCpuAffiMask, UINT16 *oldCpuAffiMask); @@ -481,7 +481,7 @@ extern VOID OsRunTaskToDelete(LosTaskCB *taskCB); extern UINT32 OsTaskSyncWait(const LosTaskCB *taskCB); extern UINT32 OsCreateUserTask(UINT32 processID, TSK_INIT_PARAM_S *initParam); extern INT32 OsSetTaskName(LosTaskCB *taskCB, const CHAR *name, BOOL setPName); -extern VOID OsTaskCBRecyleToFree(VOID); +extern VOID OsTaskCBRecycleToFree(VOID); extern VOID OsTaskExitGroup(UINT32 status); extern VOID OsTaskToExit(LosTaskCB *taskCB, UINT32 status); extern VOID OsExecDestroyTaskGroup(VOID); diff --git a/syscall/process_syscall.c b/syscall/process_syscall.c index b13c6568..b4f5d002 100644 --- a/syscall/process_syscall.c +++ b/syscall/process_syscall.c @@ -901,7 +901,7 @@ int SysUserThreadSetDeatch(unsigned int taskID) goto EXIT; } - ret = OsTaskSetDeatchUnsafe(taskCB); + ret = OsTaskSetDetachUnsafe(taskCB); EXIT: SCHEDULER_UNLOCK(intSave); -- GitLab