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

!125 增强L0 低功耗可扩展性 

Merge pull request !125 from zhushengle/sleep
This commit is contained in:
openharmony_ci 2021-05-17 22:08:19 +08:00 committed by Gitee
parent 5ef2efb347 43c04f6f5c
commit 3feb4f26f3
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/src/los_sched.c
View File

@ -65,7 +65,6 @@ typedef struct {
SchedSleepStart start; SchedSleepStart start;
SchedSleepStop stop; SchedSleepStop stop;
SchedSleepGetSleepTimeNs getTimeNs; SchedSleepGetSleepTimeNs getTimeNs;
BOOL ready;
} SchedSleep; } SchedSleep;
STATIC BOOL g_schedSleepFlags = FALSE; STATIC BOOL g_schedSleepFlags = FALSE;
@ -539,11 +538,12 @@ VOID OsSchedUpdateSleepTime(VOID)
UINT64 currTime, realSleepTime; UINT64 currTime, realSleepTime;
UINT32 intSave; UINT32 intSave;
if (g_schedSleepFlags == FALSE) { if ((g_schedSleepFlags == FALSE) || (g_schedSleepCB.stop == NULL)) {
return; return;
} }
intSave = LOS_IntLock(); intSave = LOS_IntLock();
if (g_schedSleepCB.getTimeNs != NULL) {
realSleepTime = g_schedSleepCB.getTimeNs(); realSleepTime = g_schedSleepCB.getTimeNs();
realSleepTime = (realSleepTime / OS_SYS_NS_PER_SECOND) * OS_SYS_CLOCK + realSleepTime = (realSleepTime / OS_SYS_NS_PER_SECOND) * OS_SYS_CLOCK +
(realSleepTime % OS_SYS_NS_PER_SECOND) * OS_SYS_CLOCK / OS_SYS_NS_PER_SECOND; (realSleepTime % OS_SYS_NS_PER_SECOND) * OS_SYS_CLOCK / OS_SYS_NS_PER_SECOND;
@ -568,8 +568,9 @@ VOID OsSchedUpdateSleepTime(VOID)
g_schedResponseID = OS_INVALID; g_schedResponseID = OS_INVALID;
g_schedResponseTime = currTime + nextResponseTime; g_schedResponseTime = currTime + nextResponseTime;
HalSysTickReload(nextResponseTime); HalSysTickReload(nextResponseTime);
g_schedSleepFlags = FALSE;
g_schedSleepTime = 0; g_schedSleepTime = 0;
}
g_schedSleepFlags = FALSE;
g_schedSleepCB.stop(); g_schedSleepCB.stop();
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
} }
@ -579,10 +580,11 @@ VOID OsSchedToSleep(VOID)
UINT32 intSave; UINT32 intSave;
UINT64 sleepTime; UINT64 sleepTime;
if (!g_schedSleepCB.ready) { if (g_schedSleepCB.start == NULL) {
return; return;
} }
if (g_schedSleepCB.getTimeNs != NULL) {
sleepTime = (g_schedSleepTime / OS_SYS_CLOCK) * OS_SYS_NS_PER_SECOND + sleepTime = (g_schedSleepTime / OS_SYS_CLOCK) * OS_SYS_NS_PER_SECOND +
(g_schedSleepTime % OS_SYS_CLOCK) * OS_SYS_NS_PER_SECOND / OS_SYS_CLOCK; (g_schedSleepTime % OS_SYS_CLOCK) * OS_SYS_NS_PER_SECOND / OS_SYS_CLOCK;
if (sleepTime == 0) { if (sleepTime == 0) {
@ -592,6 +594,9 @@ VOID OsSchedToSleep(VOID)
intSave = LOS_IntLock(); intSave = LOS_IntLock();
HalTickLock(); HalTickLock();
g_schedEntrySleepTime = OsGetCurrSchedTimeCycle(); g_schedEntrySleepTime = OsGetCurrSchedTimeCycle();
} else {
intSave = LOS_IntLock();
}
g_schedSleepCB.start(sleepTime); g_schedSleepCB.start(sleepTime);
g_schedSleepFlags = TRUE; g_schedSleepFlags = TRUE;
@ -603,7 +608,7 @@ UINT32 LOS_SchedSleepInit(SchedSleepInit init, SchedSleepStart start,
{ {
UINT32 ret; UINT32 ret;
if ((init == NULL) || (start == NULL) || (stop == NULL) || (getTime == NULL)) { if ((init == NULL) && (start == NULL) && (stop == NULL)) {
return LOS_NOK; return LOS_NOK;
} }
@ -612,12 +617,13 @@ UINT32 LOS_SchedSleepInit(SchedSleepInit init, SchedSleepStart start,
g_schedSleepCB.stop = stop; g_schedSleepCB.stop = stop;
g_schedSleepCB.getTimeNs = getTime; g_schedSleepCB.getTimeNs = getTime;
if (g_schedSleepCB.init != NULL) {
ret = g_schedSleepCB.init(); ret = g_schedSleepCB.init();
if (ret != LOS_OK) { if (ret != LOS_OK) {
return ret; return ret;
} }
}
g_schedSleepCB.ready = TRUE;
return LOS_OK; return LOS_OK;
} }
#endif #endif