提交 53ced1a8 编写于 作者: Z zhushengle

fix: OsGerCurrSchedTimeCycle 函数存在拼写错误

Close #I446CX
Signed-off-by: Nzhushengle <zhushengle@huawei.com>
Change-Id: I49e80ffe1a7b579b82aaf45f599623b287eb8e98
上级 d169cad6
...@@ -231,7 +231,7 @@ UINT64 OsGetNextExpireTime(UINT64 startTime) ...@@ -231,7 +231,7 @@ UINT64 OsGetNextExpireTime(UINT64 startTime)
UINT32 OsSortLinkGetTargetExpireTime(const SortLinkList *targetSortList) UINT32 OsSortLinkGetTargetExpireTime(const SortLinkList *targetSortList)
{ {
UINT64 currTimes = OsGerCurrSchedTimeCycle(); UINT64 currTimes = OsGetCurrSchedTimeCycle();
if (currTimes >= targetSortList->responseTime) { if (currTimes >= targetSortList->responseTime) {
return 0; return 0;
} }
......
...@@ -181,7 +181,7 @@ ERROR: ...@@ -181,7 +181,7 @@ ERROR:
LITE_OS_SEC_TEXT VOID OsSwtmrStart(SWTMR_CTRL_S *swtmr) LITE_OS_SEC_TEXT VOID OsSwtmrStart(SWTMR_CTRL_S *swtmr)
{ {
UINT32 ticks; UINT32 ticks;
UINT64 currTime = OsGerCurrSchedTimeCycle(); UINT64 currTime = OsGetCurrSchedTimeCycle();
if ((swtmr->uwOverrun == 0) && ((swtmr->ucMode == LOS_SWTMR_MODE_ONCE) || if ((swtmr->uwOverrun == 0) && ((swtmr->ucMode == LOS_SWTMR_MODE_ONCE) ||
(swtmr->ucMode == LOS_SWTMR_MODE_OPP) || (swtmr->ucMode == LOS_SWTMR_MODE_OPP) ||
...@@ -264,7 +264,7 @@ LITE_OS_SEC_TEXT VOID OsSwtmrScan(VOID) ...@@ -264,7 +264,7 @@ LITE_OS_SEC_TEXT VOID OsSwtmrScan(VOID)
} }
SortLinkList *sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode); SortLinkList *sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode);
UINT64 currTime = OsGerCurrSchedTimeCycle(); UINT64 currTime = OsGetCurrSchedTimeCycle();
while (sortList->responseTime <= currTime) { while (sortList->responseTime <= currTime) {
sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode); sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode);
OsDeleteNodeSortLink(swtmrSortLink, sortList); OsDeleteNodeSortLink(swtmrSortLink, sortList);
...@@ -306,7 +306,7 @@ LITE_OS_SEC_TEXT STATIC VOID OsSwtmrStop(SWTMR_CTRL_S *swtmr) ...@@ -306,7 +306,7 @@ LITE_OS_SEC_TEXT STATIC VOID OsSwtmrStop(SWTMR_CTRL_S *swtmr)
swtmr->uwOverrun = 0; swtmr->uwOverrun = 0;
if (OS_SCHEDULER_ACTIVE) { if (OS_SCHEDULER_ACTIVE) {
OsSchedUpdateExpireTime(OsGerCurrSchedTimeCycle()); OsSchedUpdateExpireTime(OsGetCurrSchedTimeCycle());
} }
} }
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
LITE_OS_SEC_TEXT_MINOR UINT64 LOS_TickCountGet(VOID) 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) LITE_OS_SEC_TEXT_MINOR UINT32 LOS_CyclePerTickGet(VOID)
......
...@@ -50,7 +50,7 @@ typedef BOOL (*SchedScan)(VOID); ...@@ -50,7 +50,7 @@ typedef BOOL (*SchedScan)(VOID);
extern UINT64 g_sysSchedStartTime; extern UINT64 g_sysSchedStartTime;
STATIC INLINE UINT64 OsGerCurrSchedTimeCycle(VOID) STATIC INLINE UINT64 OsGetCurrSchedTimeCycle(VOID)
{ {
if (g_sysSchedStartTime == 0) { if (g_sysSchedStartTime == 0) {
return g_sysSchedStartTime; return g_sysSchedStartTime;
...@@ -62,13 +62,13 @@ STATIC INLINE UINT64 OsGerCurrSchedTimeCycle(VOID) ...@@ -62,13 +62,13 @@ STATIC INLINE UINT64 OsGerCurrSchedTimeCycle(VOID)
STATIC INLINE VOID OsSchedIrqUpdateUsedTime(VOID) STATIC INLINE VOID OsSchedIrqUpdateUsedTime(VOID)
{ {
LosTaskCB *runTask = OsCurrTaskGet(); LosTaskCB *runTask = OsCurrTaskGet();
runTask->irqUsedTime = OsGerCurrSchedTimeCycle() - runTask->irqStartTime; runTask->irqUsedTime = OsGetCurrSchedTimeCycle() - runTask->irqStartTime;
} }
STATIC INLINE VOID OsSchedIrqStartTime(VOID) STATIC INLINE VOID OsSchedIrqStartTime(VOID)
{ {
LosTaskCB *runTask = OsCurrTaskGet(); LosTaskCB *runTask = OsCurrTaskGet();
runTask->irqStartTime = OsGerCurrSchedTimeCycle(); runTask->irqStartTime = OsGetCurrSchedTimeCycle();
} }
/* /*
......
...@@ -104,7 +104,7 @@ VOID OsSchedDebugRecordData(VOID) ...@@ -104,7 +104,7 @@ VOID OsSchedDebugRecordData(VOID)
{ {
SchedTickDebug *schedDebug = &g_schedTickDebug[ArchCurrCpuid()]; SchedTickDebug *schedDebug = &g_schedTickDebug[ArchCurrCpuid()];
if (schedDebug->index < OS_SCHED_DEBUG_DATA_NUM) { if (schedDebug->index < OS_SCHED_DEBUG_DATA_NUM) {
UINT64 currTime = OsGerCurrSchedTimeCycle(); UINT64 currTime = OsGetCurrSchedTimeCycle();
schedDebug->tickResporeTime[schedDebug->index] = currTime - schedDebug->oldResporeTime; schedDebug->tickResporeTime[schedDebug->index] = currTime - schedDebug->oldResporeTime;
schedDebug->oldResporeTime = currTime; schedDebug->oldResporeTime = currTime;
schedDebug->index++; schedDebug->index++;
...@@ -487,7 +487,7 @@ STATIC INLINE BOOL OsSchedScanTimerList(VOID) ...@@ -487,7 +487,7 @@ STATIC INLINE BOOL OsSchedScanTimerList(VOID)
} }
SortLinkList *sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode); SortLinkList *sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode);
UINT64 currTime = OsGerCurrSchedTimeCycle(); UINT64 currTime = OsGetCurrSchedTimeCycle();
while (sortList->responseTime <= currTime) { while (sortList->responseTime <= currTime) {
LosTaskCB *taskCB = LOS_DL_LIST_ENTRY(sortList, LosTaskCB, sortList); LosTaskCB *taskCB = LOS_DL_LIST_ENTRY(sortList, LosTaskCB, sortList);
OsDeleteNodeSortLink(taskSortLink, &taskCB->sortList); OsDeleteNodeSortLink(taskSortLink, &taskCB->sortList);
...@@ -594,7 +594,7 @@ VOID OsSchedTaskEnQueue(LosTaskCB *taskCB) ...@@ -594,7 +594,7 @@ VOID OsSchedTaskEnQueue(LosTaskCB *taskCB)
LosProcessCB *processCB = OS_PCB_FROM_PID(taskCB->processID); LosProcessCB *processCB = OS_PCB_FROM_PID(taskCB->processID);
#ifdef LOSCFG_SCHED_DEBUG #ifdef LOSCFG_SCHED_DEBUG
if (!(taskCB->taskStatus & OS_TASK_STATUS_RUNNING)) { if (!(taskCB->taskStatus & OS_TASK_STATUS_RUNNING)) {
taskCB->startTime = OsGerCurrSchedTimeCycle(); taskCB->startTime = OsGetCurrSchedTimeCycle();
} }
#endif #endif
OsSchedEnTaskQueue(taskCB, processCB); OsSchedEnTaskQueue(taskCB, processCB);
...@@ -624,7 +624,7 @@ VOID OsSchedYield(VOID) ...@@ -624,7 +624,7 @@ VOID OsSchedYield(VOID)
runTask->timeSlice = 0; runTask->timeSlice = 0;
runTask->startTime = OsGerCurrSchedTimeCycle(); runTask->startTime = OsGetCurrSchedTimeCycle();
OsSchedTaskEnQueue(runTask); OsSchedTaskEnQueue(runTask);
OsSchedResched(); OsSchedResched();
} }
...@@ -674,7 +674,7 @@ VOID OsSchedTaskWake(LosTaskCB *resumedTask) ...@@ -674,7 +674,7 @@ VOID OsSchedTaskWake(LosTaskCB *resumedTask)
if (!(resumedTask->taskStatus & OS_TASK_STATUS_SUSPENDED)) { if (!(resumedTask->taskStatus & OS_TASK_STATUS_SUSPENDED)) {
#ifdef LOSCFG_SCHED_DEBUG #ifdef LOSCFG_SCHED_DEBUG
resumedTask->schedStat.pendTime += OsGerCurrSchedTimeCycle() - resumedTask->startTime; resumedTask->schedStat.pendTime += OsGetCurrSchedTimeCycle() - resumedTask->startTime;
resumedTask->schedStat.pendCount++; resumedTask->schedStat.pendCount++;
#endif #endif
OsSchedTaskEnQueue(resumedTask); OsSchedTaskEnQueue(resumedTask);
...@@ -867,7 +867,7 @@ VOID OsSchedStart(VOID) ...@@ -867,7 +867,7 @@ VOID OsSchedStart(VOID)
newProcess->processStatus = OS_PROCESS_RUNTASK_COUNT_ADD(newProcess->processStatus); newProcess->processStatus = OS_PROCESS_RUNTASK_COUNT_ADD(newProcess->processStatus);
OsSchedSetStartTime(HalClockGetCycles()); OsSchedSetStartTime(HalClockGetCycles());
newTask->startTime = OsGerCurrSchedTimeCycle(); newTask->startTime = OsGetCurrSchedTimeCycle();
#ifdef LOSCFG_KERNEL_SMP #ifdef LOSCFG_KERNEL_SMP
/* /*
...@@ -984,7 +984,7 @@ STATIC VOID OsSchedTaskSwicth(LosTaskCB *runTask, LosTaskCB *newTask) ...@@ -984,7 +984,7 @@ STATIC VOID OsSchedTaskSwicth(LosTaskCB *runTask, LosTaskCB *newTask)
newTask->startTime = runTask->startTime; newTask->startTime = runTask->startTime;
} else { } else {
/* The currently running task is blocked */ /* 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 */ /* The task is in a blocking state and needs to update its time slice before pend */
OsTimeSliceUpdate(runTask, newTask->startTime); OsTimeSliceUpdate(runTask, newTask->startTime);
...@@ -1015,7 +1015,7 @@ VOID OsSchedIrqEndCheckNeedSched(VOID) ...@@ -1015,7 +1015,7 @@ VOID OsSchedIrqEndCheckNeedSched(VOID)
Percpu *percpu = OsPercpuGet(); Percpu *percpu = OsPercpuGet();
LosTaskCB *runTask = OsCurrTaskGet(); LosTaskCB *runTask = OsCurrTaskGet();
OsTimeSliceUpdate(runTask, OsGerCurrSchedTimeCycle()); OsTimeSliceUpdate(runTask, OsGetCurrSchedTimeCycle());
if (runTask->timeSlice <= OS_TIME_SLICE_MIN) { if (runTask->timeSlice <= OS_TIME_SLICE_MIN) {
percpu->schedFlag = INT_PEND_RESCH; percpu->schedFlag = INT_PEND_RESCH;
} }
...@@ -1080,7 +1080,7 @@ VOID LOS_Schedule(VOID) ...@@ -1080,7 +1080,7 @@ VOID LOS_Schedule(VOID)
*/ */
SCHEDULER_LOCK(intSave); SCHEDULER_LOCK(intSave);
OsTimeSliceUpdate(runTask, OsGerCurrSchedTimeCycle()); OsTimeSliceUpdate(runTask, OsGetCurrSchedTimeCycle());
/* add run task back to ready queue */ /* add run task back to ready queue */
OsSchedTaskEnQueue(runTask); OsSchedTaskEnQueue(runTask);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册