From 53ced1a85edc3d06230225ced3916772f432243f Mon Sep 17 00:00:00 2001 From: zhushengle Date: Fri, 6 Aug 2021 11:25:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20OsGerCurrSchedTimeCycle=20=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E5=AD=98=E5=9C=A8=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Close #I446CX Signed-off-by: zhushengle Change-Id: I49e80ffe1a7b579b82aaf45f599623b287eb8e98 --- kernel/base/core/los_sortlink.c | 2 +- kernel/base/core/los_swtmr.c | 6 +++--- kernel/base/core/los_sys.c | 2 +- kernel/base/include/los_sched_pri.h | 6 +++--- kernel/base/sched/sched_sq/los_sched.c | 18 +++++++++--------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kernel/base/core/los_sortlink.c b/kernel/base/core/los_sortlink.c index 2f818dfd..1ca9fecd 100644 --- a/kernel/base/core/los_sortlink.c +++ b/kernel/base/core/los_sortlink.c @@ -231,7 +231,7 @@ UINT64 OsGetNextExpireTime(UINT64 startTime) UINT32 OsSortLinkGetTargetExpireTime(const SortLinkList *targetSortList) { - UINT64 currTimes = OsGerCurrSchedTimeCycle(); + UINT64 currTimes = OsGetCurrSchedTimeCycle(); if (currTimes >= targetSortList->responseTime) { return 0; } diff --git a/kernel/base/core/los_swtmr.c b/kernel/base/core/los_swtmr.c index 2cad2825..765deb01 100644 --- a/kernel/base/core/los_swtmr.c +++ b/kernel/base/core/los_swtmr.c @@ -181,7 +181,7 @@ ERROR: LITE_OS_SEC_TEXT VOID OsSwtmrStart(SWTMR_CTRL_S *swtmr) { UINT32 ticks; - UINT64 currTime = OsGerCurrSchedTimeCycle(); + UINT64 currTime = OsGetCurrSchedTimeCycle(); if ((swtmr->uwOverrun == 0) && ((swtmr->ucMode == LOS_SWTMR_MODE_ONCE) || (swtmr->ucMode == LOS_SWTMR_MODE_OPP) || @@ -264,7 +264,7 @@ LITE_OS_SEC_TEXT VOID OsSwtmrScan(VOID) } SortLinkList *sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode); - UINT64 currTime = OsGerCurrSchedTimeCycle(); + UINT64 currTime = OsGetCurrSchedTimeCycle(); while (sortList->responseTime <= currTime) { sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode); OsDeleteNodeSortLink(swtmrSortLink, sortList); @@ -306,7 +306,7 @@ LITE_OS_SEC_TEXT STATIC VOID OsSwtmrStop(SWTMR_CTRL_S *swtmr) swtmr->uwOverrun = 0; if (OS_SCHEDULER_ACTIVE) { - OsSchedUpdateExpireTime(OsGerCurrSchedTimeCycle()); + OsSchedUpdateExpireTime(OsGetCurrSchedTimeCycle()); } } diff --git a/kernel/base/core/los_sys.c b/kernel/base/core/los_sys.c index d6adf850..5f77c108 100644 --- a/kernel/base/core/los_sys.c +++ b/kernel/base/core/los_sys.c @@ -37,7 +37,7 @@ LITE_OS_SEC_TEXT_MINOR UINT64 LOS_TickCountGet(VOID) { - return OsGerCurrSchedTimeCycle() / OS_CYCLE_PER_TICK; + return OsGetCurrSchedTimeCycle() / OS_CYCLE_PER_TICK; } LITE_OS_SEC_TEXT_MINOR UINT32 LOS_CyclePerTickGet(VOID) diff --git a/kernel/base/include/los_sched_pri.h b/kernel/base/include/los_sched_pri.h index 21af8ce6..8d45f1d2 100644 --- a/kernel/base/include/los_sched_pri.h +++ b/kernel/base/include/los_sched_pri.h @@ -50,7 +50,7 @@ typedef BOOL (*SchedScan)(VOID); extern UINT64 g_sysSchedStartTime; -STATIC INLINE UINT64 OsGerCurrSchedTimeCycle(VOID) +STATIC INLINE UINT64 OsGetCurrSchedTimeCycle(VOID) { if (g_sysSchedStartTime == 0) { return g_sysSchedStartTime; @@ -62,13 +62,13 @@ STATIC INLINE UINT64 OsGerCurrSchedTimeCycle(VOID) STATIC INLINE VOID OsSchedIrqUpdateUsedTime(VOID) { LosTaskCB *runTask = OsCurrTaskGet(); - runTask->irqUsedTime = OsGerCurrSchedTimeCycle() - runTask->irqStartTime; + runTask->irqUsedTime = OsGetCurrSchedTimeCycle() - runTask->irqStartTime; } STATIC INLINE VOID OsSchedIrqStartTime(VOID) { LosTaskCB *runTask = OsCurrTaskGet(); - runTask->irqStartTime = OsGerCurrSchedTimeCycle(); + runTask->irqStartTime = OsGetCurrSchedTimeCycle(); } /* diff --git a/kernel/base/sched/sched_sq/los_sched.c b/kernel/base/sched/sched_sq/los_sched.c index 099d83be..73e73d67 100644 --- a/kernel/base/sched/sched_sq/los_sched.c +++ b/kernel/base/sched/sched_sq/los_sched.c @@ -104,7 +104,7 @@ VOID OsSchedDebugRecordData(VOID) { SchedTickDebug *schedDebug = &g_schedTickDebug[ArchCurrCpuid()]; if (schedDebug->index < OS_SCHED_DEBUG_DATA_NUM) { - UINT64 currTime = OsGerCurrSchedTimeCycle(); + UINT64 currTime = OsGetCurrSchedTimeCycle(); schedDebug->tickResporeTime[schedDebug->index] = currTime - schedDebug->oldResporeTime; schedDebug->oldResporeTime = currTime; schedDebug->index++; @@ -487,7 +487,7 @@ STATIC INLINE BOOL OsSchedScanTimerList(VOID) } SortLinkList *sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode); - UINT64 currTime = OsGerCurrSchedTimeCycle(); + UINT64 currTime = OsGetCurrSchedTimeCycle(); while (sortList->responseTime <= currTime) { LosTaskCB *taskCB = LOS_DL_LIST_ENTRY(sortList, LosTaskCB, sortList); OsDeleteNodeSortLink(taskSortLink, &taskCB->sortList); @@ -594,7 +594,7 @@ VOID OsSchedTaskEnQueue(LosTaskCB *taskCB) LosProcessCB *processCB = OS_PCB_FROM_PID(taskCB->processID); #ifdef LOSCFG_SCHED_DEBUG if (!(taskCB->taskStatus & OS_TASK_STATUS_RUNNING)) { - taskCB->startTime = OsGerCurrSchedTimeCycle(); + taskCB->startTime = OsGetCurrSchedTimeCycle(); } #endif OsSchedEnTaskQueue(taskCB, processCB); @@ -624,7 +624,7 @@ VOID OsSchedYield(VOID) runTask->timeSlice = 0; - runTask->startTime = OsGerCurrSchedTimeCycle(); + runTask->startTime = OsGetCurrSchedTimeCycle(); OsSchedTaskEnQueue(runTask); OsSchedResched(); } @@ -674,7 +674,7 @@ VOID OsSchedTaskWake(LosTaskCB *resumedTask) if (!(resumedTask->taskStatus & OS_TASK_STATUS_SUSPENDED)) { #ifdef LOSCFG_SCHED_DEBUG - resumedTask->schedStat.pendTime += OsGerCurrSchedTimeCycle() - resumedTask->startTime; + resumedTask->schedStat.pendTime += OsGetCurrSchedTimeCycle() - resumedTask->startTime; resumedTask->schedStat.pendCount++; #endif OsSchedTaskEnQueue(resumedTask); @@ -867,7 +867,7 @@ VOID OsSchedStart(VOID) newProcess->processStatus = OS_PROCESS_RUNTASK_COUNT_ADD(newProcess->processStatus); OsSchedSetStartTime(HalClockGetCycles()); - newTask->startTime = OsGerCurrSchedTimeCycle(); + newTask->startTime = OsGetCurrSchedTimeCycle(); #ifdef LOSCFG_KERNEL_SMP /* @@ -984,7 +984,7 @@ STATIC VOID OsSchedTaskSwicth(LosTaskCB *runTask, LosTaskCB *newTask) newTask->startTime = runTask->startTime; } else { /* The currently running task is blocked */ - newTask->startTime = OsGerCurrSchedTimeCycle(); + newTask->startTime = OsGetCurrSchedTimeCycle(); /* The task is in a blocking state and needs to update its time slice before pend */ OsTimeSliceUpdate(runTask, newTask->startTime); @@ -1015,7 +1015,7 @@ VOID OsSchedIrqEndCheckNeedSched(VOID) Percpu *percpu = OsPercpuGet(); LosTaskCB *runTask = OsCurrTaskGet(); - OsTimeSliceUpdate(runTask, OsGerCurrSchedTimeCycle()); + OsTimeSliceUpdate(runTask, OsGetCurrSchedTimeCycle()); if (runTask->timeSlice <= OS_TIME_SLICE_MIN) { percpu->schedFlag = INT_PEND_RESCH; } @@ -1080,7 +1080,7 @@ VOID LOS_Schedule(VOID) */ SCHEDULER_LOCK(intSave); - OsTimeSliceUpdate(runTask, OsGerCurrSchedTimeCycle()); + OsTimeSliceUpdate(runTask, OsGetCurrSchedTimeCycle()); /* add run task back to ready queue */ OsSchedTaskEnQueue(runTask);