From ef1d9f848d47e4805312a709da54f95d3214503a Mon Sep 17 00:00:00 2001 From: kenneth Date: Tue, 2 Nov 2021 08:49:52 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=E4=BB=A3=E7=A0=81=E4=B8=AD=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E3=80=81=E5=8F=98=E9=87=8F=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=B8=8D=E8=A7=84=E8=8C=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 变量readTasks应该为readyTasks；函数OsSchedTaskSwicth应该为OsSchedTaskSwitch；其他拼写错误。 close #I4GFJ7 Signed-off-by: kenneth --- kernel/base/sched/sched_sq/los_sched.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/kernel/base/sched/sched_sq/los_sched.c b/kernel/base/sched/sched_sq/los_sched.c index d2c8425e..23845bdc 100644 --- a/kernel/base/sched/sched_sq/los_sched.c +++ b/kernel/base/sched/sched_sq/los_sched.c @@ -383,15 +383,16 @@ VOID OsSchedUpdateExpireTime(UINT64 startTime) STATIC INLINE UINT32 OsSchedCalculateTimeSlice(UINT16 proPriority, UINT16 priority) { - UINT32 ratTime, readTasks; + UINT32 retTime; + UINT32 readyTasks; SchedQueue *queueList = &g_sched->queueList[proPriority]; - readTasks = queueList->readyTasks[priority]; - if (readTasks > OS_SCHED_READY_MAX) { + readyTasks = queueList->readyTasks[priority]; + if (readyTasks > OS_SCHED_READY_MAX) { return OS_SCHED_TIME_SLICES_MIN; } - ratTime = ((OS_SCHED_READY_MAX - readTasks) * OS_SCHED_TIME_SLICES_DIFF) / OS_SCHED_READY_MAX; - return (ratTime + OS_SCHED_TIME_SLICES_MIN); + retTime = ((OS_SCHED_READY_MAX - readyTasks) * OS_SCHED_TIME_SLICES_DIFF) / OS_SCHED_READY_MAX; + return (retTime + OS_SCHED_TIME_SLICES_MIN); } STATIC INLINE VOID OsSchedPriQueueEnHead(UINT32 proPriority, LOS_DL_LIST *priqueueItem, UINT32 priority) @@ -502,7 +503,7 @@ STATIC INLINE BOOL OsSchedScanTimerList(VOID) * (per cpu) and ipc(mutex,sem and etc.)'s block at the same time, it can be waken * up by either timeout or corresponding ipc it's waiting. * - * Now synchronize sortlink preocedure is used, therefore the whole task scan needs + * Now synchronize sortlink procedure is used, therefore the whole task scan needs * to be protected, preventing another core from doing sortlink deletion at same time. */ LOS_SpinLock(&cpu->taskSortLinkSpin); @@ -977,7 +978,7 @@ STATIC INLINE VOID OsSchedSwitchProcess(LosProcessCB *runProcess, LosProcessCB * OsCurrProcessSet(newProcess); } -STATIC VOID OsSchedTaskSwicth(LosTaskCB *runTask, LosTaskCB *newTask) +STATIC VOID OsSchedTaskSwitch(LosTaskCB *runTask, LosTaskCB *newTask) { UINT64 endTime; @@ -1060,7 +1061,7 @@ VOID OsSchedIrqEndCheckNeedSched(VOID) LosTaskCB *newTask = OsGetTopTask(); if (runTask != newTask) { - OsSchedTaskSwicth(runTask, newTask); + OsSchedTaskSwitch(runTask, newTask); LOS_SpinUnlock(&g_taskSpin); return; } @@ -1089,7 +1090,7 @@ VOID OsSchedResched(VOID) return; } - OsSchedTaskSwicth(runTask, newTask); + OsSchedTaskSwitch(runTask, newTask); } VOID LOS_Schedule(VOID) @@ -1108,8 +1109,8 @@ VOID LOS_Schedule(VOID) /* * trigger schedule in task will also do the slice check - * if neccessary, it will give up the timeslice more in time. - * otherwhise, there's no other side effects. + * if necessary, it will give up the timeslice more in time. + * otherwise, there's no other side effects. */ SCHEDULER_LOCK(intSave);