Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Kernel Liteos A
提交
9ec208a2
K
Kernel Liteos A
项目概览
OpenHarmony
/
Kernel Liteos A
大约 1 年 前同步成功
通知
456
Star
414
Fork
55
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
4
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel Liteos A
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
4
Issue
4
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
9ec208a2
编写于
8月 06, 2021
作者:
O
openharmony_ci
提交者:
Gitee
8月 06, 2021
浏览文件
操作
浏览文件
下载
差异文件
!516 fix: OsGerCurrSchedTimeCycle 函数存在拼写错误
Merge pull request !516 from zhushengle/spell
上级
2b9c55fd
53ced1a8
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
17 addition
and
17 deletion
+17
-17
kernel/base/core/los_sortlink.c
kernel/base/core/los_sortlink.c
+1
-1
kernel/base/core/los_swtmr.c
kernel/base/core/los_swtmr.c
+3
-3
kernel/base/core/los_sys.c
kernel/base/core/los_sys.c
+1
-1
kernel/base/include/los_sched_pri.h
kernel/base/include/los_sched_pri.h
+3
-3
kernel/base/sched/sched_sq/los_sched.c
kernel/base/sched/sched_sq/los_sched.c
+9
-9
未找到文件。
kernel/base/core/los_sortlink.c
浏览文件 @
9ec208a2
...
...
@@ -231,7 +231,7 @@ UINT64 OsGetNextExpireTime(UINT64 startTime)
UINT32
OsSortLinkGetTargetExpireTime
(
const
SortLinkList
*
targetSortList
)
{
UINT64
currTimes
=
OsGe
r
CurrSchedTimeCycle
();
UINT64
currTimes
=
OsGe
t
CurrSchedTimeCycle
();
if
(
currTimes
>=
targetSortList
->
responseTime
)
{
return
0
;
}
...
...
kernel/base/core/los_swtmr.c
浏览文件 @
9ec208a2
...
...
@@ -181,7 +181,7 @@ ERROR:
LITE_OS_SEC_TEXT
VOID
OsSwtmrStart
(
SWTMR_CTRL_S
*
swtmr
)
{
UINT32
ticks
;
UINT64
currTime
=
OsGe
r
CurrSchedTimeCycle
();
UINT64
currTime
=
OsGe
t
CurrSchedTimeCycle
();
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
=
OsGe
r
CurrSchedTimeCycle
();
UINT64
currTime
=
OsGe
t
CurrSchedTimeCycle
();
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
(
OsGe
r
CurrSchedTimeCycle
());
OsSchedUpdateExpireTime
(
OsGe
t
CurrSchedTimeCycle
());
}
}
...
...
kernel/base/core/los_sys.c
浏览文件 @
9ec208a2
...
...
@@ -37,7 +37,7 @@
LITE_OS_SEC_TEXT_MINOR
UINT64
LOS_TickCountGet
(
VOID
)
{
return
OsGe
r
CurrSchedTimeCycle
()
/
OS_CYCLE_PER_TICK
;
return
OsGe
t
CurrSchedTimeCycle
()
/
OS_CYCLE_PER_TICK
;
}
LITE_OS_SEC_TEXT_MINOR
UINT32
LOS_CyclePerTickGet
(
VOID
)
...
...
kernel/base/include/los_sched_pri.h
浏览文件 @
9ec208a2
...
...
@@ -50,7 +50,7 @@ typedef BOOL (*SchedScan)(VOID);
extern
UINT64
g_sysSchedStartTime
;
STATIC
INLINE
UINT64
OsGe
r
CurrSchedTimeCycle
(
VOID
)
STATIC
INLINE
UINT64
OsGe
t
CurrSchedTimeCycle
(
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
=
OsGe
r
CurrSchedTimeCycle
()
-
runTask
->
irqStartTime
;
runTask
->
irqUsedTime
=
OsGe
t
CurrSchedTimeCycle
()
-
runTask
->
irqStartTime
;
}
STATIC
INLINE
VOID
OsSchedIrqStartTime
(
VOID
)
{
LosTaskCB
*
runTask
=
OsCurrTaskGet
();
runTask
->
irqStartTime
=
OsGe
r
CurrSchedTimeCycle
();
runTask
->
irqStartTime
=
OsGe
t
CurrSchedTimeCycle
();
}
/*
...
...
kernel/base/sched/sched_sq/los_sched.c
浏览文件 @
9ec208a2
...
...
@@ -104,7 +104,7 @@ VOID OsSchedDebugRecordData(VOID)
{
SchedTickDebug
*
schedDebug
=
&
g_schedTickDebug
[
ArchCurrCpuid
()];
if
(
schedDebug
->
index
<
OS_SCHED_DEBUG_DATA_NUM
)
{
UINT64
currTime
=
OsGe
r
CurrSchedTimeCycle
();
UINT64
currTime
=
OsGe
t
CurrSchedTimeCycle
();
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
=
OsGe
r
CurrSchedTimeCycle
();
UINT64
currTime
=
OsGe
t
CurrSchedTimeCycle
();
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
=
OsGe
r
CurrSchedTimeCycle
();
taskCB
->
startTime
=
OsGe
t
CurrSchedTimeCycle
();
}
#endif
OsSchedEnTaskQueue
(
taskCB
,
processCB
);
...
...
@@ -624,7 +624,7 @@ VOID OsSchedYield(VOID)
runTask
->
timeSlice
=
0
;
runTask
->
startTime
=
OsGe
r
CurrSchedTimeCycle
();
runTask
->
startTime
=
OsGe
t
CurrSchedTimeCycle
();
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
+=
OsGe
r
CurrSchedTimeCycle
()
-
resumedTask
->
startTime
;
resumedTask
->
schedStat
.
pendTime
+=
OsGe
t
CurrSchedTimeCycle
()
-
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
=
OsGe
r
CurrSchedTimeCycle
();
newTask
->
startTime
=
OsGe
t
CurrSchedTimeCycle
();
#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
=
OsGe
r
CurrSchedTimeCycle
();
newTask
->
startTime
=
OsGe
t
CurrSchedTimeCycle
();
/* 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
,
OsGe
r
CurrSchedTimeCycle
());
OsTimeSliceUpdate
(
runTask
,
OsGe
t
CurrSchedTimeCycle
());
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
,
OsGe
r
CurrSchedTimeCycle
());
OsTimeSliceUpdate
(
runTask
,
OsGe
t
CurrSchedTimeCycle
());
/* add run task back to ready queue */
OsSchedTaskEnQueue
(
runTask
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录