yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!690 chore: 修复任务调度代码中部分函数、变量命名不规范问题 

Merge pull request !690 from kenneth/typos
This commit is contained in:
openharmony_ci 2021-11-02 02:50:03 +00:00 committed by Gitee
parent ebfac57d54 ef1d9f848d
commit e54eb9e34d
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
kernel/base/sched/sched_sq/los_sched.c
View File

@ -383,15 +383,16 @@ VOID OsSchedUpdateExpireTime(UINT64 startTime)
STATIC INLINE UINT32 OsSchedCalculateTimeSlice(UINT16 proPriority, UINT16 priority) STATIC INLINE UINT32 OsSchedCalculateTimeSlice(UINT16 proPriority, UINT16 priority)
{ {
UINT32 ratTime, readTasks; UINT32 retTime;
UINT32 readyTasks;
SchedQueue *queueList = &g_sched->queueList[proPriority]; SchedQueue *queueList = &g_sched->queueList[proPriority];
readTasks = queueList->readyTasks[priority]; readyTasks = queueList->readyTasks[priority];
if (readTasks > OS_SCHED_READY_MAX) { if (readyTasks > OS_SCHED_READY_MAX) {
return OS_SCHED_TIME_SLICES_MIN; return OS_SCHED_TIME_SLICES_MIN;
} }
ratTime = ((OS_SCHED_READY_MAX - readTasks) * OS_SCHED_TIME_SLICES_DIFF) / OS_SCHED_READY_MAX; retTime = ((OS_SCHED_READY_MAX - readyTasks) * OS_SCHED_TIME_SLICES_DIFF) / OS_SCHED_READY_MAX;
return (ratTime + OS_SCHED_TIME_SLICES_MIN); return (retTime + OS_SCHED_TIME_SLICES_MIN);
} }
STATIC INLINE VOID OsSchedPriQueueEnHead(UINT32 proPriority, LOS_DL_LIST *priqueueItem, UINT32 priority) 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 * (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. * 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. * to be protected, preventing another core from doing sortlink deletion at same time.
*/ */
LOS_SpinLock(&cpu->taskSortLinkSpin); LOS_SpinLock(&cpu->taskSortLinkSpin);
@ -977,7 +978,7 @@ STATIC INLINE VOID OsSchedSwitchProcess(LosProcessCB *runProcess, LosProcessCB *
OsCurrProcessSet(newProcess); OsCurrProcessSet(newProcess);
} }
STATIC VOID OsSchedTaskSwicth(LosTaskCB *runTask, LosTaskCB *newTask) STATIC VOID OsSchedTaskSwitch(LosTaskCB *runTask, LosTaskCB *newTask)
{ {
UINT64 endTime; UINT64 endTime;
@ -1060,7 +1061,7 @@ VOID OsSchedIrqEndCheckNeedSched(VOID)
LosTaskCB *newTask = OsGetTopTask(); LosTaskCB *newTask = OsGetTopTask();
if (runTask != newTask) { if (runTask != newTask) {
OsSchedTaskSwicth(runTask, newTask); OsSchedTaskSwitch(runTask, newTask);
LOS_SpinUnlock(&g_taskSpin); LOS_SpinUnlock(&g_taskSpin);
return; return;
} }
@ -1089,7 +1090,7 @@ VOID OsSchedResched(VOID)
return; return;
} }
OsSchedTaskSwicth(runTask, newTask); OsSchedTaskSwitch(runTask, newTask);
} }
VOID LOS_Schedule(VOID) VOID LOS_Schedule(VOID)
@ -1108,8 +1109,8 @@ VOID LOS_Schedule(VOID)
/* /*
* trigger schedule in task will also do the slice check * trigger schedule in task will also do the slice check
* if neccessary, it will give up the timeslice more in time. * if necessary, it will give up the timeslice more in time.
* otherwhise, there's no other side effects. * otherwise, there's no other side effects.
*/ */
SCHEDULER_LOCK(intSave); SCHEDULER_LOCK(intSave);