Compare commits
2 Commits
master
...
weekly_202
| Author | SHA1 | Date |
|---|---|---|
openharmony_ci
|
a68260acc2 | |
haotuo
|
9770cc6de3 |
12
BUILD.gn
12
BUILD.gn
|
|
@ -202,10 +202,6 @@ config("warn_config") {
|
||||||
]
|
]
|
||||||
if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
|
if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
|
||||||
cflags += [ "-Wno-address-of-packed-member" ]
|
cflags += [ "-Wno-address-of-packed-member" ]
|
||||||
cflags += [
|
|
||||||
"-Wno-unused-but-set-variable",
|
|
||||||
"-Wno-strict-prototypes",
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
asmflags = cflags
|
asmflags = cflags
|
||||||
}
|
}
|
||||||
|
|
@ -299,7 +295,7 @@ config("public") {
|
||||||
|
|
||||||
configs += [
|
configs += [
|
||||||
"$HDFTOPDIR:public",
|
"$HDFTOPDIR:public",
|
||||||
"$DRIVERS_LITEOS_DIR:public",
|
"//drivers/liteos:public",
|
||||||
]
|
]
|
||||||
|
|
||||||
if (HAVE_DEVICE_SDK) {
|
if (HAVE_DEVICE_SDK) {
|
||||||
|
|
@ -324,8 +320,8 @@ group("modules") {
|
||||||
]
|
]
|
||||||
|
|
||||||
deps += [
|
deps += [
|
||||||
"$DRIVERS_LITEOS_DIR",
|
"//drivers/liteos",
|
||||||
"$HDFTOPDIR",
|
HDFTOPDIR,
|
||||||
]
|
]
|
||||||
|
|
||||||
if (HAVE_DEVICE_SDK) {
|
if (HAVE_DEVICE_SDK) {
|
||||||
|
|
@ -351,7 +347,7 @@ group("liteos_a") {
|
||||||
deps += [
|
deps += [
|
||||||
":apps",
|
":apps",
|
||||||
":tests",
|
":tests",
|
||||||
"$THIRDPARTY_MUSL_DIR/scripts/build_lite:strip",
|
"//third_party/musl/scripts/build_lite:strip",
|
||||||
]
|
]
|
||||||
if (liteos_skip_make == false) {
|
if (liteos_skip_make == false) {
|
||||||
deps += [ ":make" ]
|
deps += [ ":make" ]
|
||||||
|
|
|
||||||
256
CHANGELOG.md
256
CHANGELOG.md
|
|
@ -8,64 +8,64 @@
|
||||||
* A核代码静态告警定期清理 ([9ba725c](https://gitee.com/openharmony/kernel_liteos_a/commits/9ba725c3d486dd28fe9b2489b0f95a65354d7d86)), closes [#I4I0O8](https://gitee.com/openharmony/kernel_liteos_a/issues/I4I0O8)
|
* A核代码静态告警定期清理 ([9ba725c](https://gitee.com/openharmony/kernel_liteos_a/commits/9ba725c3d486dd28fe9b2489b0f95a65354d7d86)), closes [#I4I0O8](https://gitee.com/openharmony/kernel_liteos_a/issues/I4I0O8)
|
||||||
* change default permission of procfs to 0550 ([a776c04](https://gitee.com/openharmony/kernel_liteos_a/commits/a776c04a3da414f73ef7136a543c029cc6dd75be)), closes [#I4NY49](https://gitee.com/openharmony/kernel_liteos_a/issues/I4NY49)
|
* change default permission of procfs to 0550 ([a776c04](https://gitee.com/openharmony/kernel_liteos_a/commits/a776c04a3da414f73ef7136a543c029cc6dd75be)), closes [#I4NY49](https://gitee.com/openharmony/kernel_liteos_a/issues/I4NY49)
|
||||||
* change the execFile field in TCB to execVnode ([e4a0662](https://gitee.com/openharmony/kernel_liteos_a/commits/e4a06623ceb49b5bead60d45c0534db88b9c666f)), closes [#I4CLL9](https://gitee.com/openharmony/kernel_liteos_a/issues/I4CLL9)
|
* change the execFile field in TCB to execVnode ([e4a0662](https://gitee.com/openharmony/kernel_liteos_a/commits/e4a06623ceb49b5bead60d45c0534db88b9c666f)), closes [#I4CLL9](https://gitee.com/openharmony/kernel_liteos_a/issues/I4CLL9)
|
||||||
* close file when process interpretor failed ([a375bf5](https://gitee.com/openharmony/kernel_liteos_a/commits/a375bf5668a5e86e082d0e124b538e423023a259)), closes [#I4ATQX](https://gitee.com/openharmony/kernel_liteos_a/issues/I4ATQX)
|
* close file when process interpretor failed ([a375bf5](https://gitee.com/openharmony/kernel_liteos_a/commits/a375bf5668a5e86e082d0e124b538e423023a259)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* codex 清理 ([9ab3e35](https://gitee.com/openharmony/kernel_liteos_a/commits/9ab3e351d38cdae2ec083048a50a253bc2a3b604)), closes [#I4BL3S](https://gitee.com/openharmony/kernel_liteos_a/issues/I4BL3S)
|
* codex 清理 ([9ab3e35](https://gitee.com/openharmony/kernel_liteos_a/commits/9ab3e351d38cdae2ec083048a50a253bc2a3b604)), closes [#I4BL3](https://gitee.com/openharmony/kernel_liteos_a/issues/I4BL3)
|
||||||
* dyload open close failed ([5e87d8c](https://gitee.com/openharmony/kernel_liteos_a/commits/5e87d8c183471166294e2caa041ab4da8570c6a1)), closes [#I452Z7](https://gitee.com/openharmony/kernel_liteos_a/issues/I452Z7)
|
* dyload open close failed ([5e87d8c](https://gitee.com/openharmony/kernel_liteos_a/commits/5e87d8c183471166294e2caa041ab4da8570c6a1)), closes [#I452Z7](https://gitee.com/openharmony/kernel_liteos_a/issues/I452Z7)
|
||||||
* fix ppoll ([a55f68f](https://gitee.com/openharmony/kernel_liteos_a/commits/a55f68f957e9f8ad74bd9e0c1b3d27775e0f8c75))
|
* fix ppoll ([a55f68f](https://gitee.com/openharmony/kernel_liteos_a/commits/a55f68f957e9f8ad74bd9e0c1b3d27775e0f8c75))
|
||||||
* fix some function declarations ([63fd8bc](https://gitee.com/openharmony/kernel_liteos_a/commits/63fd8bc39b21fffb6990f74e879eefecafad6c88))
|
* fix some function declarations ([63fd8bc](https://gitee.com/openharmony/kernel_liteos_a/commits/63fd8bc39b21fffb6990f74e879eefecafad6c88))
|
||||||
* implicit declaration of function 'syscall' in apps/shell ([bd0c083](https://gitee.com/openharmony/kernel_liteos_a/commits/bd0c0835fc58ed5f941dbbc9adfac74253eeb874))
|
* implicit declaration of function 'syscall' in apps/shell ([bd0c083](https://gitee.com/openharmony/kernel_liteos_a/commits/bd0c0835fc58ed5f941dbbc9adfac74253eeb874))
|
||||||
* LOS_Panic和魔法键功能中的使用PRINTK打印，依赖任务调度，特殊情况下存在打印不出来的问题 ([53addea](https://gitee.com/openharmony/kernel_liteos_a/commits/53addea304de09e0df457b690403ac652bbcea72)), closes [#I4NOC7](https://gitee.com/openharmony/kernel_liteos_a/issues/I4NOC7)
|
* LOS_Panic和魔法键功能中的使用PRINTK打印，依赖任务调度，特殊情况下存在打印不出来的问题 ([53addea](https://gitee.com/openharmony/kernel_liteos_a/commits/53addea304de09e0df457b690403ac652bbcea72)), closes [#I4NOC7](https://gitee.com/openharmony/kernel_liteos_a/issues/I4NOC7)
|
||||||
* los_stat_pri.h中缺少依赖的头文件 ([2cd03c5](https://gitee.com/openharmony/kernel_liteos_a/commits/2cd03c55b7a614c648adc965ebfe494d491fe20f)), closes [#I4KEZ1](https://gitee.com/openharmony/kernel_liteos_a/issues/I4KEZ1)
|
* los_stat_pri.h中缺少依赖的头文件 ([2cd03c5](https://gitee.com/openharmony/kernel_liteos_a/commits/2cd03c55b7a614c648adc965ebfe494d491fe20f)), closes [#I4KEZ1](https://gitee.com/openharmony/kernel_liteos_a/issues/I4KEZ1)
|
||||||
* los_trace.h接口注释错误修正 ([6d24961](https://gitee.com/openharmony/kernel_liteos_a/commits/6d249618aecc216388f9b1a2b48fe0ac6dd19ff2)), closes [#I4CYPZ](https://gitee.com/openharmony/kernel_liteos_a/issues/I4CYPZ)
|
* los_trace.h接口注释错误修正 ([6d24961](https://gitee.com/openharmony/kernel_liteos_a/commits/6d249618aecc216388f9b1a2b48fe0ac6dd19ff2)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* MMU竞态问题修复 ([748e0d8](https://gitee.com/openharmony/kernel_liteos_a/commits/748e0d8ffb6ee9c8757ed056f575e3abc6c10702)), closes [#I2WARC](https://gitee.com/openharmony/kernel_liteos_a/issues/I2WARC)
|
* MMU竞态问题修复 ([748e0d8](https://gitee.com/openharmony/kernel_liteos_a/commits/748e0d8ffb6ee9c8757ed056f575e3abc6c10702)), closes [#I2](https://gitee.com/openharmony/kernel_liteos_a/issues/I2)
|
||||||
* **mtd:** 去除mtd对hisilicon驱动的依赖 ([f7d010d](https://gitee.com/openharmony/kernel_liteos_a/commits/f7d010dfa4cb825096267528e131a9e2735d7505)), closes [#I49FKL](https://gitee.com/openharmony/kernel_liteos_a/issues/I49FKL)
|
* **mtd:** 去除mtd对hisilicon驱动的依赖 ([f7d010d](https://gitee.com/openharmony/kernel_liteos_a/commits/f7d010dfa4cb825096267528e131a9e2735d7505)), closes [#I49](https://gitee.com/openharmony/kernel_liteos_a/issues/I49)
|
||||||
* OsFutexWaitParamCheck函数中absTime为0时，直接返回，不需要打印 ([3f71be7](https://gitee.com/openharmony/kernel_liteos_a/commits/3f71be75355f11037d9de80cc4d7da0f01905003)), closes [#I4D67E](https://gitee.com/openharmony/kernel_liteos_a/issues/I4D67E)
|
* OsFutexWaitParamCheck函数中absTime为0时，直接返回，不需要打印 ([3f71be7](https://gitee.com/openharmony/kernel_liteos_a/commits/3f71be75355f11037d9de80cc4d7da0f01905003)), closes [#I4D67](https://gitee.com/openharmony/kernel_liteos_a/issues/I4D67)
|
||||||
* OsLockDepCheckIn异常处理中存在g_lockdepAvailable锁嵌套调用, ([bf030b6](https://gitee.com/openharmony/kernel_liteos_a/commits/bf030b6bb5843151a5b8b8736246a1376a5fb9d0)), closes [#I457ZZ](https://gitee.com/openharmony/kernel_liteos_a/issues/I457ZZ)
|
* OsLockDepCheckIn异常处理中存在g_lockdepAvailable锁嵌套调用, ([bf030b6](https://gitee.com/openharmony/kernel_liteos_a/commits/bf030b6bb5843151a5b8b8736246a1376a5fb9d0)), closes [#I457](https://gitee.com/openharmony/kernel_liteos_a/issues/I457)
|
||||||
* pr模板补充说明 ([e3cd485](https://gitee.com/openharmony/kernel_liteos_a/commits/e3cd485db528490a16a8932d734faab263b44bc9))
|
* pr模板补充说明 ([e3cd485](https://gitee.com/openharmony/kernel_liteos_a/commits/e3cd485db528490a16a8932d734faab263b44bc9))
|
||||||
* same file mode for procfs files ([c79bcd0](https://gitee.com/openharmony/kernel_liteos_a/commits/c79bcd028e1be34b45cba000077230fa2ef95e68)), closes [#I4ACTC](https://gitee.com/openharmony/kernel_liteos_a/issues/I4ACTC)
|
* same file mode for procfs files ([c79bcd0](https://gitee.com/openharmony/kernel_liteos_a/commits/c79bcd028e1be34b45cba000077230fa2ef95e68)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* shell支持exit退出，完善帮助信息，特殊处理不可见字符 ([cc6e112](https://gitee.com/openharmony/kernel_liteos_a/commits/cc6e11281e63b6bdc9be8e5d3c39f1258eb2ceaa))
|
* shell支持exit退出，完善帮助信息，特殊处理不可见字符 ([cc6e112](https://gitee.com/openharmony/kernel_liteos_a/commits/cc6e11281e63b6bdc9be8e5d3c39f1258eb2ceaa))
|
||||||
* smp初始化中副核冗余的启动框架调用 ([5ce70a5](https://gitee.com/openharmony/kernel_liteos_a/commits/5ce70a50c3733b6ec8cc4b444837e366ec837f69)), closes [#I4F8A5](https://gitee.com/openharmony/kernel_liteos_a/issues/I4F8A5)
|
* smp初始化中副核冗余的启动框架调用 ([5ce70a5](https://gitee.com/openharmony/kernel_liteos_a/commits/5ce70a50c3733b6ec8cc4b444837e366ec837f69)), closes [#I4F8A5](https://gitee.com/openharmony/kernel_liteos_a/issues/I4F8A5)
|
||||||
* solve SIGCHLD ignored in sigsuspend() ([5a80d4e](https://gitee.com/openharmony/kernel_liteos_a/commits/5a80d4e1a34c94204a0bb01443bf25a4fdb12750)), closes [#I47CKK](https://gitee.com/openharmony/kernel_liteos_a/issues/I47CKK)
|
* solve SIGCHLD ignored in sigsuspend() ([5a80d4e](https://gitee.com/openharmony/kernel_liteos_a/commits/5a80d4e1a34c94204a0bb01443bf25a4fdb12750)), closes [#I47](https://gitee.com/openharmony/kernel_liteos_a/issues/I47)
|
||||||
* syscall review bugfix ([214f44e](https://gitee.com/openharmony/kernel_liteos_a/commits/214f44e935277c29d347c50b553a31ea7df36448)), closes [#149](https://gitee.com/openharmony/kernel_liteos_a/issues/149)
|
* syscall review bugfix ([214f44e](https://gitee.com/openharmony/kernel_liteos_a/commits/214f44e935277c29d347c50b553a31ea7df36448)), closes [#149](https://gitee.com/openharmony/kernel_liteos_a/issues/149)
|
||||||
* **test:** misc09用例因依赖hosts文件而失败 ([f2f5c5f](https://gitee.com/openharmony/kernel_liteos_a/commits/f2f5c5fdc3202610de173e7046adab4df5e59142)), closes [#I48IZ0](https://gitee.com/openharmony/kernel_liteos_a/issues/I48IZ0)
|
* **test:** misc09用例因依赖hosts文件而失败 ([f2f5c5f](https://gitee.com/openharmony/kernel_liteos_a/commits/f2f5c5fdc3202610de173e7046adab4df5e59142)), closes [re#I48IZ0](https://gitee.com/re/issues/I48IZ0)
|
||||||
* **test:** 修复sys部分用例因依赖passwd、group文件而失败 ([614cdcc](https://gitee.com/openharmony/kernel_liteos_a/commits/614cdccf91bd2d220c4c76418b53400ce714c6cb)), closes [#I48IUC](https://gitee.com/openharmony/kernel_liteos_a/issues/I48IUC)
|
* **test:** 修复sys部分用例因依赖passwd、group文件而失败 ([614cdcc](https://gitee.com/openharmony/kernel_liteos_a/commits/614cdccf91bd2d220c4c76418b53400ce714c6cb)), closes [re#I48](https://gitee.com/re/issues/I48)
|
||||||
* 中断中调用PRINTK概率卡死，导致系统不能正常响应中断 ([9726ba1](https://gitee.com/openharmony/kernel_liteos_a/commits/9726ba11a79f3d2d1e616e12ef0bb44e4fc5cd20)), closes [#I4C9GC](https://gitee.com/openharmony/kernel_liteos_a/issues/I4C9GC)
|
* 中断中调用PRINTK概率卡死，导致系统不能正常响应中断 ([9726ba1](https://gitee.com/openharmony/kernel_liteos_a/commits/9726ba11a79f3d2d1e616e12ef0bb44e4fc5cd20)), closes [#I4C9](https://gitee.com/openharmony/kernel_liteos_a/issues/I4C9)
|
||||||
* 临终遗言重定向内容缺失task相关信息，对应的shell命令中申请的内存需要cacheline对齐 ([48ca854](https://gitee.com/openharmony/kernel_liteos_a/commits/48ca854bf07f8dcda9657f950601043a485a1b33)), closes [#I482S5](https://gitee.com/openharmony/kernel_liteos_a/issues/I482S5)
|
* 临终遗言重定向内容缺失task相关信息，对应的shell命令中申请的内存需要cacheline对齐 ([48ca854](https://gitee.com/openharmony/kernel_liteos_a/commits/48ca854bf07f8dcda9657f950601043a485a1b33)), closes [#I482S5](https://gitee.com/openharmony/kernel_liteos_a/issues/I482S5)
|
||||||
* 优化liteipc任务状态，删除功能重复字段 ([5004ef4](https://gitee.com/openharmony/kernel_liteos_a/commits/5004ef4d87b54fb6d7f748ca8212ae155bcefac5)), closes [#I4FVHK](https://gitee.com/openharmony/kernel_liteos_a/issues/I4FVHK)
|
* 优化liteipc任务状态，删除功能重复字段 ([5004ef4](https://gitee.com/openharmony/kernel_liteos_a/commits/5004ef4d87b54fb6d7f748ca8212ae155bcefac5)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 优化trace buffer初始化，删除swtmr 桩中的无效参数 ([b551270](https://gitee.com/openharmony/kernel_liteos_a/commits/b551270ef50cb206360e2eee3dd20ace5cecccb7)), closes [#I4DQ1X](https://gitee.com/openharmony/kernel_liteos_a/issues/I4DQ1X)
|
* 优化trace buffer初始化，删除swtmr 桩中的无效参数 ([b551270](https://gitee.com/openharmony/kernel_liteos_a/commits/b551270ef50cb206360e2eee3dd20ace5cecccb7)), closes [#I4DQ1](https://gitee.com/openharmony/kernel_liteos_a/issues/I4DQ1)
|
||||||
* 修复 virpart.c 不适配的格式化打印问题 ([de29140](https://gitee.com/openharmony/kernel_liteos_a/commits/de29140edf2567f4847876cb1ed5e0b6857420f3)), closes [#I4PEVP](https://gitee.com/openharmony/kernel_liteos_a/issues/I4PEVP)
|
* 修复 virpart.c 不适配的格式化打印问题 ([de29140](https://gitee.com/openharmony/kernel_liteos_a/commits/de29140edf2567f4847876cb1ed5e0b6857420f3)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 修复A核文档失效的问题 ([456d255](https://gitee.com/openharmony/kernel_liteos_a/commits/456d255a81c2031be8ebecc2bf897af80c3d3c7a)), closes [#I4U7TF](https://gitee.com/openharmony/kernel_liteos_a/issues/I4U7TF)
|
* 修复A核文档失效的问题 ([456d255](https://gitee.com/openharmony/kernel_liteos_a/commits/456d255a81c2031be8ebecc2bf897af80c3d3c7a)), closes [#I4U7](https://gitee.com/openharmony/kernel_liteos_a/issues/I4U7)
|
||||||
* 修复A核测试用例失败的问题 ([59329ce](https://gitee.com/openharmony/kernel_liteos_a/commits/59329ce7c6b6a00084df427748e6283287a773c0)), closes [#I4SQDR](https://gitee.com/openharmony/kernel_liteos_a/issues/I4SQDR)
|
* 修复A核测试用例失败的问题 ([59329ce](https://gitee.com/openharmony/kernel_liteos_a/commits/59329ce7c6b6a00084df427748e6283287a773c0)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 修复A核测试用例失败的问题 ([be68dc8](https://gitee.com/openharmony/kernel_liteos_a/commits/be68dc8bcaf8d965039ae1d792775f00a08adfac)), closes [#I4SQDP](https://gitee.com/openharmony/kernel_liteos_a/issues/I4SQDP)
|
* 修复A核测试用例失败的问题 ([be68dc8](https://gitee.com/openharmony/kernel_liteos_a/commits/be68dc8bcaf8d965039ae1d792775f00a08adfac)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 修复dispatch单词拼写错误。 ([9b07aec](https://gitee.com/openharmony/kernel_liteos_a/commits/9b07aece2dfa3494cf35e8b388410341508d6224)), closes [#I4BLE8](https://gitee.com/openharmony/kernel_liteos_a/issues/I4BLE8)
|
* 修复dispatch单词拼写错误。 ([9b07aec](https://gitee.com/openharmony/kernel_liteos_a/commits/9b07aece2dfa3494cf35e8b388410341508d6224)), closes [#I4BLE8](https://gitee.com/openharmony/kernel_liteos_a/issues/I4BLE8)
|
||||||
* 修复futime提示错误22的BUG ([f2861dd](https://gitee.com/openharmony/kernel_liteos_a/commits/f2861ddfb424af7b99c278273601ce0fab1f37e6))
|
* 修复futime提示错误22的BUG ([f2861dd](https://gitee.com/openharmony/kernel_liteos_a/commits/f2861ddfb424af7b99c278273601ce0fab1f37e6))
|
||||||
* 修复jffs2适配层错误释放锁的BUG ([011a55f](https://gitee.com/openharmony/kernel_liteos_a/commits/011a55ff21d95f969abac60bcff96f4c4d7a326d)), closes [#I4FH9M](https://gitee.com/openharmony/kernel_liteos_a/issues/I4FH9M)
|
* 修复jffs2适配层错误释放锁的BUG ([011a55f](https://gitee.com/openharmony/kernel_liteos_a/commits/011a55ff21d95f969abac60bcff96f4c4d7a326d)), closes [#I4FH9](https://gitee.com/openharmony/kernel_liteos_a/issues/I4FH9)
|
||||||
* 修复los_vm_scan.c中内部函数OsInactiveListIsLow冗余代码 ([bc32a1e](https://gitee.com/openharmony/kernel_liteos_a/commits/bc32a1ec0fa5d19c6d2672bcf4a01de5e1be3afb)), closes [#I4HKFF](https://gitee.com/openharmony/kernel_liteos_a/issues/I4HKFF)
|
* 修复los_vm_scan.c中内部函数OsInactiveListIsLow冗余代码 ([bc32a1e](https://gitee.com/openharmony/kernel_liteos_a/commits/bc32a1ec0fa5d19c6d2672bcf4a01de5e1be3afb)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 修复LOSCFG_FS_FAT_CACHE宏关闭后编译失败的BUG ([63e71fe](https://gitee.com/openharmony/kernel_liteos_a/commits/63e71feca05a8d46a49822c713258738740f0712)), closes [#I3T3N0](https://gitee.com/openharmony/kernel_liteos_a/issues/I3T3N0)
|
* 修复LOSCFG_FS_FAT_CACHE宏关闭后编译失败的BUG ([63e71fe](https://gitee.com/openharmony/kernel_liteos_a/commits/63e71feca05a8d46a49822c713258738740f0712)), closes [#I3T3N0](https://gitee.com/openharmony/kernel_liteos_a/issues/I3T3N0)
|
||||||
* 修复OsVmPhysFreeListAdd和OsVmPhysFreeListAddUnsafe函数内容重复 ([6827bd2](https://gitee.com/openharmony/kernel_liteos_a/commits/6827bd2a22b78aa05e20d6460412fc7b2d738929)), closes [#I4FL95](https://gitee.com/openharmony/kernel_liteos_a/issues/I4FL95)
|
* 修复OsVmPhysFreeListAdd和OsVmPhysFreeListAddUnsafe函数内容重复 ([6827bd2](https://gitee.com/openharmony/kernel_liteos_a/commits/6827bd2a22b78aa05e20d6460412fc7b2d738929)), closes [#I4FL95](https://gitee.com/openharmony/kernel_liteos_a/issues/I4FL95)
|
||||||
* 修复PR520缺陷 ([4033891](https://gitee.com/openharmony/kernel_liteos_a/commits/40338918d9132399ee0494d331930a05b7a13c67)), closes [#I4DEG5](https://gitee.com/openharmony/kernel_liteos_a/issues/I4DEG5)
|
* 修复PR520缺陷 ([4033891](https://gitee.com/openharmony/kernel_liteos_a/commits/40338918d9132399ee0494d331930a05b7a13c67)), closes [re#I4DEG5](https://gitee.com/re/issues/I4DEG5)
|
||||||
* 修复shcmd.h需要用宏包起来的问题 ([6c4e4b1](https://gitee.com/openharmony/kernel_liteos_a/commits/6c4e4b16abe9c68fea43d40b2d39b4f0ed4bfc9c)), closes [#I4N50W](https://gitee.com/openharmony/kernel_liteos_a/issues/I4N50W)
|
* 修复shcmd.h需要用宏包起来的问题 ([6c4e4b1](https://gitee.com/openharmony/kernel_liteos_a/commits/6c4e4b16abe9c68fea43d40b2d39b4f0ed4bfc9c)), closes [#I4N50](https://gitee.com/openharmony/kernel_liteos_a/issues/I4N50)
|
||||||
* 修复xts权限用例压测异常问题 ([b0d31cb](https://gitee.com/openharmony/kernel_liteos_a/commits/b0d31cb43f5a8d1c3da574b2b957e3b0e98b3067)), closes [#I3ZJ1D](https://gitee.com/openharmony/kernel_liteos_a/issues/I3ZJ1D)
|
* 修复xts权限用例压测异常问题 ([b0d31cb](https://gitee.com/openharmony/kernel_liteos_a/commits/b0d31cb43f5a8d1c3da574b2b957e3b0e98b3067)), closes [#I3ZJ1](https://gitee.com/openharmony/kernel_liteos_a/issues/I3ZJ1)
|
||||||
* 修复硬随机不可用时，地址随机化不可用问题 ([665c152](https://gitee.com/openharmony/kernel_liteos_a/commits/665c152c27bb86395ddd0395279255f6cdaf7255)), closes [#I4D4TK](https://gitee.com/openharmony/kernel_liteos_a/issues/I4D4TK)
|
* 修复硬随机不可用时，地址随机化不可用问题 ([665c152](https://gitee.com/openharmony/kernel_liteos_a/commits/665c152c27bb86395ddd0395279255f6cdaf7255)), closes [#I4D4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4D4)
|
||||||
* 修复进程用例导致门禁概率失败 ([1ed28b4](https://gitee.com/openharmony/kernel_liteos_a/commits/1ed28b4c80cfd222be08b0c2e71e6287e52bb276)), closes [#I4FO0N](https://gitee.com/openharmony/kernel_liteos_a/issues/I4FO0N)
|
* 修复进程用例导致门禁概率失败 ([1ed28b4](https://gitee.com/openharmony/kernel_liteos_a/commits/1ed28b4c80cfd222be08b0c2e71e6287e52bb276)), closes [#I4FO0](https://gitee.com/openharmony/kernel_liteos_a/issues/I4FO0)
|
||||||
* 修复进程线程不稳定用例 ([f6ac03d](https://gitee.com/openharmony/kernel_liteos_a/commits/f6ac03d3e3c56236adc5734d4c059f1fbcc9e0c1)), closes [#I4F1XL](https://gitee.com/openharmony/kernel_liteos_a/issues/I4F1XL)
|
* 修复进程线程不稳定用例 ([f6ac03d](https://gitee.com/openharmony/kernel_liteos_a/commits/f6ac03d3e3c56236adc5734d4c059f1fbcc9e0c1)), closes [#I4F1](https://gitee.com/openharmony/kernel_liteos_a/issues/I4F1)
|
||||||
* 修复重复执行内存用例导致系统卡死问题 ([6c2b163](https://gitee.com/openharmony/kernel_liteos_a/commits/6c2b163c7d7c696ef89b17a0275f3cddb3d7cefb)), closes [#I4F7PO](https://gitee.com/openharmony/kernel_liteos_a/issues/I4F7PO)
|
* 修复重复执行内存用例导致系统卡死问题 ([6c2b163](https://gitee.com/openharmony/kernel_liteos_a/commits/6c2b163c7d7c696ef89b17a0275f3cddb3d7cefb)), closes [#I4F7](https://gitee.com/openharmony/kernel_liteos_a/issues/I4F7)
|
||||||
* 修改MMU模块的注释错误 ([1a8e22d](https://gitee.com/openharmony/kernel_liteos_a/commits/1a8e22dcf15944153e013d004fd7bbf24557a8c7)), closes [#I4KMMJ](https://gitee.com/openharmony/kernel_liteos_a/issues/I4KMMJ)
|
* 修改MMU模块的注释错误 ([1a8e22d](https://gitee.com/openharmony/kernel_liteos_a/commits/1a8e22dcf15944153e013d004fd7bbf24557a8c7)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 共享内存问题修复 ([9fdb80f](https://gitee.com/openharmony/kernel_liteos_a/commits/9fdb80f85f92d0167a0456455a94fc6f679797ce)), closes [#I47X2Z](https://gitee.com/openharmony/kernel_liteos_a/issues/I47X2Z)
|
* 共享内存问题修复 ([9fdb80f](https://gitee.com/openharmony/kernel_liteos_a/commits/9fdb80f85f92d0167a0456455a94fc6f679797ce)), closes [#I47X2](https://gitee.com/openharmony/kernel_liteos_a/issues/I47X2)
|
||||||
* 内核ERR打印，无进程和线程信息，不方便问题定位。 ([cb423f8](https://gitee.com/openharmony/kernel_liteos_a/commits/cb423f845462b8cc474c3cba261dadf3943a08ef)), closes [#I4DAKM](https://gitee.com/openharmony/kernel_liteos_a/issues/I4DAKM)
|
* 内核ERR打印，无进程和线程信息，不方便问题定位。 ([cb423f8](https://gitee.com/openharmony/kernel_liteos_a/commits/cb423f845462b8cc474c3cba261dadf3943a08ef)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 内核ERR级别及以上的打印输出当前进程和线程名 ([540b201](https://gitee.com/openharmony/kernel_liteos_a/commits/540b2017c5460e300365d2039a08abd5945cec6b))
|
* 内核ERR级别及以上的打印输出当前进程和线程名 ([540b201](https://gitee.com/openharmony/kernel_liteos_a/commits/540b2017c5460e300365d2039a08abd5945cec6b))
|
||||||
* 内源检视测试用例问题修复 ([a6ac759](https://gitee.com/openharmony/kernel_liteos_a/commits/a6ac7597f85043ba6de3a1b395ca676d85c65ea7))
|
* 内源检视测试用例问题修复 ([a6ac759](https://gitee.com/openharmony/kernel_liteos_a/commits/a6ac7597f85043ba6de3a1b395ca676d85c65ea7))
|
||||||
* 删除冗余的头文件 ([8e614bb](https://gitee.com/openharmony/kernel_liteos_a/commits/8e614bb1616b75bc89eee7ad7da49b7a9c285b47)), closes [#I4KN63](https://gitee.com/openharmony/kernel_liteos_a/issues/I4KN63)
|
* 删除冗余的头文件 ([8e614bb](https://gitee.com/openharmony/kernel_liteos_a/commits/8e614bb1616b75bc89eee7ad7da49b7a9c285b47)), closes [#I4KN63](https://gitee.com/openharmony/kernel_liteos_a/issues/I4KN63)
|
||||||
* 增加pselect SYSCALL函数及测试用例 ([f601c16](https://gitee.com/openharmony/kernel_liteos_a/commits/f601c16b9e67d531dda51fc18389a53db4360b7b)), closes [#I45SXU](https://gitee.com/openharmony/kernel_liteos_a/issues/I45SXU)
|
* 增加pselect SYSCALL函数及测试用例 ([f601c16](https://gitee.com/openharmony/kernel_liteos_a/commits/f601c16b9e67d531dda51fc18389a53db4360b7b)), closes [#I45](https://gitee.com/openharmony/kernel_liteos_a/issues/I45)
|
||||||
* 增加内核epoll系统调用 ([2251b8a](https://gitee.com/openharmony/kernel_liteos_a/commits/2251b8a2d1f649422dd67f8551b085a7e0c63ec7)), closes [#I4FXPT](https://gitee.com/openharmony/kernel_liteos_a/issues/I4FXPT)
|
* 增加内核epoll系统调用 ([2251b8a](https://gitee.com/openharmony/kernel_liteos_a/commits/2251b8a2d1f649422dd67f8551b085a7e0c63ec7)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 实现了musl库net模块中的一些函数接口和相应的测试用例 ([3d00a7d](https://gitee.com/openharmony/kernel_liteos_a/commits/3d00a7d23a96f29c138cfc1672825b90b9e0c05e)), closes [#I4JQI1](https://gitee.com/openharmony/third_party_musl/issues/I4JQI1)
|
* 实现了musl库net模块中的一些函数接口和相应的测试用例 ([3d00a7d](https://gitee.com/openharmony/kernel_liteos_a/commits/3d00a7d23a96f29c138cfc1672825b90b9e0c05e)), closes [#I4JQI1](https://gitee.com/openharmony/kernel_liteos_a/issues/I4JQI1)
|
||||||
* 添加进程线程冒烟用例 ([2be5968](https://gitee.com/openharmony/kernel_liteos_a/commits/2be59680f2fb0801b43522cd38cc387c8ff38766)), closes [#I4EOGA](https://gitee.com/openharmony/kernel_liteos_a/issues/I4EOGA)
|
* 添加进程线程冒烟用例 ([2be5968](https://gitee.com/openharmony/kernel_liteos_a/commits/2be59680f2fb0801b43522cd38cc387c8ff38766)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 用户态进程主线程退出时，其他子线程刚好进入异常处理流程会导致系统卡死 ([d955790](https://gitee.com/openharmony/kernel_liteos_a/commits/d955790a44a679421798ec1ac2900b4d75dd75a4)), closes [#I4KGBT](https://gitee.com/openharmony/kernel_liteos_a/issues/I4KGBT)
|
* 用户态进程主线程退出时，其他子线程刚好进入异常处理流程会导致系统卡死 ([d955790](https://gitee.com/openharmony/kernel_liteos_a/commits/d955790a44a679421798ec1ac2900b4d75dd75a4)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 编码规范修改 ([d161a0b](https://gitee.com/openharmony/kernel_liteos_a/commits/d161a0b03de046c05fff45a2b625631b4e45a347))
|
* 编码规范修改 ([d161a0b](https://gitee.com/openharmony/kernel_liteos_a/commits/d161a0b03de046c05fff45a2b625631b4e45a347))
|
||||||
* 编码规范问题修复 ([f60bc94](https://gitee.com/openharmony/kernel_liteos_a/commits/f60bc94cf231bc615ff6603ca0393b8fe33a8c47))
|
* 编码规范问题修复 ([f60bc94](https://gitee.com/openharmony/kernel_liteos_a/commits/f60bc94cf231bc615ff6603ca0393b8fe33a8c47))
|
||||||
* 编译框架在做编译入口的统一 ([bdb9864](https://gitee.com/openharmony/kernel_liteos_a/commits/bdb9864436a6f128a4c3891bbd63e3c60352689f)), closes [#I4KRQN](https://gitee.com/openharmony/kernel_liteos_a/issues/I4KRQN)
|
* 编译框架在做编译入口的统一 ([bdb9864](https://gitee.com/openharmony/kernel_liteos_a/commits/bdb9864436a6f128a4c3891bbd63e3c60352689f)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 解决dmesg -s参数double lock问题 ([e151256](https://gitee.com/openharmony/kernel_liteos_a/commits/e1512566e322eb1fbc8f5d5997f9bfcd022feac7)), closes [#I4HIJK](https://gitee.com/openharmony/kernel_liteos_a/issues/I4HIJK)
|
* 解决dmesg -s参数double lock问题 ([e151256](https://gitee.com/openharmony/kernel_liteos_a/commits/e1512566e322eb1fbc8f5d5997f9bfcd022feac7)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 进程退出前自己回收vmspace中的所有region ([298ccea](https://gitee.com/openharmony/kernel_liteos_a/commits/298ccea3fedaccc651b38973f0455fa1ce12e516)), closes [#I4CKQC](https://gitee.com/openharmony/kernel_liteos_a/issues/I4CKQC)
|
* 进程退出前自己回收vmspace中的所有region ([298ccea](https://gitee.com/openharmony/kernel_liteos_a/commits/298ccea3fedaccc651b38973f0455fa1ce12e516)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 通过g_uart_fputc_en关闭打印后，shell进程不能正常启动 ([d21b05c](https://gitee.com/openharmony/kernel_liteos_a/commits/d21b05c0f69877130366ad37b852a0f30c11809d)), closes [#I4CTY2](https://gitee.com/openharmony/kernel_liteos_a/issues/I4CTY2)
|
* 通过g_uart_fputc_en关闭打印后，shell进程不能正常启动 ([d21b05c](https://gitee.com/openharmony/kernel_liteos_a/commits/d21b05c0f69877130366ad37b852a0f30c11809d)), closes [#I4CTY2](https://gitee.com/openharmony/kernel_liteos_a/issues/I4CTY2)
|
||||||
* 针对pr是否同步至release分支，增加原因说明规则 ([b37a7b7](https://gitee.com/openharmony/kernel_liteos_a/commits/b37a7b79292d93dae6c4914952b5f3bb509e8721))
|
* 针对pr是否同步至release分支，增加原因说明规则 ([b37a7b7](https://gitee.com/openharmony/kernel_liteos_a/commits/b37a7b79292d93dae6c4914952b5f3bb509e8721))
|
||||||
* 非当前进程销毁时，销毁liteipc时错误的销毁了当前进程的liteipc资源 ([0f0e85b](https://gitee.com/openharmony/kernel_liteos_a/commits/0f0e85b7a6bf76d540925fbf661c483c8dba1cba)), closes [#I4FSA7](https://gitee.com/openharmony/kernel_liteos_a/issues/I4FSA7)
|
* 非当前进程销毁时，销毁liteipc时错误的销毁了当前进程的liteipc资源 ([0f0e85b](https://gitee.com/openharmony/kernel_liteos_a/commits/0f0e85b7a6bf76d540925fbf661c483c8dba1cba)), closes [#I4FSA7](https://gitee.com/openharmony/kernel_liteos_a/issues/I4FSA7)
|
||||||
|
|
@ -79,22 +79,22 @@
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
|
|
||||||
* add option SIOCGIFBRDADDR for ioctl ([4ecc473](https://gitee.com/openharmony/kernel_liteos_a/commits/4ecc473843207d259613d26b8ee176d75e7f00fd)), closes [#I4DNRF](https://gitee.com/openharmony/kernel_liteos_a/issues/I4DNRF)
|
* add option SIOCGIFBRDADDR for ioctl ([4ecc473](https://gitee.com/openharmony/kernel_liteos_a/commits/4ecc473843207d259613d26b8ee176d75e7f00fd)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* add sync() to vfs ([f67c4da](https://gitee.com/openharmony/kernel_liteos_a/commits/f67c4dae5141914df2e069dce0196b14780649d8)), closes [#I480HV](https://gitee.com/openharmony/kernel_liteos_a/issues/I480HV)
|
* add sync() to vfs ([f67c4da](https://gitee.com/openharmony/kernel_liteos_a/commits/f67c4dae5141914df2e069dce0196b14780649d8)), closes [#I480](https://gitee.com/openharmony/kernel_liteos_a/issues/I480)
|
||||||
* **build:** support gcc toolchain ([6e886d4](https://gitee.com/openharmony/kernel_liteos_a/commits/6e886d4233dec3b82a27642f174b920e5f98f6aa))
|
* **build:** support gcc toolchain ([6e886d4](https://gitee.com/openharmony/kernel_liteos_a/commits/6e886d4233dec3b82a27642f174b920e5f98f6aa))
|
||||||
* L0-L1 支持Perf ([6e0a3f1](https://gitee.com/openharmony/kernel_liteos_a/commits/6e0a3f10bbbfe29d110c050da927684b6d77b961)), closes [#I47I9A](https://gitee.com/openharmony/kernel_liteos_a/issues/I47I9A)
|
* L0-L1 支持Perf ([6e0a3f1](https://gitee.com/openharmony/kernel_liteos_a/commits/6e0a3f10bbbfe29d110c050da927684b6d77b961)), closes [#I47I9](https://gitee.com/openharmony/kernel_liteos_a/issues/I47I9)
|
||||||
* L0~L1 支持Lms ([e748fdb](https://gitee.com/openharmony/kernel_liteos_a/commits/e748fdbe578a1ddd8eb10b2e207042676231ba26)), closes [#I4HYAV](https://gitee.com/openharmony/kernel_liteos_a/issues/I4HYAV)
|
* L0~L1 支持Lms ([e748fdb](https://gitee.com/openharmony/kernel_liteos_a/commits/e748fdbe578a1ddd8eb10b2e207042676231ba26)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* liteipc 静态内存优化 ([5237924](https://gitee.com/openharmony/kernel_liteos_a/commits/52379242c109e0cf442784dbe811ff9d42d5f33a)), closes [#I4G4HP](https://gitee.com/openharmony/kernel_liteos_a/issues/I4G4HP)
|
* liteipc 静态内存优化 ([5237924](https://gitee.com/openharmony/kernel_liteos_a/commits/52379242c109e0cf442784dbe811ff9d42d5f33a)), closes [#I4G4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4G4)
|
||||||
* page cache backed by vnode instead of filep ([38a6b80](https://gitee.com/openharmony/kernel_liteos_a/commits/38a6b804e9291d2fdbd189825ebd7d56165ec51c)), closes [#I44TBS](https://gitee.com/openharmony/kernel_liteos_a/issues/I44TBS)
|
* page cache backed by vnode instead of filep ([38a6b80](https://gitee.com/openharmony/kernel_liteos_a/commits/38a6b804e9291d2fdbd189825ebd7d56165ec51c)), closes [#I44](https://gitee.com/openharmony/kernel_liteos_a/issues/I44)
|
||||||
* 提供低功耗默认处理框架 ([212d1bd](https://gitee.com/openharmony/kernel_liteos_a/commits/212d1bd1e806530fe7e7a16ea986cb2c6fb084ed)), closes [#I4KBG9](https://gitee.com/openharmony/kernel_liteos_a/issues/I4KBG9)
|
* 提供低功耗默认处理框架 ([212d1bd](https://gitee.com/openharmony/kernel_liteos_a/commits/212d1bd1e806530fe7e7a16ea986cb2c6fb084ed)), closes [#I4KBG9](https://gitee.com/openharmony/kernel_liteos_a/issues/I4KBG9)
|
||||||
* 支持AT_RANDOM以增强用户态栈保护能力 ([06ea037](https://gitee.com/openharmony/kernel_liteos_a/commits/06ea03715f0cfb8728fadd0d9c19a403dc8f6028)), closes [#I4CB8M](https://gitee.com/openharmony/kernel_liteos_a/issues/I4CB8M)
|
* 支持AT_RANDOM以增强用户态栈保护能力 ([06ea037](https://gitee.com/openharmony/kernel_liteos_a/commits/06ea03715f0cfb8728fadd0d9c19a403dc8f6028)), closes [#I4CB8](https://gitee.com/openharmony/kernel_liteos_a/issues/I4CB8)
|
||||||
* 支持L1 低功耗框架 ([64e49ab](https://gitee.com/openharmony/kernel_liteos_a/commits/64e49aba7c9c7d2280c5b3f29f04b17b63209855)), closes [#I4JSOT](https://gitee.com/openharmony/kernel_liteos_a/issues/I4JSOT)
|
* 支持L1 低功耗框架 ([64e49ab](https://gitee.com/openharmony/kernel_liteos_a/commits/64e49aba7c9c7d2280c5b3f29f04b17b63209855)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 支持LOS_TaskJoin 和 LOS_TaskDetach ([37bc11f](https://gitee.com/openharmony/kernel_liteos_a/commits/37bc11fa8837a3019a0a56702f401ec1845f6547)), closes [#I4EENF](https://gitee.com/openharmony/kernel_liteos_a/issues/I4EENF)
|
* 支持LOS_TaskJoin 和 LOS_TaskDetach ([37bc11f](https://gitee.com/openharmony/kernel_liteos_a/commits/37bc11fa8837a3019a0a56702f401ec1845f6547)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 新增解析异常和backtrace信息脚本 ([7019fdf](https://gitee.com/openharmony/kernel_liteos_a/commits/7019fdfcbb33c660e8aa9fd399d5fccbd7e23b49)), closes [#I47EVQ](https://gitee.com/openharmony/kernel_liteos_a/issues/I47EVQ)
|
* 新增解析异常和backtrace信息脚本 ([7019fdf](https://gitee.com/openharmony/kernel_liteos_a/commits/7019fdfcbb33c660e8aa9fd399d5fccbd7e23b49)), closes [#I47](https://gitee.com/openharmony/kernel_liteos_a/issues/I47)
|
||||||
* 调度tick响应时间计算优化 ([f47da44](https://gitee.com/openharmony/kernel_liteos_a/commits/f47da44b39be7fa3e9b5031d7b79b9bef1fd4fbc))
|
* 调度tick响应时间计算优化 ([f47da44](https://gitee.com/openharmony/kernel_liteos_a/commits/f47da44b39be7fa3e9b5031d7b79b9bef1fd4fbc))
|
||||||
* 调度去进程化，优化进程线程依赖关系 ([dc479fb](https://gitee.com/openharmony/kernel_liteos_a/commits/dc479fb7bd9cb8441e4e47d44b42110ea07d76a2))
|
* 调度去进程化，优化进程线程依赖关系 ([dc479fb](https://gitee.com/openharmony/kernel_liteos_a/commits/dc479fb7bd9cb8441e4e47d44b42110ea07d76a2))
|
||||||
* 调度相关模块间依赖优化 ([0e3936c](https://gitee.com/openharmony/kernel_liteos_a/commits/0e3936c4f8b8bcfc48d283a6d53413e0fc0619b3)), closes [#I4RPRW](https://gitee.com/openharmony/kernel_liteos_a/issues/I4RPRW)
|
* 调度相关模块间依赖优化 ([0e3936c](https://gitee.com/openharmony/kernel_liteos_a/commits/0e3936c4f8b8bcfc48d283a6d53413e0fc0619b3)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 进程cpup占用率结构优化为动态分配 ([f06e090](https://gitee.com/openharmony/kernel_liteos_a/commits/f06e090a1085a654fd726fbc3c3a1c2bc703d663)), closes [#I4GLNT](https://gitee.com/openharmony/kernel_liteos_a/issues/I4GLNT)
|
* 进程cpup占用率结构优化为动态分配 ([f06e090](https://gitee.com/openharmony/kernel_liteos_a/commits/f06e090a1085a654fd726fbc3c3a1c2bc703d663)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_a/issues/I4)
|
||||||
* 进程rlimit修改为动态分配,减少静态内存占用 ([cf8446c](https://gitee.com/openharmony/kernel_liteos_a/commits/cf8446c94112ed6993a2e6e71e793d83a72689d5)), closes [#I4EZY5](https://gitee.com/openharmony/kernel_liteos_a/issues/I4EZY5)
|
* 进程rlimit修改为动态分配,减少静态内存占用 ([cf8446c](https://gitee.com/openharmony/kernel_liteos_a/commits/cf8446c94112ed6993a2e6e71e793d83a72689d5)), closes [#I4EZY5](https://gitee.com/openharmony/kernel_liteos_a/issues/I4EZY5)
|
||||||
|
|
||||||
### BREAKING CHANGES
|
### BREAKING CHANGES
|
||||||
|
|
@ -137,33 +137,33 @@ LOS_LmsAddrDisableProtect去能指定内存段的访问保护
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
* A核代码告警清零 ([698756d](https://gitee.com/openharmony/kernel_liteos_a/commits/698756d1e6dfb11b9f874c02ce6a1496646f2c27)), closes [#I4378T](https://gitee.com/openharmony/kernel_liteos_a/issues/I4378T)
|
* A核代码告警清零 ([698756d](https://gitee.com/openharmony/kernel_liteos_a/commits/698756d1e6dfb11b9f874c02ce6a1496646f2c27)), closes [#I4378](https://gitee.com/openharmony/kernel_liteos_a/issues/I4378)
|
||||||
* A核告警消除 ([d16bfd0](https://gitee.com/openharmony/kernel_liteos_a/commits/d16bfd005a6dae78df2df3ad55cf21e0716dfae9)), closes [#I46KF6](https://gitee.com/openharmony/kernel_liteos_a/issues/I46KF6)
|
* A核告警消除 ([d16bfd0](https://gitee.com/openharmony/kernel_liteos_a/commits/d16bfd005a6dae78df2df3ad55cf21e0716dfae9)), closes [#I46KF6](https://gitee.com/openharmony/kernel_liteos_a/issues/I46KF6)
|
||||||
* 3518平台, 异常测试进程无法正常退出 ([23937a2](https://gitee.com/openharmony/kernel_liteos_a/commits/23937a239f50d1487e89f3184e4f4b933d6842c6)), closes [#I3V8R5](https://gitee.com/openharmony/kernel_liteos_a/issues/I3V8R5)
|
* 3518平台, 异常测试进程无法正常退出 ([23937a2](https://gitee.com/openharmony/kernel_liteos_a/commits/23937a239f50d1487e89f3184e4f4b933d6842c6)), closes [#I3V8R5](https://gitee.com/openharmony/kernel_liteos_a/issues/I3V8R5)
|
||||||
* add (void) to GetFileMappingList method ([56b8eca](https://gitee.com/openharmony/kernel_liteos_a/commits/56b8ecaf171671c0fe97f1dd1f191bebb7812a51)), closes [#I3XPXY](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XPXY)
|
* add (void) to GetFileMappingList method ([56b8eca](https://gitee.com/openharmony/kernel_liteos_a/commits/56b8ecaf171671c0fe97f1dd1f191bebb7812a51)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* add capability and amend smoke testcase ([c9d69e2](https://gitee.com/openharmony/kernel_liteos_a/commits/c9d69e2d1bde57c67068cc36f6a79327d5db5daf))
|
* add capability and amend smoke testcase ([c9d69e2](https://gitee.com/openharmony/kernel_liteos_a/commits/c9d69e2d1bde57c67068cc36f6a79327d5db5daf))
|
||||||
* add fchdir api ([e828cbd](https://gitee.com/openharmony/kernel_liteos_a/commits/e828cbdeac7d60bfd6ed98c75a9958ee8ec7b672))
|
* add fchdir api ([e828cbd](https://gitee.com/openharmony/kernel_liteos_a/commits/e828cbdeac7d60bfd6ed98c75a9958ee8ec7b672))
|
||||||
* add fchmod api ([2f214bf](https://gitee.com/openharmony/kernel_liteos_a/commits/2f214bf4de6c31875c77e84b1763e96bc5ceb669))
|
* add fchmod api ([2f214bf](https://gitee.com/openharmony/kernel_liteos_a/commits/2f214bf4de6c31875c77e84b1763e96bc5ceb669))
|
||||||
* add fststfs api and unitest ([4c57aa2](https://gitee.com/openharmony/kernel_liteos_a/commits/4c57aa26ad3644ce2429effc8e8fe7fd3c52ebc2))
|
* add fststfs api and unitest ([4c57aa2](https://gitee.com/openharmony/kernel_liteos_a/commits/4c57aa26ad3644ce2429effc8e8fe7fd3c52ebc2))
|
||||||
* add product_path parameter for driver build ([88fe4eb](https://gitee.com/openharmony/kernel_liteos_a/commits/88fe4eb3e1eafa6d1e32c7b96579a07f5a8c6e35)), closes [#I3PQ10](https://gitee.com/openharmony/drivers_adapter/issues/I3PQ10)
|
* add product_path parameter for driver build ([88fe4eb](https://gitee.com/openharmony/kernel_liteos_a/commits/88fe4eb3e1eafa6d1e32c7b96579a07f5a8c6e35)), closes [#I3PQ10](https://gitee.com/openharmony/kernel_liteos_a/issues/I3PQ10)
|
||||||
* add syscall for ppoll & add 2 testcases ([defedb6](https://gitee.com/openharmony/kernel_liteos_a/commits/defedb6fdf0806da4a39e22408544cdfb405f2ff))
|
* add syscall for ppoll & add 2 testcases ([defedb6](https://gitee.com/openharmony/kernel_liteos_a/commits/defedb6fdf0806da4a39e22408544cdfb405f2ff))
|
||||||
* avoid compile warning ignored ([eca711b](https://gitee.com/openharmony/kernel_liteos_a/commits/eca711bb64a7c806ae34c8483cac73fe22b0104f)), closes [#I3VOAO](https://gitee.com/openharmony/kernel_liteos_a/issues/I3VOAO)
|
* avoid compile warning ignored ([eca711b](https://gitee.com/openharmony/kernel_liteos_a/commits/eca711bb64a7c806ae34c8483cac73fe22b0104f)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* A核codex修改 ([ec977a1](https://gitee.com/openharmony/kernel_liteos_a/commits/ec977a1c7e9ba4ea6621ceb1d0d10e586148208d)), closes [#I40B1S](https://gitee.com/openharmony/kernel_liteos_a/issues/I40B1S)
|
* A核codex修改 ([ec977a1](https://gitee.com/openharmony/kernel_liteos_a/commits/ec977a1c7e9ba4ea6621ceb1d0d10e586148208d)), closes [#I40B1](https://gitee.com/openharmony/kernel_liteos_a/issues/I40B1)
|
||||||
* BBOX使用预留物理内存缓存故障日志 ([2ad176e](https://gitee.com/openharmony/kernel_liteos_a/commits/2ad176e587d5ed7106831a25d386a88e26192e2b)), closes [#I41YIZ](https://gitee.com/openharmony/kernel_liteos_a/issues/I41YIZ)
|
* BBOX使用预留物理内存缓存故障日志 ([2ad176e](https://gitee.com/openharmony/kernel_liteos_a/commits/2ad176e587d5ed7106831a25d386a88e26192e2b)), closes [#I41](https://gitee.com/openharmony/kernel_liteos_a/issues/I41)
|
||||||
* bootargs解析与rootfs挂载解耦，并支持自定义bootargs参数 ([80473f0](https://gitee.com/openharmony/kernel_liteos_a/commits/80473f0975fe6fd4c4eae3a8a473674ad2dd1293)), closes [#I41CL8](https://gitee.com/openharmony/kernel_liteos_a/issues/I41CL8)
|
* bootargs解析与rootfs挂载解耦，并支持自定义bootargs参数 ([80473f0](https://gitee.com/openharmony/kernel_liteos_a/commits/80473f0975fe6fd4c4eae3a8a473674ad2dd1293)), closes [#I41CL8](https://gitee.com/openharmony/kernel_liteos_a/issues/I41CL8)
|
||||||
* **build:** clang10.0.1支持lto，去掉冗余判断 ([73223ae](https://gitee.com/openharmony/kernel_liteos_a/commits/73223ae7e652b7cd9f1e1848c32b2b2573d07b2a))
|
* **build:** clang10.0.1支持lto，去掉冗余判断 ([73223ae](https://gitee.com/openharmony/kernel_liteos_a/commits/73223ae7e652b7cd9f1e1848c32b2b2573d07b2a))
|
||||||
* **build:** fix rootfsdir.sh target directory not exist ([21bf2b8](https://gitee.com/openharmony/kernel_liteos_a/commits/21bf2b889931787fb18ca7ea238291fd57e76d51)), closes [#I3NHQ0](https://gitee.com/openharmony/kernel_liteos_a/issues/I3NHQ0)
|
* **build:** fix rootfsdir.sh target directory not exist ([21bf2b8](https://gitee.com/openharmony/kernel_liteos_a/commits/21bf2b889931787fb18ca7ea238291fd57e76d51)), closes [#I3NHQ0](https://gitee.com/openharmony/kernel_liteos_a/issues/I3NHQ0)
|
||||||
* **build:** 去除冗余单板相关的宏配置 ([471de36](https://gitee.com/openharmony/kernel_liteos_a/commits/471de3663ea8b63f7448162edc0293b8723dcefc))
|
* **build:** 去除冗余单板相关的宏配置 ([471de36](https://gitee.com/openharmony/kernel_liteos_a/commits/471de3663ea8b63f7448162edc0293b8723dcefc))
|
||||||
* clang10 lld could not recognized Oz ([87a0006](https://gitee.com/openharmony/kernel_liteos_a/commits/87a0006d5e1976fdf5efe4be383921610eb04ec6))
|
* clang10 lld could not recognized Oz ([87a0006](https://gitee.com/openharmony/kernel_liteos_a/commits/87a0006d5e1976fdf5efe4be383921610eb04ec6))
|
||||||
* clang相关编译选项隔离 ([77dcef4](https://gitee.com/openharmony/kernel_liteos_a/commits/77dcef4bc0c92d0141f7a3be0addd4d5cb533b0b)), closes [#I444AV](https://gitee.com/openharmony/kernel_liteos_a/issues/I444AV)
|
* clang相关编译选项隔离 ([77dcef4](https://gitee.com/openharmony/kernel_liteos_a/commits/77dcef4bc0c92d0141f7a3be0addd4d5cb533b0b)), closes [#I444](https://gitee.com/openharmony/kernel_liteos_a/issues/I444)
|
||||||
* codex ([101a55d](https://gitee.com/openharmony/kernel_liteos_a/commits/101a55d1199530d621f809976f0024aa8295cce8))
|
* codex ([101a55d](https://gitee.com/openharmony/kernel_liteos_a/commits/101a55d1199530d621f809976f0024aa8295cce8))
|
||||||
* codex clean ([b5370af](https://gitee.com/openharmony/kernel_liteos_a/commits/b5370af822c8e81ed2248ac8aa3bb479a0db9dae)), closes [#I3UOFN](https://gitee.com/openharmony/kernel_liteos_a/issues/I3UOFN)
|
* codex clean ([b5370af](https://gitee.com/openharmony/kernel_liteos_a/commits/b5370af822c8e81ed2248ac8aa3bb479a0db9dae)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* compile error when fatfs disabled ([fd3f407](https://gitee.com/openharmony/kernel_liteos_a/commits/fd3f4072b5c3dff710013ccdaddf114b0e13f435))
|
* compile error when fatfs disabled ([fd3f407](https://gitee.com/openharmony/kernel_liteos_a/commits/fd3f4072b5c3dff710013ccdaddf114b0e13f435))
|
||||||
* console compile bug fix ([f8441a0](https://gitee.com/openharmony/kernel_liteos_a/commits/f8441a0cdea301449416b0c0477dc48a05b6ab4e))
|
* console compile bug fix ([f8441a0](https://gitee.com/openharmony/kernel_liteos_a/commits/f8441a0cdea301449416b0c0477dc48a05b6ab4e))
|
||||||
* correct spelling ([c66fe03](https://gitee.com/openharmony/kernel_liteos_a/commits/c66fe0313f76ba41992b4864c93cf82934378ad3))
|
* correct spelling ([c66fe03](https://gitee.com/openharmony/kernel_liteos_a/commits/c66fe0313f76ba41992b4864c93cf82934378ad3))
|
||||||
* Correctly handle the return value of LOS_EventRead in QuickstartListen. ([0e0ab81](https://gitee.com/openharmony/kernel_liteos_a/commits/0e0ab81ff9474cffd5e60a8ee741840eac5d737b)), closes [#I3PSLZ](https://gitee.com/openharmony/kernel_liteos_a/issues/I3PSLZ)
|
* Correctly handle the return value of LOS_EventRead in QuickstartListen. ([0e0ab81](https://gitee.com/openharmony/kernel_liteos_a/commits/0e0ab81ff9474cffd5e60a8ee741840eac5d737b)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* Ctrl-C move out of LOS_MAGIC_KEY_ENABLE ([40f239a](https://gitee.com/openharmony/kernel_liteos_a/commits/40f239a7d4673dc740c853b1011b5072e48385b7))
|
* Ctrl-C move out of LOS_MAGIC_KEY_ENABLE ([40f239a](https://gitee.com/openharmony/kernel_liteos_a/commits/40f239a7d4673dc740c853b1011b5072e48385b7))
|
||||||
* Delete useless 'exc interaction' macros and function declarations. ([d2f2679](https://gitee.com/openharmony/kernel_liteos_a/commits/d2f26790716c9f76589c4a7d6fa5518f9ccd743c)), closes [#I3SDKY](https://gitee.com/openharmony/kernel_liteos_a/issues/I3SDKY)
|
* Delete useless 'exc interaction' macros and function declarations. ([d2f2679](https://gitee.com/openharmony/kernel_liteos_a/commits/d2f26790716c9f76589c4a7d6fa5518f9ccd743c)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* dereference NULL point bug fix ([deaa564](https://gitee.com/openharmony/kernel_liteos_a/commits/deaa564a66b83c9fe19a37b8a061ec9064ece354))
|
* dereference NULL point bug fix ([deaa564](https://gitee.com/openharmony/kernel_liteos_a/commits/deaa564a66b83c9fe19a37b8a061ec9064ece354))
|
||||||
* do not build toybox temporarily ([044f2c7](https://gitee.com/openharmony/kernel_liteos_a/commits/044f2c7c17c68e10aeccc3af0c222cfc722d194c))
|
* do not build toybox temporarily ([044f2c7](https://gitee.com/openharmony/kernel_liteos_a/commits/044f2c7c17c68e10aeccc3af0c222cfc722d194c))
|
||||||
* do not override existing libs ([8118408](https://gitee.com/openharmony/kernel_liteos_a/commits/8118408123e75f7f5a4ab9101e388be6bba0dcda))
|
* do not override existing libs ([8118408](https://gitee.com/openharmony/kernel_liteos_a/commits/8118408123e75f7f5a4ab9101e388be6bba0dcda))
|
||||||
|
|
@ -173,21 +173,21 @@ LOS_LmsAddrDisableProtect去能指定内存段的访问保护
|
||||||
* Fix kernel page fault exception handling causing system exception. ([a89fb57](https://gitee.com/openharmony/kernel_liteos_a/commits/a89fb57f5795236b93fd19ee2d7a059cae1b2b1b)), closes [#I3RAN4](https://gitee.com/openharmony/kernel_liteos_a/issues/I3RAN4)
|
* Fix kernel page fault exception handling causing system exception. ([a89fb57](https://gitee.com/openharmony/kernel_liteos_a/commits/a89fb57f5795236b93fd19ee2d7a059cae1b2b1b)), closes [#I3RAN4](https://gitee.com/openharmony/kernel_liteos_a/issues/I3RAN4)
|
||||||
* fix length typo ([12d98b1](https://gitee.com/openharmony/kernel_liteos_a/commits/12d98b144b70e726d3fd31ddc9d17ed855d0ec1b))
|
* fix length typo ([12d98b1](https://gitee.com/openharmony/kernel_liteos_a/commits/12d98b144b70e726d3fd31ddc9d17ed855d0ec1b))
|
||||||
* fix mq function by enable mq_notify api ([4427142](https://gitee.com/openharmony/kernel_liteos_a/commits/4427142d734df8f95f4599093392904abacc5c93))
|
* fix mq function by enable mq_notify api ([4427142](https://gitee.com/openharmony/kernel_liteos_a/commits/4427142d734df8f95f4599093392904abacc5c93))
|
||||||
* Fix quickstart codingstyle ([2e011b6](https://gitee.com/openharmony/kernel_liteos_a/commits/2e011b672f6b96ea7e0db066a07e3f9fb6ba5df3)), closes [#I3OPOM](https://gitee.com/openharmony/kernel_liteos_a/issues/I3OPOM)
|
* Fix quickstart codingstyle ([2e011b6](https://gitee.com/openharmony/kernel_liteos_a/commits/2e011b672f6b96ea7e0db066a07e3f9fb6ba5df3)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* fix stored typo ([d25560f](https://gitee.com/openharmony/kernel_liteos_a/commits/d25560f8ac3216670d198cbbb25891c394e0b3c2))
|
* fix stored typo ([d25560f](https://gitee.com/openharmony/kernel_liteos_a/commits/d25560f8ac3216670d198cbbb25891c394e0b3c2))
|
||||||
* fix syscall faccessat,fstatfs,fstatat & add 6 testcases ([aa1cd24](https://gitee.com/openharmony/kernel_liteos_a/commits/aa1cd245a5711e5b53c328b688da5ddc2e783d5f))
|
* fix syscall faccessat,fstatfs,fstatat & add 6 testcases ([aa1cd24](https://gitee.com/openharmony/kernel_liteos_a/commits/aa1cd245a5711e5b53c328b688da5ddc2e783d5f))
|
||||||
* fix the inappropriate errno in FatFs ([af61187](https://gitee.com/openharmony/kernel_liteos_a/commits/af61187587411dca38ff62e720451f08f19c1c82)), closes [#I3O8IF](https://gitee.com/openharmony/kernel_liteos_a/issues/I3O8IF)
|
* fix the inappropriate errno in FatFs ([af61187](https://gitee.com/openharmony/kernel_liteos_a/commits/af61187587411dca38ff62e720451f08f19c1c82)), closes [#I3O8](https://gitee.com/openharmony/kernel_liteos_a/issues/I3O8)
|
||||||
* fix typo in quickstart ([3b2ff4b](https://gitee.com/openharmony/kernel_liteos_a/commits/3b2ff4b71fc5ae1dc74180c33fd66f69da0059d1)), closes [#I3M1S8](https://gitee.com/openharmony/kernel_liteos_a/issues/I3M1S8)
|
* fix typo in quickstart ([3b2ff4b](https://gitee.com/openharmony/kernel_liteos_a/commits/3b2ff4b71fc5ae1dc74180c33fd66f69da0059d1)), closes [#I3M1S8](https://gitee.com/openharmony/kernel_liteos_a/issues/I3M1S8)
|
||||||
* Fix wrong judgment in los_trace.c to avoid null pointer access. ([4d863e9](https://gitee.com/openharmony/kernel_liteos_a/commits/4d863e985b6372f7895db57b602b662dba5cadd0)), closes [#I3RT9F](https://gitee.com/openharmony/kernel_liteos_a/issues/I3RT9F)
|
* Fix wrong judgment in los_trace.c to avoid null pointer access. ([4d863e9](https://gitee.com/openharmony/kernel_liteos_a/commits/4d863e985b6372f7895db57b602b662dba5cadd0)), closes [#I3RT9](https://gitee.com/openharmony/kernel_liteos_a/issues/I3RT9)
|
||||||
* Identical condition 'ret<0', second condition is always false. :bug: ([1348809](https://gitee.com/openharmony/kernel_liteos_a/commits/1348809807548dd481286a55a6677a9169fcd705))
|
* Identical condition 'ret<0', second condition is always false. :bug: ([1348809](https://gitee.com/openharmony/kernel_liteos_a/commits/1348809807548dd481286a55a6677a9169fcd705))
|
||||||
* init进程收到子进程退出信号后，调用fork重新拉起进程，会导致系统卡死 ([35a2f3a](https://gitee.com/openharmony/kernel_liteos_a/commits/35a2f3af33a5dba1e0ba36587efced8fead97223)), closes [#I41HOY](https://gitee.com/openharmony/kernel_liteos_a/issues/I41HOY)
|
* init进程收到子进程退出信号后，调用fork重新拉起进程，会导致系统卡死 ([35a2f3a](https://gitee.com/openharmony/kernel_liteos_a/commits/35a2f3af33a5dba1e0ba36587efced8fead97223)), closes [#I41](https://gitee.com/openharmony/kernel_liteos_a/issues/I41)
|
||||||
* kernel crashed after rmdir the umounted folder ([ac0d083](https://gitee.com/openharmony/kernel_liteos_a/commits/ac0d083b1c89c4ad3fdaab0347d11f174d0185cb))
|
* kernel crashed after rmdir the umounted folder ([ac0d083](https://gitee.com/openharmony/kernel_liteos_a/commits/ac0d083b1c89c4ad3fdaab0347d11f174d0185cb))
|
||||||
* kernel crashed when delete a umounted folder ([f305d1f](https://gitee.com/openharmony/kernel_liteos_a/commits/f305d1f702a770010125a0f4f0152ffefeeec5c4))
|
* kernel crashed when delete a umounted folder ([f305d1f](https://gitee.com/openharmony/kernel_liteos_a/commits/f305d1f702a770010125a0f4f0152ffefeeec5c4))
|
||||||
* kernel crashed when delete a umounted folder ([c6e9212](https://gitee.com/openharmony/kernel_liteos_a/commits/c6e921241b1cf26bcbfeea44e20f6b596512e259))
|
* kernel crashed when delete a umounted folder ([c6e9212](https://gitee.com/openharmony/kernel_liteos_a/commits/c6e921241b1cf26bcbfeea44e20f6b596512e259))
|
||||||
* **kernel_test:** 内核mem/shm冒烟用例重复运行失败 ([0676578](https://gitee.com/openharmony/kernel_liteos_a/commits/0676578aae09c101d79e7a276823e849df293e29)), closes [#I3TH4W](https://gitee.com/openharmony/kernel_liteos_a/issues/I3TH4W)
|
* **kernel_test:** 内核mem/shm冒烟用例重复运行失败 ([0676578](https://gitee.com/openharmony/kernel_liteos_a/commits/0676578aae09c101d79e7a276823e849df293e29)), closes [#I3TH4](https://gitee.com/openharmony/kernel_liteos_a/issues/I3TH4)
|
||||||
* L1 toybox 命令功能实现 ([2ff44c4](https://gitee.com/openharmony/kernel_liteos_a/commits/2ff44c4938d2e66ce60e9497c505eb6e97efc8c2)), closes [#I41N2A](https://gitee.com/openharmony/third_party_toybox/issues/I41N2A)
|
* L1 toybox 命令功能实现 ([2ff44c4](https://gitee.com/openharmony/kernel_liteos_a/commits/2ff44c4938d2e66ce60e9497c505eb6e97efc8c2)), closes [#I41N2](https://gitee.com/openharmony/kernel_liteos_a/issues/I41N2)
|
||||||
* liteipc max data size too small ([4dc421e](https://gitee.com/openharmony/kernel_liteos_a/commits/4dc421e3decdaae60219d533c4a93dbc9334e35f))
|
* liteipc max data size too small ([4dc421e](https://gitee.com/openharmony/kernel_liteos_a/commits/4dc421e3decdaae60219d533c4a93dbc9334e35f))
|
||||||
* LiteOS_A BBOX Codex整改 ([6a5a032](https://gitee.com/openharmony/kernel_liteos_a/commits/6a5a0326d2b18ffacce5d38fb351530973c2f245)), closes [#I43RQU](https://gitee.com/openharmony/kernel_liteos_a/issues/I43RQU)
|
* LiteOS_A BBOX Codex整改 ([6a5a032](https://gitee.com/openharmony/kernel_liteos_a/commits/6a5a0326d2b18ffacce5d38fb351530973c2f245)), closes [#I43](https://gitee.com/openharmony/kernel_liteos_a/issues/I43)
|
||||||
* Liteos-a创建的文件夹在Ubuntu中不可见 ([a9fc1e0](https://gitee.com/openharmony/kernel_liteos_a/commits/a9fc1e0e5d3e5eb8a34c568a8d147320a9afebe1)), closes [#I3XMY6](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XMY6)
|
* Liteos-a创建的文件夹在Ubuntu中不可见 ([a9fc1e0](https://gitee.com/openharmony/kernel_liteos_a/commits/a9fc1e0e5d3e5eb8a34c568a8d147320a9afebe1)), closes [#I3XMY6](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XMY6)
|
||||||
* lookup new vnode may cause parent vnode freeing ([902a11d](https://gitee.com/openharmony/kernel_liteos_a/commits/902a11de9a4b08e799820fb87942cb2171b9e095)), closes [#I3MYP4](https://gitee.com/openharmony/kernel_liteos_a/issues/I3MYP4)
|
* lookup new vnode may cause parent vnode freeing ([902a11d](https://gitee.com/openharmony/kernel_liteos_a/commits/902a11de9a4b08e799820fb87942cb2171b9e095)), closes [#I3MYP4](https://gitee.com/openharmony/kernel_liteos_a/issues/I3MYP4)
|
||||||
* **mini:** fix compile error in mini liteos_a ([e13cb3b](https://gitee.com/openharmony/kernel_liteos_a/commits/e13cb3bcc4e74d4c49c31d290d686f99a4e81e3f))
|
* **mini:** fix compile error in mini liteos_a ([e13cb3b](https://gitee.com/openharmony/kernel_liteos_a/commits/e13cb3bcc4e74d4c49c31d290d686f99a4e81e3f))
|
||||||
|
|
@ -196,117 +196,117 @@ LOS_LmsAddrDisableProtect去能指定内存段的访问保护
|
||||||
* mkdir -p is more robust ([e38f9a9](https://gitee.com/openharmony/kernel_liteos_a/commits/e38f9a98c9d373db8381af707c5996d1fefef64e))
|
* mkdir -p is more robust ([e38f9a9](https://gitee.com/openharmony/kernel_liteos_a/commits/e38f9a98c9d373db8381af707c5996d1fefef64e))
|
||||||
* mksh compile bug fix ([d8263b1](https://gitee.com/openharmony/kernel_liteos_a/commits/d8263b1e91d76706d52df321ef642c1c8297e8e4)), closes [#I3ZMR7](https://gitee.com/openharmony/kernel_liteos_a/issues/I3ZMR7)
|
* mksh compile bug fix ([d8263b1](https://gitee.com/openharmony/kernel_liteos_a/commits/d8263b1e91d76706d52df321ef642c1c8297e8e4)), closes [#I3ZMR7](https://gitee.com/openharmony/kernel_liteos_a/issues/I3ZMR7)
|
||||||
* modify event API description ([937734b](https://gitee.com/openharmony/kernel_liteos_a/commits/937734b1e9f5fc52e0ac727549bd2e4b4c864e3c))
|
* modify event API description ([937734b](https://gitee.com/openharmony/kernel_liteos_a/commits/937734b1e9f5fc52e0ac727549bd2e4b4c864e3c))
|
||||||
* move nuttx head file back ([4c8a86e](https://gitee.com/openharmony/kernel_liteos_a/commits/4c8a86ece7cafa8f74441bacc74c7788c0a1b780)), closes [#I4443Q](https://gitee.com/openharmony/kernel_liteos_a/issues/I4443Q)
|
* move nuttx head file back ([4c8a86e](https://gitee.com/openharmony/kernel_liteos_a/commits/4c8a86ece7cafa8f74441bacc74c7788c0a1b780)), closes [#I4443](https://gitee.com/openharmony/kernel_liteos_a/issues/I4443)
|
||||||
* nanosleep 接口的rmtp参数被错误清零 ([9458de9](https://gitee.com/openharmony/kernel_liteos_a/commits/9458de9ac664cd75540c8b638b9a6caf82812fc8)), closes [#I41U0R](https://gitee.com/openharmony/kernel_liteos_a/issues/I41U0R)
|
* nanosleep 接口的rmtp参数被错误清零 ([9458de9](https://gitee.com/openharmony/kernel_liteos_a/commits/9458de9ac664cd75540c8b638b9a6caf82812fc8)), closes [#I41U0](https://gitee.com/openharmony/kernel_liteos_a/issues/I41U0)
|
||||||
* no exception information output, when the system is abnormal ([5bf4d1c](https://gitee.com/openharmony/kernel_liteos_a/commits/5bf4d1c7128e6718611bbec23cb4373bcb3bfe55))
|
* no exception information output, when the system is abnormal ([5bf4d1c](https://gitee.com/openharmony/kernel_liteos_a/commits/5bf4d1c7128e6718611bbec23cb4373bcb3bfe55))
|
||||||
* no exception information output, when the system is abnormal ([28aa777](https://gitee.com/openharmony/kernel_liteos_a/commits/28aa777191e7b41e4f1f346ab79f8688edc59c6d))
|
* no exception information output, when the system is abnormal ([28aa777](https://gitee.com/openharmony/kernel_liteos_a/commits/28aa777191e7b41e4f1f346ab79f8688edc59c6d))
|
||||||
* no exception information output, when the system is abnormal after holding ([0ed8adf](https://gitee.com/openharmony/kernel_liteos_a/commits/0ed8adfe3ae59672e284331d40ef3b9e0bc8e094))
|
* no exception information output, when the system is abnormal after holding ([0ed8adf](https://gitee.com/openharmony/kernel_liteos_a/commits/0ed8adfe3ae59672e284331d40ef3b9e0bc8e094))
|
||||||
* Optimiz macro of quickstart cmd ([cb140a4](https://gitee.com/openharmony/kernel_liteos_a/commits/cb140a4442c02dd0b1925cc58deecbf4da36dcea)), closes [#I3OSYT](https://gitee.com/openharmony/kernel_liteos_a/issues/I3OSYT)
|
* Optimiz macro of quickstart cmd ([cb140a4](https://gitee.com/openharmony/kernel_liteos_a/commits/cb140a4442c02dd0b1925cc58deecbf4da36dcea)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* Optimize /dev/quickstart permissions. ([4e24b57](https://gitee.com/openharmony/kernel_liteos_a/commits/4e24b572897c33e1b2723122c0e13d3931096bae)), closes [#I3OYUQ](https://gitee.com/openharmony/kernel_liteos_a/issues/I3OYUQ)
|
* Optimize /dev/quickstart permissions. ([4e24b57](https://gitee.com/openharmony/kernel_liteos_a/commits/4e24b572897c33e1b2723122c0e13d3931096bae)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* Optimize quickstart node implementation ([4abd2e0](https://gitee.com/openharmony/kernel_liteos_a/commits/4abd2e0247b14718bb21756fb446142140d30a88)), closes [#I3R8O8](https://gitee.com/openharmony/kernel_liteos_a/issues/I3R8O8)
|
* Optimize quickstart node implementation ([4abd2e0](https://gitee.com/openharmony/kernel_liteos_a/commits/4abd2e0247b14718bb21756fb446142140d30a88)), closes [#I3R8O8](https://gitee.com/openharmony/kernel_liteos_a/issues/I3R8O8)
|
||||||
* OsGerCurrSchedTimeCycle 函数存在拼写错误 ([53ced1a](https://gitee.com/openharmony/kernel_liteos_a/commits/53ced1a85edc3d06230225ced3916772f432243f)), closes [#I446CX](https://gitee.com/openharmony/kernel_liteos_a/issues/I446CX)
|
* OsGerCurrSchedTimeCycle 函数存在拼写错误 ([53ced1a](https://gitee.com/openharmony/kernel_liteos_a/commits/53ced1a85edc3d06230225ced3916772f432243f)), closes [#I446](https://gitee.com/openharmony/kernel_liteos_a/issues/I446)
|
||||||
* OsGetArgsAddr声明所在头文件不正确 ([14bd753](https://gitee.com/openharmony/kernel_liteos_a/commits/14bd753aa8beb49af887c8d0aedaefa446409760)), closes [#I41MWM](https://gitee.com/openharmony/kernel_liteos_a/issues/I41MWM)
|
* OsGetArgsAddr声明所在头文件不正确 ([14bd753](https://gitee.com/openharmony/kernel_liteos_a/commits/14bd753aa8beb49af887c8d0aedaefa446409760)), closes [#I41](https://gitee.com/openharmony/kernel_liteos_a/issues/I41)
|
||||||
* parent point of vnode found by VfsHashGet should be updated ([f32caa5](https://gitee.com/openharmony/kernel_liteos_a/commits/f32caa52c67eca20d58676be4e0439acbb4c5ac3)), closes [#I3NNFA](https://gitee.com/openharmony/kernel_liteos_a/issues/I3NNFA)
|
* parent point of vnode found by VfsHashGet should be updated ([f32caa5](https://gitee.com/openharmony/kernel_liteos_a/commits/f32caa52c67eca20d58676be4e0439acbb4c5ac3)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* PathCacheFree try to free name field in struct PathCache ([9f47faf](https://gitee.com/openharmony/kernel_liteos_a/commits/9f47faff732609cf2249f104b94ed55f3ef133bb)), closes [#I3NTH9](https://gitee.com/openharmony/kernel_liteos_a/issues/I3NTH9)
|
* PathCacheFree try to free name field in struct PathCache ([9f47faf](https://gitee.com/openharmony/kernel_liteos_a/commits/9f47faff732609cf2249f104b94ed55f3ef133bb)), closes [#I3NTH9](https://gitee.com/openharmony/kernel_liteos_a/issues/I3NTH9)
|
||||||
* PathCacheMemoryDump miscalculate the RAM usage of PathCache ([87da7c7](https://gitee.com/openharmony/kernel_liteos_a/commits/87da7c794c9bc8e311ae5242820fbf8aefd8d558)), closes [#I3OBXY](https://gitee.com/openharmony/kernel_liteos_a/issues/I3OBXY)
|
* PathCacheMemoryDump miscalculate the RAM usage of PathCache ([87da7c7](https://gitee.com/openharmony/kernel_liteos_a/commits/87da7c794c9bc8e311ae5242820fbf8aefd8d558)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* Provide a separate configuration macro for boot environment in RAM. ([e28e06b](https://gitee.com/openharmony/kernel_liteos_a/commits/e28e06b08f5b28091153e584cb9d93014a9f2b10))
|
* Provide a separate configuration macro for boot environment in RAM. ([e28e06b](https://gitee.com/openharmony/kernel_liteos_a/commits/e28e06b08f5b28091153e584cb9d93014a9f2b10))
|
||||||
* Provide a separate configuration macro for boot environment in RAM. ([bc67393](https://gitee.com/openharmony/kernel_liteos_a/commits/bc67393a67f714e0a8165b6103e53699c676341c))
|
* Provide a separate configuration macro for boot environment in RAM. ([bc67393](https://gitee.com/openharmony/kernel_liteos_a/commits/bc67393a67f714e0a8165b6103e53699c676341c))
|
||||||
* Provide a separate configuration macro for boot environment in RAM. ([f13b90e](https://gitee.com/openharmony/kernel_liteos_a/commits/f13b90e4308ba3d60683799b9ce62fb3705ac277)), closes [#I3OADR](https://gitee.com/openharmony/kernel_liteos_a/issues/I3OADR)
|
* Provide a separate configuration macro for boot environment in RAM. ([f13b90e](https://gitee.com/openharmony/kernel_liteos_a/commits/f13b90e4308ba3d60683799b9ce62fb3705ac277)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* race condition in liteipc ([7e2aef2](https://gitee.com/openharmony/kernel_liteos_a/commits/7e2aef2480b15f71ee0e089cef4443f578e03dbb)), closes [#I3PW5Y](https://gitee.com/openharmony/kernel_liteos_a/issues/I3PW5Y)
|
* race condition in liteipc ([7e2aef2](https://gitee.com/openharmony/kernel_liteos_a/commits/7e2aef2480b15f71ee0e089cef4443f578e03dbb)), closes [#I3PW5](https://gitee.com/openharmony/kernel_liteos_a/issues/I3PW5)
|
||||||
* rebuild mksh depends on rebuild.sh script ([bef4ab9](https://gitee.com/openharmony/kernel_liteos_a/commits/bef4ab9835dec865898c74337dfb7154718b94aa))
|
* rebuild mksh depends on rebuild.sh script ([bef4ab9](https://gitee.com/openharmony/kernel_liteos_a/commits/bef4ab9835dec865898c74337dfb7154718b94aa))
|
||||||
* remove redundant headfile ([73a7777](https://gitee.com/openharmony/kernel_liteos_a/commits/73a777777e1b834192f6bb2c0e8bd03c69765c11)), closes [#I3RTNR](https://gitee.com/openharmony/kernel_liteos_a/issues/I3RTNR)
|
* remove redundant headfile ([73a7777](https://gitee.com/openharmony/kernel_liteos_a/commits/73a777777e1b834192f6bb2c0e8bd03c69765c11)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* Remove redundant invalid codes ([fe05df4](https://gitee.com/openharmony/kernel_liteos_a/commits/fe05df40ae710632adb1bd54fb04ad4a8e0c1429)), closes [#I3R70T](https://gitee.com/openharmony/kernel_liteos_a/issues/I3R70T)
|
* Remove redundant invalid codes ([fe05df4](https://gitee.com/openharmony/kernel_liteos_a/commits/fe05df40ae710632adb1bd54fb04ad4a8e0c1429)), closes [#I3R70](https://gitee.com/openharmony/kernel_liteos_a/issues/I3R70)
|
||||||
* Show conflicting files for git apply or patch -p command ([35f7957](https://gitee.com/openharmony/kernel_liteos_a/commits/35f79579758644cbcac6005f894be21f34f42b99)), closes [#I3NNUS](https://gitee.com/openharmony/kernel_liteos_a/issues/I3NNUS)
|
* Show conflicting files for git apply or patch -p command ([35f7957](https://gitee.com/openharmony/kernel_liteos_a/commits/35f79579758644cbcac6005f894be21f34f42b99)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* SIOCGIFCONF ioctl malloc size error in kernel ([bfd27e7](https://gitee.com/openharmony/kernel_liteos_a/commits/bfd27e78b259eedbd4c30548e80c9b4d789d26e1)), closes [#I3XEZ3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XEZ3)
|
* SIOCGIFCONF ioctl malloc size error in kernel ([bfd27e7](https://gitee.com/openharmony/kernel_liteos_a/commits/bfd27e78b259eedbd4c30548e80c9b4d789d26e1)), closes [#I3XEZ3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XEZ3)
|
||||||
* smp启动代码解耦及内存映射关系解耦 ([3bb3173](https://gitee.com/openharmony/kernel_liteos_a/commits/3bb3173604dc4dea09301f61da402974185dc112)), closes [#I41P8Y](https://gitee.com/openharmony/kernel_liteos_a/issues/I41P8Y)
|
* smp启动代码解耦及内存映射关系解耦 ([3bb3173](https://gitee.com/openharmony/kernel_liteos_a/commits/3bb3173604dc4dea09301f61da402974185dc112)), closes [#I41P8](https://gitee.com/openharmony/kernel_liteos_a/issues/I41P8)
|
||||||
* some branch in format does not release the vnode mutex properly ([9b2b700](https://gitee.com/openharmony/kernel_liteos_a/commits/9b2b700fa0e3a8edadb38f09c917a3e3f013347f)), closes [#I3OFAY](https://gitee.com/openharmony/kernel_liteos_a/issues/I3OFAY)
|
* some branch in format does not release the vnode mutex properly ([9b2b700](https://gitee.com/openharmony/kernel_liteos_a/commits/9b2b700fa0e3a8edadb38f09c917a3e3f013347f)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* Sortlink, the response time to insert the node should be inserted into the back of the existing node. ([1323874](https://gitee.com/openharmony/kernel_liteos_a/commits/1323874389030c55fb053fead12ca1c6654d8851)), closes [#I3PSJ8](https://gitee.com/openharmony/kernel_liteos_a/issues/I3PSJ8)
|
* Sortlink, the response time to insert the node should be inserted into the back of the existing node. ([1323874](https://gitee.com/openharmony/kernel_liteos_a/commits/1323874389030c55fb053fead12ca1c6654d8851)), closes [#I3PSJ8](https://gitee.com/openharmony/kernel_liteos_a/issues/I3PSJ8)
|
||||||
* statfs can't get f_bfree and f_bavail of a FAT12/FAT16 partition ([9503c4a](https://gitee.com/openharmony/kernel_liteos_a/commits/9503c4a9fc30aaa8ea2031d4fb794436f3c98055)), closes [#I3Q0VS](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Q0VS)
|
* statfs can't get f_bfree and f_bavail of a FAT12/FAT16 partition ([9503c4a](https://gitee.com/openharmony/kernel_liteos_a/commits/9503c4a9fc30aaa8ea2031d4fb794436f3c98055)), closes [#I3Q0](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Q0)
|
||||||
* SysOpenat返回值应该为进程fd，而非系统全局fd。 ([3457c0b](https://gitee.com/openharmony/kernel_liteos_a/commits/3457c0b11debb2cf5d4abe325c2510a750654512)), closes [#I3TNAK](https://gitee.com/openharmony/kernel_liteos_a/issues/I3TNAK)
|
* SysOpenat返回值应该为进程fd，而非系统全局fd。 ([3457c0b](https://gitee.com/openharmony/kernel_liteos_a/commits/3457c0b11debb2cf5d4abe325c2510a750654512)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* the total used vnode number not increased after unlink a file under ([4f514a1](https://gitee.com/openharmony/kernel_liteos_a/commits/4f514a16af5a3f3b9c4ea182de774297afb17f66)), closes [#I3TS1Y](https://gitee.com/openharmony/kernel_liteos_a/issues/I3TS1Y)
|
* the total used vnode number not increased after unlink a file under ([4f514a1](https://gitee.com/openharmony/kernel_liteos_a/commits/4f514a16af5a3f3b9c4ea182de774297afb17f66)), closes [#I3TS1](https://gitee.com/openharmony/kernel_liteos_a/issues/I3TS1)
|
||||||
* tick 动态化计算优化，消除中断执行时间对系统总体时间的影响，保证软件定时器的响应精度。 ([8df3e8c](https://gitee.com/openharmony/kernel_liteos_a/commits/8df3e8c96515a1907455a9bbc61426f43c803c62)), closes [#I43UQJ](https://gitee.com/openharmony/kernel_liteos_a/issues/I43UQJ)
|
* tick 动态化计算优化，消除中断执行时间对系统总体时间的影响，保证软件定时器的响应精度。 ([8df3e8c](https://gitee.com/openharmony/kernel_liteos_a/commits/8df3e8c96515a1907455a9bbc61426f43c803c62)), closes [#I43](https://gitee.com/openharmony/kernel_liteos_a/issues/I43)
|
||||||
* toybox update ([c3245b3](https://gitee.com/openharmony/kernel_liteos_a/commits/c3245b3ce317eb58c8dad58fdfc7f094b9b9794b))
|
* toybox update ([c3245b3](https://gitee.com/openharmony/kernel_liteos_a/commits/c3245b3ce317eb58c8dad58fdfc7f094b9b9794b))
|
||||||
* toybox命令升级 ([76f45b3](https://gitee.com/openharmony/kernel_liteos_a/commits/76f45b3fb2783d1cab45a6ba08787c29dfa2c948)), closes [#I41N2A](https://gitee.com/openharmony/third_party_toybox/issues/I41N2A)
|
* toybox命令升级 ([76f45b3](https://gitee.com/openharmony/kernel_liteos_a/commits/76f45b3fb2783d1cab45a6ba08787c29dfa2c948)), closes [#I41N2](https://gitee.com/openharmony/kernel_liteos_a/issues/I41N2)
|
||||||
* update LOS_DL_LIST_IS_END comment ([900269b](https://gitee.com/openharmony/kernel_liteos_a/commits/900269bd4645252d898f6d3b73de01d8548c960c))
|
* update LOS_DL_LIST_IS_END comment ([900269b](https://gitee.com/openharmony/kernel_liteos_a/commits/900269bd4645252d898f6d3b73de01d8548c960c))
|
||||||
* userfs分区的起始地址与大小改为通过bootargs配置 ([2e2b142](https://gitee.com/openharmony/kernel_liteos_a/commits/2e2b14205f4b81c7483ab42d62f144487097e9a4)), closes [#I3XNEY](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XNEY)
|
* userfs分区的起始地址与大小改为通过bootargs配置 ([2e2b142](https://gitee.com/openharmony/kernel_liteos_a/commits/2e2b14205f4b81c7483ab42d62f144487097e9a4)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* VnodeInUseIter and VnodeFreeAll used to be recursive ([5f6656c](https://gitee.com/openharmony/kernel_liteos_a/commits/5f6656cb36a2ffb0b290aeb53981aba7501e80b2)), closes [#I3NN3U](https://gitee.com/openharmony/kernel_liteos_a/issues/I3NN3U)
|
* VnodeInUseIter and VnodeFreeAll used to be recursive ([5f6656c](https://gitee.com/openharmony/kernel_liteos_a/commits/5f6656cb36a2ffb0b290aeb53981aba7501e80b2)), closes [#I3NN3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3NN3)
|
||||||
* 以g_sysSchedStartTime是否为0判断时间轴是否生效存在极限场景导致调度时间不生效 ([67ac8c4](https://gitee.com/openharmony/kernel_liteos_a/commits/67ac8c4c586adc371ece56700fd42371ca7fc885)), closes [#I45HP5](https://gitee.com/openharmony/kernel_liteos_m/issues/I45HP5)
|
* 以g_sysSchedStartTime是否为0判断时间轴是否生效存在极限场景导致调度时间不生效 ([67ac8c4](https://gitee.com/openharmony/kernel_liteos_a/commits/67ac8c4c586adc371ece56700fd42371ca7fc885)), closes [#I45HP5](https://gitee.com/openharmony/kernel_liteos_a/issues/I45HP5)
|
||||||
* 修复FATFS中不同内部接口不支持FAT12/FAT16 FAT表结束标志 ([33f5c70](https://gitee.com/openharmony/kernel_liteos_a/commits/33f5c70e6c8781758d2bfde0f60ca3d6ec7d543f)), closes [#I409R6](https://gitee.com/openharmony/kernel_liteos_a/issues/I409R6)
|
* 修复FATFS中不同内部接口不支持FAT12/FAT16 FAT表结束标志 ([33f5c70](https://gitee.com/openharmony/kernel_liteos_a/commits/33f5c70e6c8781758d2bfde0f60ca3d6ec7d543f)), closes [#I409R6](https://gitee.com/openharmony/kernel_liteos_a/issues/I409R6)
|
||||||
* 修复kill进程时，因liteipc阻塞的进程概率无法退出问题 ([7de43bb](https://gitee.com/openharmony/kernel_liteos_a/commits/7de43bb004a12f926550f0b36ca3c2fa610feb27)), closes [#I3XX7K](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XX7K)
|
* 修复kill进程时，因liteipc阻塞的进程概率无法退出问题 ([7de43bb](https://gitee.com/openharmony/kernel_liteos_a/commits/7de43bb004a12f926550f0b36ca3c2fa610feb27)), closes [#I3XX7](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XX7)
|
||||||
* 修复MagicKey数组越界访问 ([071cd62](https://gitee.com/openharmony/kernel_liteos_a/commits/071cd6268aeaaef702387dacaf4ef1ffbb7618fc)), closes [#I3U4N9](https://gitee.com/openharmony/kernel_liteos_a/issues/I3U4N9)
|
* 修复MagicKey数组越界访问 ([071cd62](https://gitee.com/openharmony/kernel_liteos_a/commits/071cd6268aeaaef702387dacaf4ef1ffbb7618fc)), closes [#I3U4N9](https://gitee.com/openharmony/kernel_liteos_a/issues/I3U4N9)
|
||||||
* 修复mprotect修改地址区间的权限后，相应的区间名丢失问题 ([e425187](https://gitee.com/openharmony/kernel_liteos_a/commits/e425187d176a5e09bc5253faefc9cfc8454da0a3)), closes [#I43R40](https://gitee.com/openharmony/kernel_liteos_a/issues/I43R40)
|
* 修复mprotect修改地址区间的权限后，相应的区间名丢失问题 ([e425187](https://gitee.com/openharmony/kernel_liteos_a/commits/e425187d176a5e09bc5253faefc9cfc8454da0a3)), closes [#I43R40](https://gitee.com/openharmony/kernel_liteos_a/issues/I43R40)
|
||||||
* 修复mq_close关闭后仍然占用文件描述符的问题 ([590c7b4](https://gitee.com/openharmony/kernel_liteos_a/commits/590c7b4e22662781d05ad035a785e985d573ec33)), closes [#I3ZQDA](https://gitee.com/openharmony/kernel_liteos_a/issues/I3ZQDA)
|
* 修复mq_close关闭后仍然占用文件描述符的问题 ([590c7b4](https://gitee.com/openharmony/kernel_liteos_a/commits/590c7b4e22662781d05ad035a785e985d573ec33)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* 修复mqueue问题 ([26ee8b8](https://gitee.com/openharmony/kernel_liteos_a/commits/26ee8b836e346e641de4ecd72284f5d377bca6f8)), closes [#I43P4T](https://gitee.com/openharmony/kernel_liteos_a/issues/I43P4T)
|
* 修复mqueue问题 ([26ee8b8](https://gitee.com/openharmony/kernel_liteos_a/commits/26ee8b836e346e641de4ecd72284f5d377bca6f8)), closes [#I43P4](https://gitee.com/openharmony/kernel_liteos_a/issues/I43P4)
|
||||||
* 修复sigwait等待到的信号值与获取的siginfo中的值不一致 ([ed7defb](https://gitee.com/openharmony/kernel_liteos_a/commits/ed7defbd439c345a07159d40eb04433afd530004)), closes [#I3M12H](https://gitee.com/openharmony/kernel_liteos_a/issues/I3M12H)
|
* 修复sigwait等待到的信号值与获取的siginfo中的值不一致 ([ed7defb](https://gitee.com/openharmony/kernel_liteos_a/commits/ed7defbd439c345a07159d40eb04433afd530004)), closes [#I3M12](https://gitee.com/openharmony/kernel_liteos_a/issues/I3M12)
|
||||||
* 修复了LOSCFG_FS_FAT_VIRTUAL_PARTITION宏开关错误作用域引起的功能错误 ([acda419](https://gitee.com/openharmony/kernel_liteos_a/commits/acda419a2d773ea890052a16ee66b4872f941fbb)), closes [#I3W1IW](https://gitee.com/openharmony/kernel_liteos_a/issues/I3W1IW)
|
* 修复了LOSCFG_FS_FAT_VIRTUAL_PARTITION宏开关错误作用域引起的功能错误 ([acda419](https://gitee.com/openharmony/kernel_liteos_a/commits/acda419a2d773ea890052a16ee66b4872f941fbb)), closes [#I3W1](https://gitee.com/openharmony/kernel_liteos_a/issues/I3W1)
|
||||||
* 修复了内核的VFAT测试用例 ([a8384b5](https://gitee.com/openharmony/kernel_liteos_a/commits/a8384b5db2274d50a350910d7cfd3fc36b4f4103)), closes [#I3XF3R](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XF3R)
|
* 修复了内核的VFAT测试用例 ([a8384b5](https://gitee.com/openharmony/kernel_liteos_a/commits/a8384b5db2274d50a350910d7cfd3fc36b4f4103)), closes [#I3XF3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XF3)
|
||||||
* 修复内核access chmod chown接口 ([56a95b9](https://gitee.com/openharmony/kernel_liteos_a/commits/56a95b9ec903f815f9199ac65ca318e00a83b2ed)), closes [#I3Z5L6](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Z5L6)
|
* 修复内核access chmod chown接口 ([56a95b9](https://gitee.com/openharmony/kernel_liteos_a/commits/56a95b9ec903f815f9199ac65ca318e00a83b2ed)), closes [#I3Z5L6](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Z5L6)
|
||||||
* 修复内核c库的makefile中被优化函数替换的高频函数依然参与了编译的问题 ([6f6dc4f](https://gitee.com/openharmony/kernel_liteos_a/commits/6f6dc4f24c8ab05a6d42da46a9fa41d74a477bd7)), closes [#I3XGM8](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XGM8)
|
* 修复内核c库的makefile中被优化函数替换的高频函数依然参与了编译的问题 ([6f6dc4f](https://gitee.com/openharmony/kernel_liteos_a/commits/6f6dc4f24c8ab05a6d42da46a9fa41d74a477bd7)), closes [#I3XGM8](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XGM8)
|
||||||
* 修复内核堆完整性检查逻辑中访问非法指针导致系统异常问题。 ([30f5ab8](https://gitee.com/openharmony/kernel_liteos_a/commits/30f5ab89b72d45f596b15af82a8e8e01add7977d)), closes [#I3VJZT](https://gitee.com/openharmony/kernel_liteos_a/issues/I3VJZT)
|
* 修复内核堆完整性检查逻辑中访问非法指针导致系统异常问题。 ([30f5ab8](https://gitee.com/openharmony/kernel_liteos_a/commits/30f5ab89b72d45f596b15af82a8e8e01add7977d)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* 修复启动框架debug模式下-Werror=maybe-uninitialized告警以及符号链接不进镜像的隐患 ([4c02415](https://gitee.com/openharmony/kernel_liteos_a/commits/4c024159a9600745863e49ee955308470a5b657b)), closes [#I3T5HR](https://gitee.com/openharmony/kernel_liteos_a/issues/I3T5HR)
|
* 修复启动框架debug模式下-Werror=maybe-uninitialized告警以及符号链接不进镜像的隐患 ([4c02415](https://gitee.com/openharmony/kernel_liteos_a/commits/4c024159a9600745863e49ee955308470a5b657b)), closes [#I3T5](https://gitee.com/openharmony/kernel_liteos_a/issues/I3T5)
|
||||||
* 修复开机概率挂死 ([2e82c36](https://gitee.com/openharmony/kernel_liteos_a/commits/2e82c361f73b2119613c3571c48faae8ec41d4eb)), closes [#I3SWY2](https://gitee.com/openharmony/kernel_liteos_a/issues/I3SWY2)
|
* 修复开机概率挂死 ([2e82c36](https://gitee.com/openharmony/kernel_liteos_a/commits/2e82c361f73b2119613c3571c48faae8ec41d4eb)), closes [#I3SWY2](https://gitee.com/openharmony/kernel_liteos_a/issues/I3SWY2)
|
||||||
* 修复文档链接失效问题 ([42a3a6c](https://gitee.com/openharmony/kernel_liteos_a/commits/42a3a6c51bfca4ade8ce94084ea2f8eb1c86a137)), closes [#I45297](https://gitee.com/openharmony/kernel_liteos_a/issues/I45297)
|
* 修复文档链接失效问题 ([42a3a6c](https://gitee.com/openharmony/kernel_liteos_a/commits/42a3a6c51bfca4ade8ce94084ea2f8eb1c86a137)), closes [#I45297](https://gitee.com/openharmony/kernel_liteos_a/issues/I45297)
|
||||||
* 修改/proc/mounts显示格式 ([6860246](https://gitee.com/openharmony/kernel_liteos_a/commits/6860246cfaac6f540665e79bbc4c3d54c419b092)), closes [#I3XGCS](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XGCS)
|
* 修改/proc/mounts显示格式 ([6860246](https://gitee.com/openharmony/kernel_liteos_a/commits/6860246cfaac6f540665e79bbc4c3d54c419b092)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* 修改clock_gettime接口适配posix标准测试用例011输入clk_id错误时返回值ESRCH为EINVAL. ([f8cf6e6](https://gitee.com/openharmony/kernel_liteos_a/commits/f8cf6e6439ee017fe8e0d4ecfc9949c28fa6775f)), closes [#I3OUHI](https://gitee.com/openharmony/kernel_liteos_a/issues/I3OUHI)
|
* 修改clock_gettime接口适配posix标准测试用例011输入clk_id错误时返回值ESRCH为EINVAL. ([f8cf6e6](https://gitee.com/openharmony/kernel_liteos_a/commits/f8cf6e6439ee017fe8e0d4ecfc9949c28fa6775f)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* 修改DoNanoSleep 以纳秒为单位 ([6917e08](https://gitee.com/openharmony/kernel_liteos_a/commits/6917e08431689ccbd5a30e9a39b67016ffb64d0a)), closes [#I3Z9DP](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Z9DP)
|
* 修改DoNanoSleep 以纳秒为单位 ([6917e08](https://gitee.com/openharmony/kernel_liteos_a/commits/6917e08431689ccbd5a30e9a39b67016ffb64d0a)), closes [#I3Z9](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Z9)
|
||||||
* 修改某些平台保存bbox日志失败的问题 ([8f6a1dd](https://gitee.com/openharmony/kernel_liteos_a/commits/8f6a1dd33c59164070e8d2fb5abbd3e76ef8ac8e)), closes [#I41UTP](https://gitee.com/openharmony/kernel_liteos_a/issues/I41UTP)
|
* 修改某些平台保存bbox日志失败的问题 ([8f6a1dd](https://gitee.com/openharmony/kernel_liteos_a/commits/8f6a1dd33c59164070e8d2fb5abbd3e76ef8ac8e)), closes [#I41](https://gitee.com/openharmony/kernel_liteos_a/issues/I41)
|
||||||
* 修改默认窗口宽度到400 ([09c491c](https://gitee.com/openharmony/kernel_liteos_a/commits/09c491ca1fd6d3110eafb0d07e45b25bdc3bd5d0)), closes [#I40LQX](https://gitee.com/openharmony/kernel_liteos_a/issues/I40LQX)
|
* 修改默认窗口宽度到400 ([09c491c](https://gitee.com/openharmony/kernel_liteos_a/commits/09c491ca1fd6d3110eafb0d07e45b25bdc3bd5d0)), closes [#I40](https://gitee.com/openharmony/kernel_liteos_a/issues/I40)
|
||||||
* 关闭jffs和fat后，rootfs配置也被相应关闭，导致nand介质的rootfs不可用。 ([0ea476b](https://gitee.com/openharmony/kernel_liteos_a/commits/0ea476b9741fabd3c255c2770688f587920cf509)), closes [#I3SBYN](https://gitee.com/openharmony/kernel_liteos_a/issues/I3SBYN)
|
* 关闭jffs和fat后，rootfs配置也被相应关闭，导致nand介质的rootfs不可用。 ([0ea476b](https://gitee.com/openharmony/kernel_liteos_a/commits/0ea476b9741fabd3c255c2770688f587920cf509)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* 内核态在console初始化完成后，使用printf无法正常打印 ([44ce696](https://gitee.com/openharmony/kernel_liteos_a/commits/44ce6969048c2e252f3f9d66fa485c77bdab8ae7)), closes [#I3UG00](https://gitee.com/openharmony/kernel_liteos_a/issues/I3UG00)
|
* 内核态在console初始化完成后，使用printf无法正常打印 ([44ce696](https://gitee.com/openharmony/kernel_liteos_a/commits/44ce6969048c2e252f3f9d66fa485c77bdab8ae7)), closes [#I3UG00](https://gitee.com/openharmony/kernel_liteos_a/issues/I3UG00)
|
||||||
* 去掉冗余的strip操作 ([7819d15](https://gitee.com/openharmony/kernel_liteos_a/commits/7819d15b3619681ae37a1349a6bec2440c829ae9)), closes [#I43767](https://gitee.com/openharmony/kernel_liteos_a/issues/I43767)
|
* 去掉冗余的strip操作 ([7819d15](https://gitee.com/openharmony/kernel_liteos_a/commits/7819d15b3619681ae37a1349a6bec2440c829ae9)), closes [#I43767](https://gitee.com/openharmony/kernel_liteos_a/issues/I43767)
|
||||||
* 合并进程栈两个地址连续的region ([42f374d](https://gitee.com/openharmony/kernel_liteos_a/commits/42f374dd7a353f1c8227e92fa92827c1c7b32424)), closes [#I43QYJ](https://gitee.com/openharmony/kernel_liteos_a/issues/I43QYJ)
|
* 合并进程栈两个地址连续的region ([42f374d](https://gitee.com/openharmony/kernel_liteos_a/commits/42f374dd7a353f1c8227e92fa92827c1c7b32424)), closes [#I43](https://gitee.com/openharmony/kernel_liteos_a/issues/I43)
|
||||||
* 在内核提示No idle TCB时，增加打印当前系统任务信息，以方便问题定位。 ([11a9b00](https://gitee.com/openharmony/kernel_liteos_a/commits/11a9b00d43a6dbe9fba9f6eb07d78a9d226c28f8)), closes [#I434UC](https://gitee.com/openharmony/kernel_liteos_a/issues/I434UC)
|
* 在内核提示No idle TCB时，增加打印当前系统任务信息，以方便问题定位。 ([11a9b00](https://gitee.com/openharmony/kernel_liteos_a/commits/11a9b00d43a6dbe9fba9f6eb07d78a9d226c28f8)), closes [#I434](https://gitee.com/openharmony/kernel_liteos_a/issues/I434)
|
||||||
* 增加表头，内容以制表符分栏。 ([e9ad6b7](https://gitee.com/openharmony/kernel_liteos_a/commits/e9ad6b71c3b1136414672cd21b339ded7a02dfb9)), closes [#I3W2M9](https://gitee.com/openharmony/kernel_liteos_a/issues/I3W2M9)
|
* 增加表头，内容以制表符分栏。 ([e9ad6b7](https://gitee.com/openharmony/kernel_liteos_a/commits/e9ad6b71c3b1136414672cd21b339ded7a02dfb9)), closes [#I3W2M9](https://gitee.com/openharmony/kernel_liteos_a/issues/I3W2M9)
|
||||||
* 将用户态内存调测解析脚本移至tools目录下 ([85b4cb7](https://gitee.com/openharmony/kernel_liteos_a/commits/85b4cb7a67b717984d3ebf68115c7139cc61d690)), closes [#I42T9A](https://gitee.com/openharmony/kernel_liteos_a/issues/I42T9A)
|
* 将用户态内存调测解析脚本移至tools目录下 ([85b4cb7](https://gitee.com/openharmony/kernel_liteos_a/commits/85b4cb7a67b717984d3ebf68115c7139cc61d690)), closes [#I42T9](https://gitee.com/openharmony/kernel_liteos_a/issues/I42T9)
|
||||||
* 恢复了FATFS设置卷标的功能 ([9515d53](https://gitee.com/openharmony/kernel_liteos_a/commits/9515d53dccc9a6458bfbaf8e15143928f05cb660)), closes [#I3Y5G8](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Y5G8)
|
* 恢复了FATFS设置卷标的功能 ([9515d53](https://gitee.com/openharmony/kernel_liteos_a/commits/9515d53dccc9a6458bfbaf8e15143928f05cb660)), closes [#I3Y5G8](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Y5G8)
|
||||||
* 解决kill进程时无法保证进程的已持有的内核资源合理释放. ([cf89f01](https://gitee.com/openharmony/kernel_liteos_a/commits/cf89f016e93f28f8d72e6f5de08640d08a155908)), closes [#I3S0N0](https://gitee.com/openharmony/kernel_liteos_a/issues/I3S0N0)
|
* 解决kill进程时无法保证进程的已持有的内核资源合理释放. ([cf89f01](https://gitee.com/openharmony/kernel_liteos_a/commits/cf89f016e93f28f8d72e6f5de08640d08a155908)), closes [#I3S0N0](https://gitee.com/openharmony/kernel_liteos_a/issues/I3S0N0)
|
||||||
* 解决不同环境下计算的rootfs的size偏小，导致mcopy造成的disk full错误 ([c54879b](https://gitee.com/openharmony/kernel_liteos_a/commits/c54879b54875abece53b1f64072cfacbd2e1970e)), closes [#I3IA06](https://gitee.com/openharmony/kernel_liteos_a/issues/I3IA06)
|
* 解决不同环境下计算的rootfs的size偏小，导致mcopy造成的disk full错误 ([c54879b](https://gitee.com/openharmony/kernel_liteos_a/commits/c54879b54875abece53b1f64072cfacbd2e1970e)), closes [#I3IA06](https://gitee.com/openharmony/kernel_liteos_a/issues/I3IA06)
|
||||||
* 设置qemu默认userfs大小/修改qemu驱动目录 ([1d952a2](https://gitee.com/openharmony/kernel_liteos_a/commits/1d952a254a6e7ec2f70f7112eb27355cfd01ba4d)), closes [#I3XW96](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XW96)
|
* 设置qemu默认userfs大小/修改qemu驱动目录 ([1d952a2](https://gitee.com/openharmony/kernel_liteos_a/commits/1d952a254a6e7ec2f70f7112eb27355cfd01ba4d)), closes [#I3XW96](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XW96) [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
|
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
* active mksh & toybox ([cacb4f0](https://gitee.com/openharmony/kernel_liteos_a/commits/cacb4f0103ecb2d1b7af54d84957f88d3e9443d2)), closes [#I3VEOG](https://gitee.com/openharmony/kernel_liteos_a/issues/I3VEOG)
|
* active mksh & toybox ([cacb4f0](https://gitee.com/openharmony/kernel_liteos_a/commits/cacb4f0103ecb2d1b7af54d84957f88d3e9443d2)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* Add /dev/quickstart to support synchronous communication between processes in user mode startup. ([46b63f7](https://gitee.com/openharmony/kernel_liteos_a/commits/46b63f71537789743ed2f3f337c1809ee4900d71)), closes [#I3OHO5](https://gitee.com/openharmony/kernel_liteos_a/issues/I3OHO5)
|
* Add /dev/quickstart to support synchronous communication between processes in user mode startup. ([46b63f7](https://gitee.com/openharmony/kernel_liteos_a/commits/46b63f71537789743ed2f3f337c1809ee4900d71)), closes [#I3OHO5](https://gitee.com/openharmony/kernel_liteos_a/issues/I3OHO5)
|
||||||
* add /proc/fd file to dump the pid/fd/path information ([600dded](https://gitee.com/openharmony/kernel_liteos_a/commits/600dded31e80df275ed08c326c0ce3d1857d8dd8)), closes [#I3WB5U](https://gitee.com/openharmony/kernel_liteos_a/issues/I3WB5U)
|
* add /proc/fd file to dump the pid/fd/path information ([600dded](https://gitee.com/openharmony/kernel_liteos_a/commits/600dded31e80df275ed08c326c0ce3d1857d8dd8)), closes [#I3WB5](https://gitee.com/openharmony/kernel_liteos_a/issues/I3WB5)
|
||||||
* add /proc/fs_cache to display cache info ([231cb6b](https://gitee.com/openharmony/kernel_liteos_a/commits/231cb6be27380948bc48136ae2e02c28450f47a8)), closes [#I3WWBD](https://gitee.com/openharmony/kernel_liteos_a/issues/I3WWBD)
|
* add /proc/fs_cache to display cache info ([231cb6b](https://gitee.com/openharmony/kernel_liteos_a/commits/231cb6be27380948bc48136ae2e02c28450f47a8)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* add /proc/fs_cache to display cache info ([53c6d96](https://gitee.com/openharmony/kernel_liteos_a/commits/53c6d96c6f97cb006216769f8b73f50fba3bc325)), closes [#I3WESD](https://gitee.com/openharmony/kernel_liteos_a/issues/I3WESD)
|
* add /proc/fs_cache to display cache info ([53c6d96](https://gitee.com/openharmony/kernel_liteos_a/commits/53c6d96c6f97cb006216769f8b73f50fba3bc325)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* add and fix some syscall ([ce849f2](https://gitee.com/openharmony/kernel_liteos_a/commits/ce849f2145e1569517c5244c9ffcaebed53f3a66))
|
* add and fix some syscall ([ce849f2](https://gitee.com/openharmony/kernel_liteos_a/commits/ce849f2145e1569517c5244c9ffcaebed53f3a66))
|
||||||
* add blackbox for liteos_a ([a195aac](https://gitee.com/openharmony/kernel_liteos_a/commits/a195aac9fb60b0163f9eebb29084287d226bd14c)), closes [#I406NP](https://gitee.com/openharmony/kernel_liteos_a/issues/I406NP)
|
* add blackbox for liteos_a ([a195aac](https://gitee.com/openharmony/kernel_liteos_a/commits/a195aac9fb60b0163f9eebb29084287d226bd14c)), closes [#I406](https://gitee.com/openharmony/kernel_liteos_a/issues/I406)
|
||||||
* add blackbox for liteos_a ([425975e](https://gitee.com/openharmony/kernel_liteos_a/commits/425975e4811023e31a520979c20ea2562224d9d0))
|
* add blackbox for liteos_a ([425975e](https://gitee.com/openharmony/kernel_liteos_a/commits/425975e4811023e31a520979c20ea2562224d9d0)), closes [#I3NN7](https://gitee.com/openharmony/kernel_liteos_a/issues/I3NN7)
|
||||||
* add clear cache cmd to /proc/fs_cache ([3d1cf68](https://gitee.com/openharmony/kernel_liteos_a/commits/3d1cf683f37a6f75e9db2ce1f11ec93159b77663)), closes [#I3XLPH](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XLPH)
|
* add clear cache cmd to /proc/fs_cache ([3d1cf68](https://gitee.com/openharmony/kernel_liteos_a/commits/3d1cf683f37a6f75e9db2ce1f11ec93159b77663)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* add liteos patch ability ([98ca844](https://gitee.com/openharmony/kernel_liteos_a/commits/98ca8441fe75ee1c3318a6a09376fd72f5a51350))
|
* add liteos patch ability ([98ca844](https://gitee.com/openharmony/kernel_liteos_a/commits/98ca8441fe75ee1c3318a6a09376fd72f5a51350))
|
||||||
* add support for gn build system ([a8805a6](https://gitee.com/openharmony/kernel_liteos_a/commits/a8805a65aab9109b915364fccf36c8328f636e48))
|
* add support for gn build system ([a8805a6](https://gitee.com/openharmony/kernel_liteos_a/commits/a8805a65aab9109b915364fccf36c8328f636e48))
|
||||||
* add uid/gid for ProcFs ([6780659](https://gitee.com/openharmony/kernel_liteos_a/commits/67806596a3c0df9a54893d8c74ebe9da98d7fb06)), closes [#I3WGVP](https://gitee.com/openharmony/kernel_liteos_a/issues/I3WGVP)
|
* add uid/gid for ProcFs ([6780659](https://gitee.com/openharmony/kernel_liteos_a/commits/67806596a3c0df9a54893d8c74ebe9da98d7fb06)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* A核proc文件系统在echo模式下新增write的功能 ([f10dd7c](https://gitee.com/openharmony/kernel_liteos_a/commits/f10dd7c135d37a5fb0d78610d5ece5807d01eb1f)), closes [#I3T6MZ](https://gitee.com/openharmony/kernel_liteos_a/issues/I3T6MZ)
|
* A核proc文件系统在echo模式下新增write的功能 ([f10dd7c](https://gitee.com/openharmony/kernel_liteos_a/commits/f10dd7c135d37a5fb0d78610d5ece5807d01eb1f)), closes [#I3T6](https://gitee.com/openharmony/kernel_liteos_a/issues/I3T6)
|
||||||
* build OHOS_Image from kernel ([abf4d8f](https://gitee.com/openharmony/kernel_liteos_a/commits/abf4d8fb252631aca9d46211762880a23be2a0b1))
|
* build OHOS_Image from kernel ([abf4d8f](https://gitee.com/openharmony/kernel_liteos_a/commits/abf4d8fb252631aca9d46211762880a23be2a0b1))
|
||||||
* **build:** make liteos_config_file available as gn argument ([f9a9077](https://gitee.com/openharmony/kernel_liteos_a/commits/f9a907772f506ca7e2d84e96d4d17cffc7dae50f))
|
* **build:** make liteos_config_file available as gn argument ([f9a9077](https://gitee.com/openharmony/kernel_liteos_a/commits/f9a907772f506ca7e2d84e96d4d17cffc7dae50f))
|
||||||
* **build:** 使用xts -notest选项时，内核用例不参与编译构建和用例编译配置方式调整 ([9bdf716](https://gitee.com/openharmony/kernel_liteos_a/commits/9bdf716407c125c9877b6f49c2133112c18cdabc))
|
* **build:** 使用xts -notest选项时，内核用例不参与编译构建和用例编译配置方式调整 ([9bdf716](https://gitee.com/openharmony/kernel_liteos_a/commits/9bdf716407c125c9877b6f49c2133112c18cdabc))
|
||||||
* don't apply module_swith on configs of config ([f3beb4b](https://gitee.com/openharmony/kernel_liteos_a/commits/f3beb4b273c9a76fbfaffe57302f27d2a74cd2ba))
|
* don't apply module_swith on configs of config ([f3beb4b](https://gitee.com/openharmony/kernel_liteos_a/commits/f3beb4b273c9a76fbfaffe57302f27d2a74cd2ba))
|
||||||
* enable gn build for toybox and mksh ([c54bfa1](https://gitee.com/openharmony/kernel_liteos_a/commits/c54bfa16e3907482c252e9738192df869c63326e))
|
* enable gn build for toybox and mksh ([c54bfa1](https://gitee.com/openharmony/kernel_liteos_a/commits/c54bfa16e3907482c252e9738192df869c63326e))
|
||||||
* fatfs支持符号链接功能 ([e50cf0b](https://gitee.com/openharmony/kernel_liteos_a/commits/e50cf0be6f6d118022b6d79c5177aece574ba150)), closes [#I3V8D1](https://gitee.com/openharmony/kernel_liteos_a/issues/I3V8D1)
|
* fatfs支持符号链接功能 ([e50cf0b](https://gitee.com/openharmony/kernel_liteos_a/commits/e50cf0be6f6d118022b6d79c5177aece574ba150)), closes [#I3V8D1](https://gitee.com/openharmony/kernel_liteos_a/issues/I3V8D1)
|
||||||
* **file system:** add memory-based romfs ([c4595d2](https://gitee.com/openharmony/kernel_liteos_a/commits/c4595d25042b188570d991a815009764c37f3cb3)), closes [#I3S0CP](https://gitee.com/openharmony/kernel_liteos_a/issues/I3S0CP)
|
* **file system:** add memory-based romfs ([c4595d2](https://gitee.com/openharmony/kernel_liteos_a/commits/c4595d25042b188570d991a815009764c37f3cb3)), closes [#I3S0](https://gitee.com/openharmony/kernel_liteos_a/issues/I3S0)
|
||||||
* introduce mksh toybox to rootfs ([41c7689](https://gitee.com/openharmony/kernel_liteos_a/commits/41c7689dfa49c52fb15705ce15ef22a278fbf2ef))
|
* introduce mksh toybox to rootfs ([41c7689](https://gitee.com/openharmony/kernel_liteos_a/commits/41c7689dfa49c52fb15705ce15ef22a278fbf2ef))
|
||||||
* L0-L1 支持Trace ([dc9ec68](https://gitee.com/openharmony/kernel_liteos_a/commits/dc9ec6856fe14aa604f037f55f17a3ba2bafb098)), closes [#I46WA0](https://gitee.com/openharmony/kernel_liteos_a/issues/I46WA0)
|
* L0-L1 支持Trace ([dc9ec68](https://gitee.com/openharmony/kernel_liteos_a/commits/dc9ec6856fe14aa604f037f55f17a3ba2bafb098)), closes [#I46WA0](https://gitee.com/openharmony/kernel_liteos_a/issues/I46WA0)
|
||||||
* L1支持低功耗投票框架 ([21d8ac8](https://gitee.com/openharmony/kernel_liteos_a/commits/21d8ac8752469f6e0dc2d50d28b75421f665385a)), closes [#I3VS5N](https://gitee.com/openharmony/kernel_liteos_a/issues/I3VS5N)
|
* L1支持低功耗投票框架 ([21d8ac8](https://gitee.com/openharmony/kernel_liteos_a/commits/21d8ac8752469f6e0dc2d50d28b75421f665385a)), closes [#I3VS5](https://gitee.com/openharmony/kernel_liteos_a/issues/I3VS5)
|
||||||
* **libc:** upgrade optimized-routines to v21.02 ([1ec8d5a](https://gitee.com/openharmony/kernel_liteos_a/commits/1ec8d5a454658e95c4acb821d0878f357f4e82ad))
|
* **libc:** upgrade optimized-routines to v21.02 ([1ec8d5a](https://gitee.com/openharmony/kernel_liteos_a/commits/1ec8d5a454658e95c4acb821d0878f357f4e82ad))
|
||||||
* **make:** optimize makefiles and remove some unused files ([0e26094](https://gitee.com/openharmony/kernel_liteos_a/commits/0e260949c962158a263d4b0ad45fe9f6843d6e30))
|
* **make:** optimize makefiles and remove some unused files ([0e26094](https://gitee.com/openharmony/kernel_liteos_a/commits/0e260949c962158a263d4b0ad45fe9f6843d6e30))
|
||||||
* Open macro for ADC moudule ([c71ec9d](https://gitee.com/openharmony/kernel_liteos_a/commits/c71ec9d7e8574078a9dc2a8463f3141cca3d625a))
|
* Open macro for ADC moudule ([c71ec9d](https://gitee.com/openharmony/kernel_liteos_a/commits/c71ec9d7e8574078a9dc2a8463f3141cca3d625a))
|
||||||
* **QEMU_ARM_VIRT_CA7:** 使能FAT文件系统编译选项 ([49856dc](https://gitee.com/openharmony/kernel_liteos_a/commits/49856dc1e0de1c5e92346c83eda641dfb1bb16be))
|
* **QEMU_ARM_VIRT_CA7:** 使能FAT文件系统编译选项 ([49856dc](https://gitee.com/openharmony/kernel_liteos_a/commits/49856dc1e0de1c5e92346c83eda641dfb1bb16be))
|
||||||
* support .mkshrc ([51a50c9](https://gitee.com/openharmony/kernel_liteos_a/commits/51a50c95b4cd47b6931523926b728d1c0ff8988b)), closes [#I3Y5KE](https://gitee.com/openharmony/third_party_mksh/issues/I3Y5KE)
|
* support .mkshrc ([51a50c9](https://gitee.com/openharmony/kernel_liteos_a/commits/51a50c95b4cd47b6931523926b728d1c0ff8988b)), closes [#I3Y5](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Y5)
|
||||||
* support link/symlink/readlink ([6eddc86](https://gitee.com/openharmony/kernel_liteos_a/commits/6eddc869d349be59860bfd84ff10b7579a9b00a9)), closes [#I3Q0OD](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Q0OD)
|
* support link/symlink/readlink ([6eddc86](https://gitee.com/openharmony/kernel_liteos_a/commits/6eddc869d349be59860bfd84ff10b7579a9b00a9)), closes [#I3Q0](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Q0)
|
||||||
* support toybox in qemu ([5618319](https://gitee.com/openharmony/kernel_liteos_a/commits/561831928bb1ad1871b2d60d2bba2d67488cea5f)), closes [#I3V17D](https://gitee.com/openharmony/kernel_liteos_a/issues/I3V17D)
|
* support toybox in qemu ([5618319](https://gitee.com/openharmony/kernel_liteos_a/commits/561831928bb1ad1871b2d60d2bba2d67488cea5f)), closes [#I3V17](https://gitee.com/openharmony/kernel_liteos_a/issues/I3V17)
|
||||||
* timer_create支持以SIGEV_THREAD方式创建定时器 ([e5f6bf0](https://gitee.com/openharmony/kernel_liteos_a/commits/e5f6bf05567c2d193f3746caca502199e7b81e92)), closes [#I3SRFI](https://gitee.com/openharmony/kernel_liteos_a/issues/I3SRFI)
|
* timer_create支持以SIGEV_THREAD方式创建定时器 ([e5f6bf0](https://gitee.com/openharmony/kernel_liteos_a/commits/e5f6bf05567c2d193f3746caca502199e7b81e92)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_a/issues/I3)
|
||||||
* using kconfiglib instead of kconfig ([8784694](https://gitee.com/openharmony/kernel_liteos_a/commits/878469468647a19f704e7ee2af696b0ba8ab775a))
|
* using kconfiglib instead of kconfig ([8784694](https://gitee.com/openharmony/kernel_liteos_a/commits/878469468647a19f704e7ee2af696b0ba8ab775a))
|
||||||
* vfs support sdcard hotplug ([2db80ec](https://gitee.com/openharmony/kernel_liteos_a/commits/2db80ecb389176b53c77807567895470bb180a06)), closes [#I44WH1](https://gitee.com/openharmony/kernel_liteos_a/issues/I44WH1)
|
* vfs support sdcard hotplug ([2db80ec](https://gitee.com/openharmony/kernel_liteos_a/commits/2db80ecb389176b53c77807567895470bb180a06)), closes [#I44WH1](https://gitee.com/openharmony/kernel_liteos_a/issues/I44WH1)
|
||||||
* **vfs:** vfs支持FD_CLOEXEC标记 ([27dca4d](https://gitee.com/openharmony/kernel_liteos_a/commits/27dca4d857ef8de6b4bb9302e0dd435be7e3284f)), closes [#I3U81W](https://gitee.com/openharmony/kernel_liteos_a/issues/I3U81W)
|
* **vfs:** vfs支持FD_CLOEXEC标记 ([27dca4d](https://gitee.com/openharmony/kernel_liteos_a/commits/27dca4d857ef8de6b4bb9302e0dd435be7e3284f)), closes [#I3U81](https://gitee.com/openharmony/kernel_liteos_a/issues/I3U81)
|
||||||
* 删除zpfs冗余代码 ([3393479](https://gitee.com/openharmony/kernel_liteos_a/commits/3393479c52f4a9dfe2394bb32beb4b98fca8e171))
|
* 删除zpfs冗余代码 ([3393479](https://gitee.com/openharmony/kernel_liteos_a/commits/3393479c52f4a9dfe2394bb32beb4b98fca8e171))
|
||||||
* 基于汇编实现内核对用户态内存清零的功能 ([9db3407](https://gitee.com/openharmony/kernel_liteos_a/commits/9db3407589bb0b2d4a5772faac3130032bc0b8a9)), closes [#I3XXT0](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XXT0)
|
* 基于汇编实现内核对用户态内存清零的功能 ([9db3407](https://gitee.com/openharmony/kernel_liteos_a/commits/9db3407589bb0b2d4a5772faac3130032bc0b8a9)), closes [#I3XXT0](https://gitee.com/openharmony/kernel_liteos_a/issues/I3XXT0)
|
||||||
* 增加mount的MS_RDONLY标志的支持 ([8729f6e](https://gitee.com/openharmony/kernel_liteos_a/commits/8729f6ee57ea57bc664d076ff112c8726fedded9)), closes [#I3Z1W6](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Z1W6)
|
* 增加mount的MS_RDONLY标志的支持 ([8729f6e](https://gitee.com/openharmony/kernel_liteos_a/commits/8729f6ee57ea57bc664d076ff112c8726fedded9)), closes [#I3Z1W6](https://gitee.com/openharmony/kernel_liteos_a/issues/I3Z1W6)
|
||||||
* 支持killpg和waitid ([dc3cc09](https://gitee.com/openharmony/kernel_liteos_a/commits/dc3cc094a75c6da65d87522930afea06106d3933))
|
* 支持killpg和waitid ([dc3cc09](https://gitee.com/openharmony/kernel_liteos_a/commits/dc3cc094a75c6da65d87522930afea06106d3933))
|
||||||
* 新增toybox reboot命令 ([e567a10](https://gitee.com/openharmony/kernel_liteos_a/commits/e567a10d021c3e0fe02d6911dbe8687255c67ffa)), closes [#I3YQ7S](https://gitee.com/openharmony/third_party_toybox/issues/I3YQ7S)
|
* 新增toybox reboot命令 ([e567a10](https://gitee.com/openharmony/kernel_liteos_a/commits/e567a10d021c3e0fe02d6911dbe8687255c67ffa)), closes [#I3YQ7](https://gitee.com/openharmony/kernel_liteos_a/issues/I3YQ7)
|
||||||
* 给开发者提供系统信息导出Hidumper工具。 ([cb17fa5](https://gitee.com/openharmony/kernel_liteos_a/commits/cb17fa50ed28e6e8f59b7d68ede13c759b983311))
|
* 给开发者提供系统信息导出Hidumper工具。 ([cb17fa5](https://gitee.com/openharmony/kernel_liteos_a/commits/cb17fa50ed28e6e8f59b7d68ede13c759b983311)), closes [#I3NN7](https://gitee.com/openharmony/kernel_liteos_a/issues/I3NN7)
|
||||||
* 自研shell命令回补 ([7bc68f4](https://gitee.com/openharmony/kernel_liteos_a/commits/7bc68f454ff5fbf415712c9b8479b8c832f68417)), closes [#I44U0H](https://gitee.com/openharmony/third_party_toybox/issues/I44U0H)
|
* 自研shell命令回补 ([7bc68f4](https://gitee.com/openharmony/kernel_liteos_a/commits/7bc68f454ff5fbf415712c9b8479b8c832f68417)), closes [#I44U0](https://gitee.com/openharmony/kernel_liteos_a/issues/I44U0)
|
||||||
|
|
||||||
|
|
||||||
### Performance Improvements
|
### Performance Improvements
|
||||||
|
|
@ -316,7 +316,7 @@ LOS_LmsAddrDisableProtect去能指定内存段的访问保护
|
||||||
|
|
||||||
### Reverts
|
### Reverts
|
||||||
|
|
||||||
* Revert "fix: 修改默认窗口宽度到400" ([1878849](https://gitee.com/openharmony/kernel_liteos_a/commits/187884937cd087e39a28c033c41033163d6b4766)), closes [#I42X9V](https://gitee.com/openharmony/kernel_liteos_a/issues/I42X9V)
|
* Revert "fix: 修改默认窗口宽度到400" ([1878849](https://gitee.com/openharmony/kernel_liteos_a/commits/187884937cd087e39a28c033c41033163d6b4766)), closes [#I42X9](https://gitee.com/openharmony/kernel_liteos_a/issues/I42X9)
|
||||||
|
|
||||||
|
|
||||||
### BREAKING CHANGES
|
### BREAKING CHANGES
|
||||||
|
|
|
||||||
7
Kconfig
7
Kconfig
|
|
@ -235,12 +235,7 @@ config SCHED_DEBUG
|
||||||
depends on DEBUG_VERSION
|
depends on DEBUG_VERSION
|
||||||
help
|
help
|
||||||
If you wish to build LiteOS with support for sched debug.
|
If you wish to build LiteOS with support for sched debug.
|
||||||
config SCHED_EDF_DEBUG
|
|
||||||
bool "Enable sched EDF debug Feature"
|
|
||||||
default n
|
|
||||||
depends on SCHED_DEBUG
|
|
||||||
help
|
|
||||||
If you wish to build LiteOS with support for sched debug.
|
|
||||||
config USER_INIT_DEBUG
|
config USER_INIT_DEBUG
|
||||||
bool "Enable user init Debug"
|
bool "Enable user init Debug"
|
||||||
default n
|
default n
|
||||||
|
|
|
||||||
2
OAT.xml
2
OAT.xml
|
|
@ -65,8 +65,6 @@
|
||||||
<!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
|
<!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
|
||||||
</filefilter>
|
</filefilter>
|
||||||
<filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies">
|
<filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies">
|
||||||
<filteritem type="filepath" name="figures/architecture-of-the-openharmony-liteos-cortex-a-kernel.png" desc="architecture-of-the-openharmony-liteos-cortex-a-kernel"/>
|
|
||||||
<filteritem type="filepath" name="figures/OpenHarmony-LiteOS-A内核架构图.png" desc="LiteOS-A内核架构图"/>
|
|
||||||
<!--filteritem type="filename" name="*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
|
<!--filteritem type="filename" name="*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
|
||||||
<!--filteritem type="filepath" name="abcdefg/.*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
|
<!--filteritem type="filepath" name="abcdefg/.*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
|
||||||
<!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
|
<!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@ For compilation, please refer to the [compilation instructions](https://gitee.co
|
||||||
|
|
||||||
## Contribution<a name="section1371123476304"></a>
|
## Contribution<a name="section1371123476304"></a>
|
||||||
|
|
||||||
[How to involve](https://gitee.com/openharmony/docs/blob/HEAD/en/contribute/contribution-guide.md)
|
[How to involve](https://gitee.com/openharmony/docs/blob/HEAD/en/contribute/contribution.md)
|
||||||
|
|
||||||
[Commit message spec](https://gitee.com/openharmony/kernel_liteos_a/wikis/Commit%20message%20%E8%A7%84%E8%8C%83)
|
[Commit message spec](https://gitee.com/openharmony/kernel_liteos_a/wikis/Commit%20message%20%E8%A7%84%E8%8C%83)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -87,8 +87,6 @@ OpenHarmony LiteOS-A内核支持[Hi3516DV300](https://gitee.com/openharmony/docs
|
||||||
|
|
||||||
编译可以参考：[编译指导](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-pkg-3516-build.md)
|
编译可以参考：[编译指导](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-pkg-3516-build.md)
|
||||||
|
|
||||||
测试参考:[单元测试](testsuites/unittest/tools/README.md)
|
|
||||||
|
|
||||||
## 贡献<a name="section1371123476304"></a>
|
## 贡献<a name="section1371123476304"></a>
|
||||||
|
|
||||||
[如何贡献](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/contribute/%E5%8F%82%E4%B8%8E%E8%B4%A1%E7%8C%AE.md)
|
[如何贡献](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/contribute/%E5%8F%82%E4%B8%8E%E8%B4%A1%E7%8C%AE.md)
|
||||||
|
|
|
||||||
|
|
@ -73,5 +73,5 @@ executable("sample_usr_lms") {
|
||||||
"-Wl,--wrap=strcpy",
|
"-Wl,--wrap=strcpy",
|
||||||
"-Wl,--wrap=strcat",
|
"-Wl,--wrap=strcat",
|
||||||
]
|
]
|
||||||
deps = [ "$LITEOSTOPDIR/kernel/extended/lms/usr:usrlmslib" ]
|
deps = [ "//kernel/liteos_a/kernel/extended/lms/usr:usrlmslib" ]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
import("//build/lite/config/component/lite_component.gni")
|
import("//build/lite/config/component/lite_component.gni")
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_MKSH_DIR/mksh.gni")
|
import("//third_party/mksh/mksh.gni")
|
||||||
|
|
||||||
group("mksh") {
|
group("mksh") {
|
||||||
deps = [ ":build_mksh" ]
|
deps = [ ":build_mksh" ]
|
||||||
|
|
@ -42,7 +42,7 @@ copy("copy_mksh_src") {
|
||||||
|
|
||||||
build_ext_component("build_mksh") {
|
build_ext_component("build_mksh") {
|
||||||
deps = [ ":copy_mksh_src" ]
|
deps = [ ":copy_mksh_src" ]
|
||||||
deps += [ "$THIRDPARTY_MUSL_DIR:sysroot_lite" ]
|
deps += [ "//third_party/musl:sysroot_lite" ]
|
||||||
exec_path = rebase_path("$target_out_dir/mksh_build")
|
exec_path = rebase_path("$target_out_dir/mksh_build")
|
||||||
|
|
||||||
cflags = [
|
cflags = [
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@
|
||||||
|
|
||||||
ShellCB *g_shellCB = NULL;
|
ShellCB *g_shellCB = NULL;
|
||||||
|
|
||||||
ShellCB *OsGetShellCb(void)
|
ShellCB *OsGetShellCb()
|
||||||
{
|
{
|
||||||
return g_shellCB;
|
return g_shellCB;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
import("//build/lite/config/component/lite_component.gni")
|
import("//build/lite/config/component/lite_component.gni")
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_TOYBOX_DIR/toybox.gni")
|
import("//third_party/toybox/toybox.gni")
|
||||||
|
|
||||||
group("toybox") {
|
group("toybox") {
|
||||||
deps = [ ":build_toybox" ]
|
deps = [ ":build_toybox" ]
|
||||||
|
|
@ -51,7 +51,7 @@ build_ext_component("build_toybox") {
|
||||||
":copy_toybox_config",
|
":copy_toybox_config",
|
||||||
":copy_toybox_src",
|
":copy_toybox_src",
|
||||||
]
|
]
|
||||||
deps += [ "$THIRDPARTY_MUSL_DIR:sysroot_lite" ]
|
deps += [ "//third_party/musl:sysroot_lite" ]
|
||||||
exec_path = rebase_path("$target_out_dir/toybox_build")
|
exec_path = rebase_path("$target_out_dir/toybox_build")
|
||||||
|
|
||||||
cflags = [
|
cflags = [
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,11 @@
|
||||||
"component": {
|
"component": {
|
||||||
"name": "liteos_a",
|
"name": "liteos_a",
|
||||||
"subsystem": "kernel",
|
"subsystem": "kernel",
|
||||||
|
"syscap": [
|
||||||
|
"SystemCapability.Kernel.liteos-a"
|
||||||
|
],
|
||||||
"features": [],
|
"features": [],
|
||||||
"adapted_system_type": [
|
"adated_system_type": [
|
||||||
"small"
|
"small"
|
||||||
],
|
],
|
||||||
"rom": "1.5MB",
|
"rom": "1.5MB",
|
||||||
|
|
|
||||||
|
|
@ -270,7 +270,6 @@ STATIC INT32 DoMqueueClose(struct mqpersonal *privateMqPersonal)
|
||||||
{
|
{
|
||||||
struct mqarray *mqueueCB = NULL;
|
struct mqarray *mqueueCB = NULL;
|
||||||
struct mqpersonal *tmp = NULL;
|
struct mqpersonal *tmp = NULL;
|
||||||
INT32 ret;
|
|
||||||
|
|
||||||
mqueueCB = privateMqPersonal->mq_posixdes;
|
mqueueCB = privateMqPersonal->mq_posixdes;
|
||||||
if (mqueueCB == NULL || mqueueCB->mq_personal == NULL) {
|
if (mqueueCB == NULL || mqueueCB->mq_personal == NULL) {
|
||||||
|
|
@ -278,12 +277,6 @@ STATIC INT32 DoMqueueClose(struct mqpersonal *privateMqPersonal)
|
||||||
return LOS_NOK;
|
return LOS_NOK;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((mqueueCB->unlinkflag == TRUE) && (privateMqPersonal->mq_next == NULL)) {
|
|
||||||
ret = DoMqueueDelete(mqueueCB);
|
|
||||||
if (ret < 0) {
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* find the personal and remove */
|
/* find the personal and remove */
|
||||||
if (mqueueCB->mq_personal == privateMqPersonal) {
|
if (mqueueCB->mq_personal == privateMqPersonal) {
|
||||||
mqueueCB->mq_personal = privateMqPersonal->mq_next;
|
mqueueCB->mq_personal = privateMqPersonal->mq_next;
|
||||||
|
|
@ -305,6 +298,9 @@ STATIC INT32 DoMqueueClose(struct mqpersonal *privateMqPersonal)
|
||||||
/* free the personal */
|
/* free the personal */
|
||||||
(VOID)LOS_MemFree(OS_SYS_MEM_ADDR, privateMqPersonal);
|
(VOID)LOS_MemFree(OS_SYS_MEM_ADDR, privateMqPersonal);
|
||||||
|
|
||||||
|
if ((mqueueCB->unlinkflag == TRUE) && (mqueueCB->mq_personal == NULL)) {
|
||||||
|
return DoMqueueDelete(mqueueCB);
|
||||||
|
}
|
||||||
return LOS_OK;
|
return LOS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -608,19 +604,17 @@ int OsMqGetAttr(mqd_t personal, struct mq_attr *mqAttr)
|
||||||
struct mqarray *mqueueCB = NULL;
|
struct mqarray *mqueueCB = NULL;
|
||||||
struct mqpersonal *privateMqPersonal = NULL;
|
struct mqpersonal *privateMqPersonal = NULL;
|
||||||
|
|
||||||
(VOID)pthread_mutex_lock(&IPC_QUEUE_MUTEX);
|
|
||||||
privateMqPersonal = MqGetPrivDataBuff(personal);
|
privateMqPersonal = MqGetPrivDataBuff(personal);
|
||||||
if (privateMqPersonal == NULL) {
|
if (privateMqPersonal == NULL) {
|
||||||
(VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mqAttr == NULL) {
|
if (mqAttr == NULL) {
|
||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
(VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
(VOID)pthread_mutex_lock(&IPC_QUEUE_MUTEX);
|
||||||
if (privateMqPersonal->mq_status != MQ_USE_MAGIC) {
|
if (privateMqPersonal->mq_status != MQ_USE_MAGIC) {
|
||||||
errno = EBADF;
|
errno = EBADF;
|
||||||
(VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
|
(VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
|
||||||
|
|
@ -640,19 +634,17 @@ int OsMqSetAttr(mqd_t personal, const struct mq_attr *mqSetAttr, struct mq_attr
|
||||||
{
|
{
|
||||||
struct mqpersonal *privateMqPersonal = NULL;
|
struct mqpersonal *privateMqPersonal = NULL;
|
||||||
|
|
||||||
(VOID)pthread_mutex_lock(&IPC_QUEUE_MUTEX);
|
|
||||||
privateMqPersonal = MqGetPrivDataBuff(personal);
|
privateMqPersonal = MqGetPrivDataBuff(personal);
|
||||||
if (privateMqPersonal == NULL) {
|
if (privateMqPersonal == NULL) {
|
||||||
(VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mqSetAttr == NULL) {
|
if (mqSetAttr == NULL) {
|
||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
(VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
(VOID)pthread_mutex_lock(&IPC_QUEUE_MUTEX);
|
||||||
if (privateMqPersonal->mq_status != MQ_USE_MAGIC) {
|
if (privateMqPersonal->mq_status != MQ_USE_MAGIC) {
|
||||||
errno = EBADF;
|
errno = EBADF;
|
||||||
(VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
|
(VOID)pthread_mutex_unlock(&IPC_QUEUE_MUTEX);
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
|
import("//third_party/NuttX/NuttX.gni")
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_FS_VFS_BLOCK_DEVICE)
|
module_switch = defined(LOSCFG_FS_VFS_BLOCK_DEVICE)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ static ssize_t MemMap(struct file *filep, LosVmMapRegion *region)
|
||||||
VADDR_T vaddr = region->range.base;
|
VADDR_T vaddr = region->range.base;
|
||||||
LosVmSpace *space = LOS_SpaceGet(vaddr);
|
LosVmSpace *space = LOS_SpaceGet(vaddr);
|
||||||
|
|
||||||
if (((paddr + size) >= SYS_MEM_BASE) && (paddr < SYS_MEM_END)) {
|
if ((paddr >= SYS_MEM_BASE) && (paddr < SYS_MEM_END)) {
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -97,5 +97,5 @@ static const struct file_operations_vfs g_memDevOps = {
|
||||||
|
|
||||||
int DevMemRegister(void)
|
int DevMemRegister(void)
|
||||||
{
|
{
|
||||||
return register_driver("/dev/mem", &g_memDevOps, 0644, 0); /* 0644: file mode */
|
return register_driver("/dev/mem", &g_memDevOps, 0666, 0); /* 0666: file mode */
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
|
import("//third_party/NuttX/NuttX.gni")
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_DRIVERS_VIDEO)
|
module_switch = defined(LOSCFG_DRIVERS_VIDEO)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_FATFS_DIR/FatFs.gni")
|
import("//third_party/FatFs/FatFs.gni")
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_FS_FAT)
|
module_switch = defined(LOSCFG_FS_FAT)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ import("//kernel/liteos_a/liteos.gni")
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_FS_JFFS)
|
module_switch = defined(LOSCFG_FS_JFFS)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
linux_path = rebase_path("$KERNEL_LINUX_DIR")
|
linux_path = rebase_path("//kernel/linux/linux-5.10")
|
||||||
out_path = rebase_path(target_out_dir)
|
out_path = rebase_path(target_out_dir)
|
||||||
|
|
||||||
kernel_module(module_name) {
|
kernel_module(module_name) {
|
||||||
|
|
|
||||||
|
|
@ -2311,7 +2311,7 @@ diff -Nupr old/fs/jffs2/erase.c new/fs/jffs2/erase.c
|
||||||
diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||||
--- old/fs/jffs2/file.c 2022-05-09 17:22:53.000000000 +0800
|
--- old/fs/jffs2/file.c 2022-05-09 17:22:53.000000000 +0800
|
||||||
+++ new/fs/jffs2/file.c 2022-05-10 09:43:14.250000000 +0800
|
+++ new/fs/jffs2/file.c 2022-05-10 09:43:14.250000000 +0800
|
||||||
@@ -9,334 +9,31 @@
|
@@ -9,335 +9,30 @@
|
||||||
* For licensing information, see the file 'LICENCE' in this directory.
|
* For licensing information, see the file 'LICENCE' in this directory.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
@ -2348,7 +2348,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||||
- struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
|
- struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
|
||||||
+ /* FIXME: This works only with one file system mounted at a time */
|
+ /* FIXME: This works only with one file system mounted at a time */
|
||||||
int ret;
|
int ret;
|
||||||
|
-
|
||||||
- ret = file_write_and_wait_range(filp, start, end);
|
- ret = file_write_and_wait_range(filp, start, end);
|
||||||
+ ret = jffs2_read_inode_range(c, f, gc_buffer,
|
+ ret = jffs2_read_inode_range(c, f, gc_buffer,
|
||||||
+ offset & ~(PAGE_SIZE-1), PAGE_SIZE);
|
+ offset & ~(PAGE_SIZE-1), PAGE_SIZE);
|
||||||
|
|
@ -2361,10 +2361,8 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||||
- inode_unlock(inode);
|
- inode_unlock(inode);
|
||||||
-
|
-
|
||||||
- return 0;
|
- return 0;
|
||||||
+ return ERR_PTR(ret);
|
-}
|
||||||
+ return gc_buffer;
|
-
|
||||||
}
|
|
||||||
|
|
||||||
-const struct file_operations jffs2_file_operations =
|
-const struct file_operations jffs2_file_operations =
|
||||||
-{
|
-{
|
||||||
- .llseek = generic_file_llseek,
|
- .llseek = generic_file_llseek,
|
||||||
|
|
@ -2389,10 +2387,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||||
-};
|
-};
|
||||||
-
|
-
|
||||||
-const struct address_space_operations jffs2_file_address_operations =
|
-const struct address_space_operations jffs2_file_address_operations =
|
||||||
+void jffs2_gc_release_page(struct jffs2_sb_info *c,
|
-{
|
||||||
+ unsigned char *ptr,
|
|
||||||
+ unsigned long *priv)
|
|
||||||
{
|
|
||||||
- .readpage = jffs2_readpage,
|
- .readpage = jffs2_readpage,
|
||||||
- .write_begin = jffs2_write_begin,
|
- .write_begin = jffs2_write_begin,
|
||||||
- .write_end = jffs2_write_end,
|
- .write_end = jffs2_write_end,
|
||||||
|
|
@ -2448,29 +2443,35 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||||
- ret = jffs2_do_readpage_unlock(pg->mapping->host, pg);
|
- ret = jffs2_do_readpage_unlock(pg->mapping->host, pg);
|
||||||
- mutex_unlock(&f->sem);
|
- mutex_unlock(&f->sem);
|
||||||
- return ret;
|
- return ret;
|
||||||
-}
|
+ return ERR_PTR(ret);
|
||||||
-
|
+ return gc_buffer;
|
||||||
|
}
|
||||||
|
|
||||||
-static int jffs2_write_begin(struct file *filp, struct address_space *mapping,
|
-static int jffs2_write_begin(struct file *filp, struct address_space *mapping,
|
||||||
- loff_t pos, unsigned len, unsigned flags,
|
- loff_t pos, unsigned len, unsigned flags,
|
||||||
- struct page **pagep, void **fsdata)
|
- struct page **pagep, void **fsdata)
|
||||||
-{
|
+void jffs2_gc_release_page(struct jffs2_sb_info *c,
|
||||||
|
+ unsigned char *ptr,
|
||||||
|
+ unsigned long *priv)
|
||||||
|
{
|
||||||
- struct page *pg;
|
- struct page *pg;
|
||||||
- struct inode *inode = mapping->host;
|
- struct inode *inode = mapping->host;
|
||||||
- struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
|
- struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
|
||||||
- struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
|
- struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
|
||||||
- pgoff_t index = pos >> PAGE_SHIFT;
|
- pgoff_t index = pos >> PAGE_SHIFT;
|
||||||
|
- uint32_t pageofs = index << PAGE_SHIFT;
|
||||||
- int ret = 0;
|
- int ret = 0;
|
||||||
-
|
-
|
||||||
- jffs2_dbg(1, "%s()\n", __func__);
|
- jffs2_dbg(1, "%s()\n", __func__);
|
||||||
-
|
-
|
||||||
- if (pos > inode->i_size) {
|
- if (pageofs > inode->i_size) {
|
||||||
- /* Make new hole frag from old EOF to new position */
|
- /* Make new hole frag from old EOF to new page */
|
||||||
- struct jffs2_raw_inode ri;
|
- struct jffs2_raw_inode ri;
|
||||||
- struct jffs2_full_dnode *fn;
|
- struct jffs2_full_dnode *fn;
|
||||||
- uint32_t alloc_len;
|
- uint32_t alloc_len;
|
||||||
-
|
-
|
||||||
- jffs2_dbg(1, "Writing new hole frag 0x%x-0x%x between current EOF and new position\n",
|
- jffs2_dbg(1, "Writing new hole frag 0x%x-0x%x between current EOF and new page\n",
|
||||||
- (unsigned int)inode->i_size, (uint32_t)pos);
|
- (unsigned int)inode->i_size, pageofs);
|
||||||
-
|
-
|
||||||
- ret = jffs2_reserve_space(c, sizeof(ri), &alloc_len,
|
- ret = jffs2_reserve_space(c, sizeof(ri), &alloc_len,
|
||||||
- ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);
|
- ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);
|
||||||
|
|
@ -2490,10 +2491,10 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||||
- ri.mode = cpu_to_jemode(inode->i_mode);
|
- ri.mode = cpu_to_jemode(inode->i_mode);
|
||||||
- ri.uid = cpu_to_je16(i_uid_read(inode));
|
- ri.uid = cpu_to_je16(i_uid_read(inode));
|
||||||
- ri.gid = cpu_to_je16(i_gid_read(inode));
|
- ri.gid = cpu_to_je16(i_gid_read(inode));
|
||||||
- ri.isize = cpu_to_je32((uint32_t)pos);
|
- ri.isize = cpu_to_je32(max((uint32_t)inode->i_size, pageofs));
|
||||||
- ri.atime = ri.ctime = ri.mtime = cpu_to_je32(JFFS2_NOW());
|
- ri.atime = ri.ctime = ri.mtime = cpu_to_je32(JFFS2_NOW());
|
||||||
- ri.offset = cpu_to_je32(inode->i_size);
|
- ri.offset = cpu_to_je32(inode->i_size);
|
||||||
- ri.dsize = cpu_to_je32((uint32_t)pos - inode->i_size);
|
- ri.dsize = cpu_to_je32(pageofs - inode->i_size);
|
||||||
- ri.csize = cpu_to_je32(0);
|
- ri.csize = cpu_to_je32(0);
|
||||||
- ri.compr = JFFS2_COMPR_ZERO;
|
- ri.compr = JFFS2_COMPR_ZERO;
|
||||||
- ri.node_crc = cpu_to_je32(crc32(0, &ri, sizeof(ri)-8));
|
- ri.node_crc = cpu_to_je32(crc32(0, &ri, sizeof(ri)-8));
|
||||||
|
|
@ -2523,7 +2524,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||||
- goto out_err;
|
- goto out_err;
|
||||||
- }
|
- }
|
||||||
- jffs2_complete_reservation(c);
|
- jffs2_complete_reservation(c);
|
||||||
- inode->i_size = pos;
|
- inode->i_size = pageofs;
|
||||||
- mutex_unlock(&f->sem);
|
- mutex_unlock(&f->sem);
|
||||||
- }
|
- }
|
||||||
-
|
-
|
||||||
|
|
@ -6340,7 +6341,7 @@ diff -Nupr old/fs/jffs2/summary.h new/fs/jffs2/summary.h
|
||||||
diff -Nupr old/fs/jffs2/super.c new/fs/jffs2/super.c
|
diff -Nupr old/fs/jffs2/super.c new/fs/jffs2/super.c
|
||||||
--- old/fs/jffs2/super.c 2022-05-09 17:22:53.000000000 +0800
|
--- old/fs/jffs2/super.c 2022-05-09 17:22:53.000000000 +0800
|
||||||
+++ new/fs/jffs2/super.c 2022-05-09 20:09:32.170000000 +0800
|
+++ new/fs/jffs2/super.c 2022-05-09 20:09:32.170000000 +0800
|
||||||
@@ -9,434 +9,188 @@
|
@@ -9,433 +9,188 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
@ -6418,7 +6419,6 @@ diff -Nupr old/fs/jffs2/super.c new/fs/jffs2/super.c
|
||||||
+ c->cleanmarker_size = sizeof(struct jffs2_unknown_node);
|
+ c->cleanmarker_size = sizeof(struct jffs2_unknown_node);
|
||||||
|
|
||||||
- mutex_init(&f->sem);
|
- mutex_init(&f->sem);
|
||||||
- f->target = NULL;
|
|
||||||
- inode_init_once(&f->vfs_inode);
|
- inode_init_once(&f->vfs_inode);
|
||||||
-}
|
-}
|
||||||
+ ret = jffs2_do_mount_fs(c);
|
+ ret = jffs2_do_mount_fs(c);
|
||||||
|
|
@ -8668,7 +8668,7 @@ diff -Nupr old/fs/jffs2/writev.c new/fs/jffs2/writev.c
|
||||||
diff -Nupr old/fs/jffs2/xattr.c new/fs/jffs2/xattr.c
|
diff -Nupr old/fs/jffs2/xattr.c new/fs/jffs2/xattr.c
|
||||||
--- old/fs/jffs2/xattr.c 2022-05-09 17:15:24.360000000 +0800
|
--- old/fs/jffs2/xattr.c 2022-05-09 17:15:24.360000000 +0800
|
||||||
+++ new/fs/jffs2/xattr.c 1970-01-01 08:00:00.000000000 +0800
|
+++ new/fs/jffs2/xattr.c 1970-01-01 08:00:00.000000000 +0800
|
||||||
@@ -1,1352 +0,0 @@
|
@@ -1,1347 +0,0 @@
|
||||||
-/*
|
-/*
|
||||||
- * JFFS2 -- Journalling Flash File System, Version 2.
|
- * JFFS2 -- Journalling Flash File System, Version 2.
|
||||||
- *
|
- *
|
||||||
|
|
@ -9443,10 +9443,10 @@ diff -Nupr old/fs/jffs2/xattr.c new/fs/jffs2/xattr.c
|
||||||
-}
|
-}
|
||||||
-
|
-
|
||||||
-#define XREF_TMPHASH_SIZE (128)
|
-#define XREF_TMPHASH_SIZE (128)
|
||||||
-int jffs2_build_xattr_subsystem(struct jffs2_sb_info *c)
|
-void jffs2_build_xattr_subsystem(struct jffs2_sb_info *c)
|
||||||
-{
|
-{
|
||||||
- struct jffs2_xattr_ref *ref, *_ref;
|
- struct jffs2_xattr_ref *ref, *_ref;
|
||||||
- struct jffs2_xattr_ref **xref_tmphash;
|
- struct jffs2_xattr_ref *xref_tmphash[XREF_TMPHASH_SIZE];
|
||||||
- struct jffs2_xattr_datum *xd, *_xd;
|
- struct jffs2_xattr_datum *xd, *_xd;
|
||||||
- struct jffs2_inode_cache *ic;
|
- struct jffs2_inode_cache *ic;
|
||||||
- struct jffs2_raw_node_ref *raw;
|
- struct jffs2_raw_node_ref *raw;
|
||||||
|
|
@ -9455,12 +9455,9 @@ diff -Nupr old/fs/jffs2/xattr.c new/fs/jffs2/xattr.c
|
||||||
-
|
-
|
||||||
- BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
|
- BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
|
||||||
-
|
-
|
||||||
- xref_tmphash = kcalloc(XREF_TMPHASH_SIZE,
|
|
||||||
- sizeof(struct jffs2_xattr_ref *), GFP_KERNEL);
|
|
||||||
- if (!xref_tmphash)
|
|
||||||
- return -ENOMEM;
|
|
||||||
-
|
|
||||||
- /* Phase.1 : Merge same xref */
|
- /* Phase.1 : Merge same xref */
|
||||||
|
- for (i=0; i < XREF_TMPHASH_SIZE; i++)
|
||||||
|
- xref_tmphash[i] = NULL;
|
||||||
- for (ref=c->xref_temp; ref; ref=_ref) {
|
- for (ref=c->xref_temp; ref; ref=_ref) {
|
||||||
- struct jffs2_xattr_ref *tmp;
|
- struct jffs2_xattr_ref *tmp;
|
||||||
-
|
-
|
||||||
|
|
@ -9558,8 +9555,6 @@ diff -Nupr old/fs/jffs2/xattr.c new/fs/jffs2/xattr.c
|
||||||
- "%u of xref (%u dead, %u orphan) found.\n",
|
- "%u of xref (%u dead, %u orphan) found.\n",
|
||||||
- xdatum_count, xdatum_unchecked_count, xdatum_orphan_count,
|
- xdatum_count, xdatum_unchecked_count, xdatum_orphan_count,
|
||||||
- xref_count, xref_dead_count, xref_orphan_count);
|
- xref_count, xref_dead_count, xref_orphan_count);
|
||||||
- kfree(xref_tmphash);
|
|
||||||
- return 0;
|
|
||||||
-}
|
-}
|
||||||
-
|
-
|
||||||
-struct jffs2_xattr_datum *jffs2_setup_xattr_datum(struct jffs2_sb_info *c,
|
-struct jffs2_xattr_datum *jffs2_setup_xattr_datum(struct jffs2_sb_info *c,
|
||||||
|
|
|
||||||
|
|
@ -490,14 +490,14 @@ off_t VfsJffs2Seek(struct file *filep, off_t offset, int whence)
|
||||||
filePos = filep->f_pos;
|
filePos = filep->f_pos;
|
||||||
|
|
||||||
switch (whence) {
|
switch (whence) {
|
||||||
case SEEK_CUR:
|
|
||||||
filePos += offset;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SEEK_SET:
|
case SEEK_SET:
|
||||||
filePos = offset;
|
filePos = offset;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case SEEK_CUR:
|
||||||
|
filePos += offset;
|
||||||
|
break;
|
||||||
|
|
||||||
case SEEK_END:
|
case SEEK_END:
|
||||||
filePos = node->i_size + offset;
|
filePos = node->i_size + offset;
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
|
import("//third_party/NuttX/NuttX.gni")
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_FS_NFS)
|
module_switch = defined(LOSCFG_FS_NFS)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
|
|
|
||||||
|
|
@ -207,7 +207,7 @@ static const struct ProcFileOperations FS_CACHE_PROC_FOPS = {
|
||||||
|
|
||||||
void ProcFsCacheInit(void)
|
void ProcFsCacheInit(void)
|
||||||
{
|
{
|
||||||
struct ProcDirEntry *pde = CreateProcEntry("fs_cache", 0400, NULL);
|
struct ProcDirEntry *pde = CreateProcEntry("fs_cache", 0, NULL);
|
||||||
if (pde == NULL) {
|
if (pde == NULL) {
|
||||||
PRINT_ERR("create fs_cache error!\n");
|
PRINT_ERR("create fs_cache error!\n");
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -103,8 +103,6 @@ static ssize_t ProcessContainerLink(unsigned int containerID, ContainerType type
|
||||||
|
|
||||||
static ssize_t ProcessContainerReadLink(struct ProcDirEntry *entry, char *buffer, size_t bufLen)
|
static ssize_t ProcessContainerReadLink(struct ProcDirEntry *entry, char *buffer, size_t bufLen)
|
||||||
{
|
{
|
||||||
char *freeBuf = NULL;
|
|
||||||
char *buf = buffer;
|
|
||||||
ssize_t count;
|
ssize_t count;
|
||||||
unsigned int intSave;
|
unsigned int intSave;
|
||||||
if (entry == NULL) {
|
if (entry == NULL) {
|
||||||
|
|
@ -114,41 +112,17 @@ static ssize_t ProcessContainerReadLink(struct ProcDirEntry *entry, char *buffer
|
||||||
if (data == NULL) {
|
if (data == NULL) {
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (LOS_IsUserAddressRange((VADDR_T)(UINTPTR)buffer, bufLen)) {
|
|
||||||
buf = LOS_MemAlloc(m_aucSysMem1, bufLen);
|
|
||||||
if (buf == NULL) {
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
(void)memset_s(buf, bufLen, 0, bufLen);
|
|
||||||
freeBuf = buf;
|
|
||||||
}
|
|
||||||
|
|
||||||
LosProcessCB *processCB = ProcGetProcessCB(data);
|
LosProcessCB *processCB = ProcGetProcessCB(data);
|
||||||
SCHEDULER_LOCK(intSave);
|
SCHEDULER_LOCK(intSave);
|
||||||
UINT32 containerID = OsGetContainerID(processCB, (ContainerType)data->type);
|
UINT32 containerID = OsGetContainerID(processCB, (ContainerType)data->type);
|
||||||
SCHEDULER_UNLOCK(intSave);
|
SCHEDULER_UNLOCK(intSave);
|
||||||
if (containerID != OS_INVALID_VALUE) {
|
if (containerID != OS_INVALID_VALUE) {
|
||||||
count = ProcessContainerLink(containerID, (ContainerType)data->type, buf, bufLen);
|
return ProcessContainerLink(containerID, (ContainerType)data->type, buffer, bufLen);
|
||||||
} else {
|
|
||||||
count = strlen("(unknown)");
|
|
||||||
if (memcpy_s(buf, bufLen, "(unknown)", count + 1) != EOK) {
|
|
||||||
(void)LOS_MemFree(m_aucSysMem1, freeBuf);
|
|
||||||
return -EBADF;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (count < 0) {
|
count = strlen("(unknown)");
|
||||||
(void)LOS_MemFree(m_aucSysMem1, freeBuf);
|
if (memcpy_s(buffer, bufLen, "(unknown)", count + 1) != EOK) {
|
||||||
return count;
|
return -EBADF;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (LOS_IsUserAddressRange((VADDR_T)(UINTPTR)buffer, bufLen)) {
|
|
||||||
if (LOS_ArchCopyToUser(buffer, buf, bufLen) != 0) {
|
|
||||||
(void)LOS_MemFree(m_aucSysMem1, freeBuf);
|
|
||||||
return -EFAULT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
(void)LOS_MemFree(m_aucSysMem1, freeBuf);
|
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
|
import("//third_party/NuttX/NuttX.gni")
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_FS_RAMFS)
|
module_switch = defined(LOSCFG_FS_RAMFS)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
|
import("//third_party/NuttX/NuttX.gni")
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_FS_ROMFS)
|
module_switch = defined(LOSCFG_FS_ROMFS)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
|
|
|
||||||
|
|
@ -28,14 +28,17 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
|
import("//third_party/NuttX/NuttX.gni")
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_FS_VFS)
|
module_switch = defined(LOSCFG_FS_VFS)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
kernel_module(module_name) {
|
kernel_module(module_name) {
|
||||||
sources = [
|
sources = [
|
||||||
"epoll/fs_epoll.c",
|
"$LITEOSTOPDIR/fs/vfs/epoll/fs_epoll.c",
|
||||||
"mount.c",
|
"$LITEOSTOPDIR/fs/vfs/mount.c",
|
||||||
|
"$LITEOSTOPDIR/fs/vfs/path_cache.c",
|
||||||
|
"$LITEOSTOPDIR/fs/vfs/vnode.c",
|
||||||
|
"$LITEOSTOPDIR/fs/vfs/vnode_hash.c",
|
||||||
"operation/fullpath.c",
|
"operation/fullpath.c",
|
||||||
"operation/vfs_chattr.c",
|
"operation/vfs_chattr.c",
|
||||||
"operation/vfs_check.c",
|
"operation/vfs_check.c",
|
||||||
|
|
@ -52,10 +55,7 @@ kernel_module(module_name) {
|
||||||
"operation/vfs_readv.c",
|
"operation/vfs_readv.c",
|
||||||
"operation/vfs_utime.c",
|
"operation/vfs_utime.c",
|
||||||
"operation/vfs_writev.c",
|
"operation/vfs_writev.c",
|
||||||
"path_cache.c",
|
|
||||||
"vfs_cmd/vfs_shellcmd.c",
|
"vfs_cmd/vfs_shellcmd.c",
|
||||||
"vnode.c",
|
|
||||||
"vnode_hash.c",
|
|
||||||
]
|
]
|
||||||
sources += NUTTX_FS_DIRENT_SRC_FILES
|
sources += NUTTX_FS_DIRENT_SRC_FILES
|
||||||
sources += NUTTX_FS_DRIVER_SRC_FILES
|
sources += NUTTX_FS_DRIVER_SRC_FILES
|
||||||
|
|
|
||||||
|
|
@ -220,18 +220,14 @@ int epoll_close(int epfd)
|
||||||
{
|
{
|
||||||
struct epoll_head *epHead = NULL;
|
struct epoll_head *epHead = NULL;
|
||||||
|
|
||||||
(VOID)pthread_mutex_lock(&g_epollMutex);
|
|
||||||
epHead = EpollGetDataBuff(epfd);
|
epHead = EpollGetDataBuff(epfd);
|
||||||
if (epHead == NULL) {
|
if (epHead == NULL) {
|
||||||
(VOID)pthread_mutex_unlock(&g_epollMutex);
|
|
||||||
set_errno(EBADF);
|
set_errno(EBADF);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
DoEpollClose(epHead);
|
DoEpollClose(epHead);
|
||||||
int ret = EpollFreeSysFd(epfd);
|
return EpollFreeSysFd(epfd);
|
||||||
(VOID)pthread_mutex_unlock(&g_epollMutex);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
|
int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
|
||||||
|
|
@ -240,16 +236,15 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
|
||||||
int i;
|
int i;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
|
|
||||||
(VOID)pthread_mutex_lock(&g_epollMutex);
|
|
||||||
epHead = EpollGetDataBuff(epfd);
|
epHead = EpollGetDataBuff(epfd);
|
||||||
if (epHead == NULL) {
|
if (epHead == NULL) {
|
||||||
set_errno(EBADF);
|
set_errno(EBADF);
|
||||||
goto OUT_RELEASE;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ev == NULL) {
|
if (ev == NULL) {
|
||||||
set_errno(EINVAL);
|
set_errno(EINVAL);
|
||||||
goto OUT_RELEASE;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (op) {
|
switch (op) {
|
||||||
|
|
@ -257,19 +252,18 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
|
||||||
ret = CheckFdExist(epHead, fd);
|
ret = CheckFdExist(epHead, fd);
|
||||||
if (ret == -1) {
|
if (ret == -1) {
|
||||||
set_errno(EEXIST);
|
set_errno(EEXIST);
|
||||||
goto OUT_RELEASE;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (epHead->nodeCount == EPOLL_DEFAULT_SIZE) {
|
if (epHead->nodeCount == EPOLL_DEFAULT_SIZE) {
|
||||||
set_errno(ENOMEM);
|
set_errno(ENOMEM);
|
||||||
goto OUT_RELEASE;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
epHead->evs[epHead->nodeCount].events = ev->events | POLLERR | POLLHUP;
|
epHead->evs[epHead->nodeCount].events = ev->events | POLLERR | POLLHUP;
|
||||||
epHead->evs[epHead->nodeCount].data.fd = fd;
|
epHead->evs[epHead->nodeCount].data.fd = fd;
|
||||||
epHead->nodeCount++;
|
epHead->nodeCount++;
|
||||||
ret = 0;
|
return 0;
|
||||||
break;
|
|
||||||
case EPOLL_CTL_DEL:
|
case EPOLL_CTL_DEL:
|
||||||
for (i = 0; i < epHead->nodeCount; i++) {
|
for (i = 0; i < epHead->nodeCount; i++) {
|
||||||
if (epHead->evs[i].data.fd != fd) {
|
if (epHead->evs[i].data.fd != fd) {
|
||||||
|
|
@ -281,29 +275,23 @@ int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev)
|
||||||
epHead->nodeCount - i);
|
epHead->nodeCount - i);
|
||||||
}
|
}
|
||||||
epHead->nodeCount--;
|
epHead->nodeCount--;
|
||||||
ret = 0;
|
return 0;
|
||||||
goto OUT_RELEASE;
|
|
||||||
}
|
}
|
||||||
set_errno(ENOENT);
|
set_errno(ENOENT);
|
||||||
break;
|
return -1;
|
||||||
case EPOLL_CTL_MOD:
|
case EPOLL_CTL_MOD:
|
||||||
for (i = 0; i < epHead->nodeCount; i++) {
|
for (i = 0; i < epHead->nodeCount; i++) {
|
||||||
if (epHead->evs[i].data.fd == fd) {
|
if (epHead->evs[i].data.fd == fd) {
|
||||||
epHead->evs[i].events = ev->events | POLLERR | POLLHUP;
|
epHead->evs[i].events = ev->events | POLLERR | POLLHUP;
|
||||||
ret = 0;
|
return 0;
|
||||||
goto OUT_RELEASE;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
set_errno(ENOENT);
|
set_errno(ENOENT);
|
||||||
break;
|
return -1;
|
||||||
default:
|
default:
|
||||||
set_errno(EINVAL);
|
set_errno(EINVAL);
|
||||||
break;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
OUT_RELEASE:
|
|
||||||
(VOID)pthread_mutex_unlock(&g_epollMutex);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents, int timeout)
|
int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents, int timeout)
|
||||||
|
|
@ -338,7 +326,7 @@ int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents, int timeout
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < pollSize; i++) {
|
for (i = 0; i < epHead->nodeCount; i++) {
|
||||||
pFd[i].fd = epHead->evs[i].data.fd;
|
pFd[i].fd = epHead->evs[i].data.fd;
|
||||||
pFd[i].events = (short)epHead->evs[i].events;
|
pFd[i].events = (short)epHead->evs[i].events;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -138,7 +138,7 @@ int VnodeAlloc(struct VnodeOps *vop, struct Vnode **newVnode)
|
||||||
VnodeHold();
|
VnodeHold();
|
||||||
vnode = GetFromFreeList();
|
vnode = GetFromFreeList();
|
||||||
if ((vnode == NULL) && g_totalVnodeSize < LOSCFG_MAX_VNODE_SIZE) {
|
if ((vnode == NULL) && g_totalVnodeSize < LOSCFG_MAX_VNODE_SIZE) {
|
||||||
vnode = (struct Vnode *)zalloc(sizeof(struct Vnode));
|
vnode = (struct Vnode*)zalloc(sizeof(struct Vnode));
|
||||||
g_totalVnodeSize++;
|
g_totalVnodeSize++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,51 @@ config PAGE_TABLE_FINE_LOCK
|
||||||
help
|
help
|
||||||
This option will enable fine lock for page table.
|
This option will enable fine lock for page table.
|
||||||
|
|
||||||
|
######################### config options of container ####################
|
||||||
|
config KERNEL_CONTAINER
|
||||||
|
bool "Enable container Feature"
|
||||||
|
default n
|
||||||
|
depends on KERNEL_VM
|
||||||
|
|
||||||
|
config PID_CONTAINER
|
||||||
|
bool "Enable pid container Feature"
|
||||||
|
default n
|
||||||
|
depends on KERNEL_CONTAINER
|
||||||
|
|
||||||
|
config UTS_CONTAINER
|
||||||
|
bool "Enable uts container Feature"
|
||||||
|
default n
|
||||||
|
depends on KERNEL_CONTAINER
|
||||||
|
|
||||||
|
config MNT_CONTAINER
|
||||||
|
bool "Enable mnt container Feature"
|
||||||
|
default n
|
||||||
|
depends on KERNEL_CONTAINER
|
||||||
|
|
||||||
|
config CHROOT
|
||||||
|
bool "Enable chroot"
|
||||||
|
default n
|
||||||
|
depends on MNT_CONTAINER
|
||||||
|
|
||||||
|
config IPC_CONTAINER
|
||||||
|
bool "Enable ipc container Feature"
|
||||||
|
default n
|
||||||
|
depends on KERNEL_CONTAINER
|
||||||
|
|
||||||
|
config TIME_CONTAINER
|
||||||
|
bool "Enable time container"
|
||||||
|
default n
|
||||||
|
depends on KERNEL_CONTAINER
|
||||||
|
|
||||||
|
config USER_CONTAINER
|
||||||
|
bool "Enable user container"
|
||||||
|
default n
|
||||||
|
depends on KERNEL_CONTAINER
|
||||||
|
|
||||||
|
config NET_CONTAINER
|
||||||
|
bool "Enable net container"
|
||||||
|
default n
|
||||||
|
depends on KERNEL_CONTAINER
|
||||||
|
|
||||||
######################### config options of extended #####################
|
######################### config options of extended #####################
|
||||||
source "kernel/extended/Kconfig"
|
source "kernel/extended/Kconfig"
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,15 @@ import("//kernel/liteos_a/liteos.gni")
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
kernel_module(module_name) {
|
kernel_module(module_name) {
|
||||||
sources = [
|
sources = [
|
||||||
|
"container/los_container.c",
|
||||||
|
"container/los_credentials.c",
|
||||||
|
"container/los_ipc_container.c",
|
||||||
|
"container/los_mnt_container.c",
|
||||||
|
"container/los_net_container.c",
|
||||||
|
"container/los_pid_container.c",
|
||||||
|
"container/los_time_container.c",
|
||||||
|
"container/los_user_container.c",
|
||||||
|
"container/los_uts_container.c",
|
||||||
"core/los_bitmap.c",
|
"core/los_bitmap.c",
|
||||||
"core/los_info.c",
|
"core/los_info.c",
|
||||||
"core/los_process.c",
|
"core/los_process.c",
|
||||||
|
|
@ -67,7 +76,6 @@ kernel_module(module_name) {
|
||||||
"mp/los_percpu.c",
|
"mp/los_percpu.c",
|
||||||
"mp/los_spinlock.c",
|
"mp/los_spinlock.c",
|
||||||
"om/los_err.c",
|
"om/los_err.c",
|
||||||
"sched/los_deadline.c",
|
|
||||||
"sched/los_idle.c",
|
"sched/los_idle.c",
|
||||||
"sched/los_priority.c",
|
"sched/los_priority.c",
|
||||||
"sched/los_sched.c",
|
"sched/los_sched.c",
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@ LOCAL_SRCS := $(wildcard ipc/*.c) $(wildcard core/*.c) $(wildcard mem/membox/*.
|
||||||
$(wildcard mp/*.c) \
|
$(wildcard mp/*.c) \
|
||||||
$(wildcard sched/*.c) \
|
$(wildcard sched/*.c) \
|
||||||
$(wildcard vm/*.c) \
|
$(wildcard vm/*.c) \
|
||||||
|
$(wildcard container/*.c)
|
||||||
|
|
||||||
|
|
||||||
LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK) -Wno-frame-address
|
LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK) -Wno-frame-address
|
||||||
|
|
|
||||||
|
|
@ -939,37 +939,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsSystemProcessCreate(VOID)
|
||||||
return LOS_OK;
|
return LOS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
INT32 OsSchedulerParamCheck(UINT16 policy, BOOL isThread, const LosSchedParam *param)
|
STATIC INLINE INT32 OsProcessSchedlerParamCheck(INT32 which, INT32 pid, UINT16 prio, UINT16 policy)
|
||||||
{
|
|
||||||
if (param == NULL) {
|
|
||||||
return LOS_EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((policy == LOS_SCHED_RR) || (isThread && (policy == LOS_SCHED_FIFO))) {
|
|
||||||
if ((param->priority < OS_PROCESS_PRIORITY_HIGHEST) ||
|
|
||||||
(param->priority > OS_PROCESS_PRIORITY_LOWEST)) {
|
|
||||||
return LOS_EINVAL;
|
|
||||||
}
|
|
||||||
return LOS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (policy == LOS_SCHED_DEADLINE) {
|
|
||||||
if ((param->runTimeUs < OS_SCHED_EDF_MIN_RUNTIME) || (param->runTimeUs >= param->deadlineUs)) {
|
|
||||||
return LOS_EINVAL;
|
|
||||||
}
|
|
||||||
if ((param->deadlineUs < OS_SCHED_EDF_MIN_DEADLINE) || (param->deadlineUs > OS_SCHED_EDF_MAX_DEADLINE)) {
|
|
||||||
return LOS_EINVAL;
|
|
||||||
}
|
|
||||||
if (param->periodUs < param->deadlineUs) {
|
|
||||||
return LOS_EINVAL;
|
|
||||||
}
|
|
||||||
return LOS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
return LOS_EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC INLINE INT32 ProcessSchedulerParamCheck(INT32 which, INT32 pid, UINT16 policy, const LosSchedParam *param)
|
|
||||||
{
|
{
|
||||||
if (OS_PID_CHECK_INVALID(pid)) {
|
if (OS_PID_CHECK_INVALID(pid)) {
|
||||||
return LOS_EINVAL;
|
return LOS_EINVAL;
|
||||||
|
|
@ -979,11 +949,19 @@ STATIC INLINE INT32 ProcessSchedulerParamCheck(INT32 which, INT32 pid, UINT16 po
|
||||||
return LOS_EINVAL;
|
return LOS_EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return OsSchedulerParamCheck(policy, FALSE, param);
|
if (prio > OS_PROCESS_PRIORITY_LOWEST) {
|
||||||
|
return LOS_EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (policy != LOS_SCHED_RR) {
|
||||||
|
return LOS_EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return LOS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef LOSCFG_SECURITY_CAPABILITY
|
#ifdef LOSCFG_SECURITY_CAPABILITY
|
||||||
STATIC BOOL OsProcessCapPermitCheck(const LosProcessCB *processCB, const SchedParam *param, UINT16 policy, UINT16 prio)
|
STATIC BOOL OsProcessCapPermitCheck(const LosProcessCB *processCB, const SchedParam *param, UINT16 prio)
|
||||||
{
|
{
|
||||||
LosProcessCB *runProcess = OsCurrProcessGet();
|
LosProcessCB *runProcess = OsCurrProcessGet();
|
||||||
|
|
||||||
|
|
@ -993,7 +971,7 @@ STATIC BOOL OsProcessCapPermitCheck(const LosProcessCB *processCB, const SchedPa
|
||||||
}
|
}
|
||||||
|
|
||||||
/* user mode process can reduce the priority of itself */
|
/* user mode process can reduce the priority of itself */
|
||||||
if ((runProcess->processID == processCB->processID) && (policy == LOS_SCHED_RR) && (prio > param->basePrio)) {
|
if ((runProcess->processID == processCB->processID) && (prio > param->basePrio)) {
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1005,13 +983,12 @@ STATIC BOOL OsProcessCapPermitCheck(const LosProcessCB *processCB, const SchedPa
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
LITE_OS_SEC_TEXT INT32 OsSetProcessScheduler(INT32 which, INT32 pid, UINT16 policy, const LosSchedParam *schedParam)
|
LITE_OS_SEC_TEXT INT32 OsSetProcessScheduler(INT32 which, INT32 pid, UINT16 prio, UINT16 policy)
|
||||||
{
|
{
|
||||||
SchedParam param = { 0 };
|
SchedParam param = { 0 };
|
||||||
BOOL needSched = FALSE;
|
|
||||||
UINT32 intSave;
|
UINT32 intSave;
|
||||||
|
|
||||||
INT32 ret = ProcessSchedulerParamCheck(which, pid, policy, schedParam);
|
INT32 ret = OsProcessSchedlerParamCheck(which, pid, prio, policy);
|
||||||
if (ret != LOS_OK) {
|
if (ret != LOS_OK) {
|
||||||
return -ret;
|
return -ret;
|
||||||
}
|
}
|
||||||
|
|
@ -1019,45 +996,22 @@ LITE_OS_SEC_TEXT INT32 OsSetProcessScheduler(INT32 which, INT32 pid, UINT16 poli
|
||||||
LosProcessCB *processCB = OS_PCB_FROM_PID(pid);
|
LosProcessCB *processCB = OS_PCB_FROM_PID(pid);
|
||||||
SCHEDULER_LOCK(intSave);
|
SCHEDULER_LOCK(intSave);
|
||||||
if (OsProcessIsInactive(processCB)) {
|
if (OsProcessIsInactive(processCB)) {
|
||||||
SCHEDULER_UNLOCK(intSave);
|
ret = LOS_ESRCH;
|
||||||
return -LOS_ESRCH;
|
goto EXIT;
|
||||||
}
|
}
|
||||||
|
|
||||||
LosTaskCB *taskCB = processCB->threadGroup;
|
|
||||||
taskCB->ops->schedParamGet(taskCB, ¶m);
|
|
||||||
|
|
||||||
#ifdef LOSCFG_SECURITY_CAPABILITY
|
#ifdef LOSCFG_SECURITY_CAPABILITY
|
||||||
if (!OsProcessCapPermitCheck(processCB, ¶m, policy, schedParam->priority)) {
|
if (!OsProcessCapPermitCheck(processCB, ¶m, prio)) {
|
||||||
SCHEDULER_UNLOCK(intSave);
|
ret = LOS_EPERM;
|
||||||
return -LOS_EPERM;
|
goto EXIT;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (param.policy != policy) {
|
LosTaskCB *taskCB = processCB->threadGroup;
|
||||||
if (policy == LOS_SCHED_DEADLINE) { /* HPF -> EDF */
|
taskCB->ops->schedParamGet(taskCB, ¶m);
|
||||||
if (processCB->threadNumber > 1) {
|
param.basePrio = prio;
|
||||||
SCHEDULER_UNLOCK(intSave);
|
|
||||||
return -LOS_EPERM;
|
|
||||||
}
|
|
||||||
OsSchedParamInit(taskCB, policy, NULL, schedParam);
|
|
||||||
needSched = TRUE;
|
|
||||||
goto TO_SCHED;
|
|
||||||
} else if (param.policy == LOS_SCHED_DEADLINE) { /* EDF -> HPF */
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
|
||||||
return -LOS_EPERM;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (policy == LOS_SCHED_DEADLINE) {
|
BOOL needSched = taskCB->ops->schedParamModify(taskCB, ¶m);
|
||||||
param.runTimeUs = schedParam->runTimeUs;
|
|
||||||
param.deadlineUs = schedParam->deadlineUs;
|
|
||||||
param.periodUs = schedParam->periodUs;
|
|
||||||
} else {
|
|
||||||
param.basePrio = schedParam->priority;
|
|
||||||
}
|
|
||||||
needSched = taskCB->ops->schedParamModify(taskCB, ¶m);
|
|
||||||
|
|
||||||
TO_SCHED:
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
SCHEDULER_UNLOCK(intSave);
|
||||||
|
|
||||||
LOS_MpSchedule(OS_MP_CPU_ALL);
|
LOS_MpSchedule(OS_MP_CPU_ALL);
|
||||||
|
|
@ -1065,26 +1019,25 @@ TO_SCHED:
|
||||||
LOS_Schedule();
|
LOS_Schedule();
|
||||||
}
|
}
|
||||||
return LOS_OK;
|
return LOS_OK;
|
||||||
|
|
||||||
|
EXIT:
|
||||||
|
SCHEDULER_UNLOCK(intSave);
|
||||||
|
return -ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
LITE_OS_SEC_TEXT INT32 LOS_SetProcessScheduler(INT32 pid, UINT16 policy, const LosSchedParam *schedParam)
|
LITE_OS_SEC_TEXT INT32 LOS_SetProcessScheduler(INT32 pid, UINT16 policy, UINT16 prio)
|
||||||
{
|
{
|
||||||
return OsSetProcessScheduler(LOS_PRIO_PROCESS, pid, policy, schedParam);
|
return OsSetProcessScheduler(LOS_PRIO_PROCESS, pid, prio, policy);
|
||||||
}
|
}
|
||||||
|
|
||||||
LITE_OS_SEC_TEXT INT32 LOS_GetProcessScheduler(INT32 pid, INT32 *policy, LosSchedParam *schedParam)
|
LITE_OS_SEC_TEXT INT32 LOS_GetProcessScheduler(INT32 pid)
|
||||||
{
|
{
|
||||||
UINT32 intSave;
|
UINT32 intSave;
|
||||||
SchedParam param = { 0 };
|
|
||||||
|
|
||||||
if (OS_PID_CHECK_INVALID(pid)) {
|
if (OS_PID_CHECK_INVALID(pid)) {
|
||||||
return -LOS_EINVAL;
|
return -LOS_EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((policy == NULL) && (schedParam == NULL)) {
|
|
||||||
return -LOS_EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
SCHEDULER_LOCK(intSave);
|
SCHEDULER_LOCK(intSave);
|
||||||
LosProcessCB *processCB = OS_PCB_FROM_PID(pid);
|
LosProcessCB *processCB = OS_PCB_FROM_PID(pid);
|
||||||
if (OsProcessIsUnused(processCB)) {
|
if (OsProcessIsUnused(processCB)) {
|
||||||
|
|
@ -1092,48 +1045,14 @@ LITE_OS_SEC_TEXT INT32 LOS_GetProcessScheduler(INT32 pid, INT32 *policy, LosSche
|
||||||
return -LOS_ESRCH;
|
return -LOS_ESRCH;
|
||||||
}
|
}
|
||||||
|
|
||||||
LosTaskCB *taskCB = processCB->threadGroup;
|
|
||||||
taskCB->ops->schedParamGet(taskCB, ¶m);
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
SCHEDULER_UNLOCK(intSave);
|
||||||
|
|
||||||
if (policy != NULL) {
|
return LOS_SCHED_RR;
|
||||||
if (param.policy == LOS_SCHED_FIFO) {
|
|
||||||
*policy = LOS_SCHED_RR;
|
|
||||||
} else {
|
|
||||||
*policy = param.policy;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (schedParam != NULL) {
|
|
||||||
if (param.policy == LOS_SCHED_DEADLINE) {
|
|
||||||
schedParam->runTimeUs = param.runTimeUs;
|
|
||||||
schedParam->deadlineUs = param.deadlineUs;
|
|
||||||
schedParam->periodUs = param.periodUs;
|
|
||||||
} else {
|
|
||||||
schedParam->priority = param.basePrio;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return LOS_OK;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
LITE_OS_SEC_TEXT INT32 LOS_SetProcessPriority(INT32 pid, INT32 prio)
|
LITE_OS_SEC_TEXT INT32 LOS_SetProcessPriority(INT32 pid, UINT16 prio)
|
||||||
{
|
{
|
||||||
INT32 ret;
|
return OsSetProcessScheduler(LOS_PRIO_PROCESS, pid, prio, LOS_GetProcessScheduler(pid));
|
||||||
INT32 policy;
|
|
||||||
LosSchedParam param = {
|
|
||||||
.priority = prio,
|
|
||||||
};
|
|
||||||
|
|
||||||
ret = LOS_GetProcessScheduler(pid, &policy, NULL);
|
|
||||||
if (ret != LOS_OK) {
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (policy == LOS_SCHED_DEADLINE) {
|
|
||||||
return -LOS_EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return OsSetProcessScheduler(LOS_PRIO_PROCESS, pid, (UINT16)policy, ¶m);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
LITE_OS_SEC_TEXT INT32 OsGetProcessPriority(INT32 which, INT32 pid)
|
LITE_OS_SEC_TEXT INT32 OsGetProcessPriority(INT32 which, INT32 pid)
|
||||||
|
|
@ -1160,11 +1079,6 @@ LITE_OS_SEC_TEXT INT32 OsGetProcessPriority(INT32 which, INT32 pid)
|
||||||
LosTaskCB *taskCB = processCB->threadGroup;
|
LosTaskCB *taskCB = processCB->threadGroup;
|
||||||
taskCB->ops->schedParamGet(taskCB, ¶m);
|
taskCB->ops->schedParamGet(taskCB, ¶m);
|
||||||
|
|
||||||
if (param.policy == LOS_SCHED_DEADLINE) {
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
|
||||||
return -LOS_EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
SCHEDULER_UNLOCK(intSave);
|
||||||
return param.basePrio;
|
return param.basePrio;
|
||||||
}
|
}
|
||||||
|
|
@ -1936,38 +1850,6 @@ STATIC UINT32 OsCopyUser(LosProcessCB *childCB, LosProcessCB *parentCB)
|
||||||
return LOS_OK;
|
return LOS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
STATIC VOID GetCopyTaskParam(LosProcessCB *childProcessCB, UINTPTR entry, UINT32 size,
|
|
||||||
TSK_INIT_PARAM_S *taskParam, SchedParam *param)
|
|
||||||
{
|
|
||||||
UINT32 intSave;
|
|
||||||
LosTaskCB *runTask = OsCurrTaskGet();
|
|
||||||
|
|
||||||
SCHEDULER_LOCK(intSave);
|
|
||||||
if (OsProcessIsUserMode(childProcessCB)) {
|
|
||||||
taskParam->pfnTaskEntry = runTask->taskEntry;
|
|
||||||
taskParam->uwStackSize = runTask->stackSize;
|
|
||||||
taskParam->userParam.userArea = runTask->userArea;
|
|
||||||
taskParam->userParam.userMapBase = runTask->userMapBase;
|
|
||||||
taskParam->userParam.userMapSize = runTask->userMapSize;
|
|
||||||
} else {
|
|
||||||
taskParam->pfnTaskEntry = (TSK_ENTRY_FUNC)entry;
|
|
||||||
taskParam->uwStackSize = size;
|
|
||||||
}
|
|
||||||
if (runTask->taskStatus & OS_TASK_FLAG_PTHREAD_JOIN) {
|
|
||||||
taskParam->uwResved = LOS_TASK_ATTR_JOINABLE;
|
|
||||||
}
|
|
||||||
|
|
||||||
runTask->ops->schedParamGet(runTask, param);
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
|
||||||
|
|
||||||
taskParam->policy = param->policy;
|
|
||||||
taskParam->runTimeUs = param->runTimeUs;
|
|
||||||
taskParam->deadlineUs = param->deadlineUs;
|
|
||||||
taskParam->periodUs = param->periodUs;
|
|
||||||
taskParam->usTaskPrio = param->priority;
|
|
||||||
taskParam->processID = (UINTPTR)childProcessCB;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC UINT32 OsCopyTask(UINT32 flags, LosProcessCB *childProcessCB, const CHAR *name, UINTPTR entry, UINT32 size)
|
STATIC UINT32 OsCopyTask(UINT32 flags, LosProcessCB *childProcessCB, const CHAR *name, UINTPTR entry, UINT32 size)
|
||||||
{
|
{
|
||||||
LosTaskCB *runTask = OsCurrTaskGet();
|
LosTaskCB *runTask = OsCurrTaskGet();
|
||||||
|
|
@ -1975,8 +1857,28 @@ STATIC UINT32 OsCopyTask(UINT32 flags, LosProcessCB *childProcessCB, const CHAR
|
||||||
UINT32 ret, taskID, intSave;
|
UINT32 ret, taskID, intSave;
|
||||||
SchedParam param = { 0 };
|
SchedParam param = { 0 };
|
||||||
|
|
||||||
|
SCHEDULER_LOCK(intSave);
|
||||||
|
if (OsProcessIsUserMode(childProcessCB)) {
|
||||||
|
taskParam.pfnTaskEntry = runTask->taskEntry;
|
||||||
|
taskParam.uwStackSize = runTask->stackSize;
|
||||||
|
taskParam.userParam.userArea = runTask->userArea;
|
||||||
|
taskParam.userParam.userMapBase = runTask->userMapBase;
|
||||||
|
taskParam.userParam.userMapSize = runTask->userMapSize;
|
||||||
|
} else {
|
||||||
|
taskParam.pfnTaskEntry = (TSK_ENTRY_FUNC)entry;
|
||||||
|
taskParam.uwStackSize = size;
|
||||||
|
}
|
||||||
|
if (runTask->taskStatus & OS_TASK_FLAG_PTHREAD_JOIN) {
|
||||||
|
taskParam.uwResved = LOS_TASK_ATTR_JOINABLE;
|
||||||
|
}
|
||||||
|
|
||||||
|
runTask->ops->schedParamGet(runTask, ¶m);
|
||||||
|
SCHEDULER_UNLOCK(intSave);
|
||||||
|
|
||||||
taskParam.pcName = (CHAR *)name;
|
taskParam.pcName = (CHAR *)name;
|
||||||
GetCopyTaskParam(childProcessCB, entry, size, &taskParam, ¶m);
|
taskParam.policy = param.policy;
|
||||||
|
taskParam.usTaskPrio = param.priority;
|
||||||
|
taskParam.processID = (UINTPTR)childProcessCB;
|
||||||
|
|
||||||
ret = LOS_TaskCreateOnly(&taskID, &taskParam);
|
ret = LOS_TaskCreateOnly(&taskID, &taskParam);
|
||||||
if (ret != LOS_OK) {
|
if (ret != LOS_OK) {
|
||||||
|
|
|
||||||
|
|
@ -583,7 +583,7 @@ STATIC INLINE BOOL SwtmrRunqueueFind(SortLinkAttribute *swtmrSortLink, SCHED_TL_
|
||||||
STATIC BOOL SwtmrTimeListFind(SCHED_TL_FIND_FUNC checkFunc, UINTPTR arg)
|
STATIC BOOL SwtmrTimeListFind(SCHED_TL_FIND_FUNC checkFunc, UINTPTR arg)
|
||||||
{
|
{
|
||||||
for (UINT16 cpuid = 0; cpuid < LOSCFG_KERNEL_CORE_NUM; cpuid++) {
|
for (UINT16 cpuid = 0; cpuid < LOSCFG_KERNEL_CORE_NUM; cpuid++) {
|
||||||
SortLinkAttribute *swtmrSortLink = &g_swtmrRunqueue[cpuid].swtmrSortLink;
|
SortLinkAttribute *swtmrSortLink = &g_swtmrRunqueue[ArchCurrCpuid()].swtmrSortLink;
|
||||||
if (SwtmrRunqueueFind(swtmrSortLink, checkFunc, arg)) {
|
if (SwtmrRunqueueFind(swtmrSortLink, checkFunc, arg)) {
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -394,7 +394,7 @@ STATIC VOID OsTaskResourcesToFree(LosTaskCB *taskCB)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
LITE_OS_SEC_TEXT VOID OsTaskCBRecycleToFree(void)
|
LITE_OS_SEC_TEXT VOID OsTaskCBRecycleToFree()
|
||||||
{
|
{
|
||||||
UINT32 intSave;
|
UINT32 intSave;
|
||||||
|
|
||||||
|
|
@ -543,7 +543,6 @@ STATIC UINT32 TaskCBInit(LosTaskCB *taskCB, const TSK_INIT_PARAM_S *initParam)
|
||||||
UINT32 ret;
|
UINT32 ret;
|
||||||
UINT32 numCount;
|
UINT32 numCount;
|
||||||
SchedParam schedParam = { 0 };
|
SchedParam schedParam = { 0 };
|
||||||
LosSchedParam initSchedParam = {0};
|
|
||||||
UINT16 policy = (initParam->policy == LOS_SCHED_NORMAL) ? LOS_SCHED_RR : initParam->policy;
|
UINT16 policy = (initParam->policy == LOS_SCHED_NORMAL) ? LOS_SCHED_RR : initParam->policy;
|
||||||
|
|
||||||
TaskCBBaseInit(taskCB, initParam);
|
TaskCBBaseInit(taskCB, initParam);
|
||||||
|
|
@ -554,14 +553,7 @@ STATIC UINT32 TaskCBInit(LosTaskCB *taskCB, const TSK_INIT_PARAM_S *initParam)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy == LOS_SCHED_DEADLINE) {
|
ret = OsSchedParamInit(taskCB, policy, &schedParam, initParam);
|
||||||
initSchedParam.runTimeUs = initParam->runTimeUs;
|
|
||||||
initSchedParam.deadlineUs = initParam->deadlineUs;
|
|
||||||
initSchedParam.periodUs = initParam->periodUs;
|
|
||||||
} else {
|
|
||||||
initSchedParam.priority = initParam->usTaskPrio;
|
|
||||||
}
|
|
||||||
ret = OsSchedParamInit(taskCB, policy, &schedParam, &initSchedParam);
|
|
||||||
if (ret != LOS_OK) {
|
if (ret != LOS_OK) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
@ -1373,8 +1365,6 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsCreateUserTask(UINTPTR processID, TSK_INIT_PARAM_
|
||||||
UINT32 taskID;
|
UINT32 taskID;
|
||||||
UINT32 ret;
|
UINT32 ret;
|
||||||
UINT32 intSave;
|
UINT32 intSave;
|
||||||
INT32 policy;
|
|
||||||
SchedParam param;
|
|
||||||
|
|
||||||
ret = OsCreateUserTaskParamCheck(processID, initParam);
|
ret = OsCreateUserTaskParamCheck(processID, initParam);
|
||||||
if (ret != LOS_OK) {
|
if (ret != LOS_OK) {
|
||||||
|
|
@ -1383,25 +1373,14 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsCreateUserTask(UINTPTR processID, TSK_INIT_PARAM_
|
||||||
|
|
||||||
initParam->uwStackSize = OS_USER_TASK_SYSCALL_STACK_SIZE;
|
initParam->uwStackSize = OS_USER_TASK_SYSCALL_STACK_SIZE;
|
||||||
initParam->usTaskPrio = OS_TASK_PRIORITY_LOWEST;
|
initParam->usTaskPrio = OS_TASK_PRIORITY_LOWEST;
|
||||||
|
initParam->policy = LOS_SCHED_RR;
|
||||||
if (processID == OS_INVALID_VALUE) {
|
if (processID == OS_INVALID_VALUE) {
|
||||||
SCHEDULER_LOCK(intSave);
|
SCHEDULER_LOCK(intSave);
|
||||||
LosProcessCB *processCB = OsCurrProcessGet();
|
LosProcessCB *processCB = OsCurrProcessGet();
|
||||||
initParam->processID = (UINTPTR)processCB;
|
initParam->processID = (UINTPTR)processCB;
|
||||||
initParam->consoleID = processCB->consoleID;
|
initParam->consoleID = processCB->consoleID;
|
||||||
SCHEDULER_UNLOCK(intSave);
|
SCHEDULER_UNLOCK(intSave);
|
||||||
ret = LOS_GetProcessScheduler(processCB->processID, &policy, NULL);
|
|
||||||
if (ret != LOS_OK) {
|
|
||||||
return OS_INVALID_VALUE;
|
|
||||||
}
|
|
||||||
initParam->policy = policy;
|
|
||||||
if (policy == LOS_SCHED_DEADLINE) {
|
|
||||||
OsSchedProcessDefaultSchedParamGet((UINT16)policy, ¶m);
|
|
||||||
initParam->runTimeUs = param.runTimeUs;
|
|
||||||
initParam->deadlineUs = param.deadlineUs;
|
|
||||||
initParam->periodUs = param.periodUs;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
initParam->policy = LOS_SCHED_RR;
|
|
||||||
initParam->processID = processID;
|
initParam->processID = processID;
|
||||||
initParam->consoleID = 0;
|
initParam->consoleID = 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -535,7 +535,7 @@ extern LosVmSpace *OsExecProcessVmSpaceReplace(LosVmSpace *newSpace, UINTPTR sta
|
||||||
extern UINT32 OsExecRecycleAndInit(LosProcessCB *processCB, const CHAR *name, LosVmSpace *oldAspace, UINTPTR oldFiles);
|
extern UINT32 OsExecRecycleAndInit(LosProcessCB *processCB, const CHAR *name, LosVmSpace *oldAspace, UINTPTR oldFiles);
|
||||||
extern UINT32 OsExecStart(const TSK_ENTRY_FUNC entry, UINTPTR sp, UINTPTR mapBase, UINT32 mapSize);
|
extern UINT32 OsExecStart(const TSK_ENTRY_FUNC entry, UINTPTR sp, UINTPTR mapBase, UINT32 mapSize);
|
||||||
extern UINT32 OsSetProcessName(LosProcessCB *processCB, const CHAR *name);
|
extern UINT32 OsSetProcessName(LosProcessCB *processCB, const CHAR *name);
|
||||||
extern INT32 OsSetProcessScheduler(INT32 which, INT32 pid, UINT16 policy, const LosSchedParam *param);
|
extern INT32 OsSetProcessScheduler(INT32 which, INT32 pid, UINT16 prio, UINT16 policy);
|
||||||
extern INT32 OsGetProcessPriority(INT32 which, INT32 pid);
|
extern INT32 OsGetProcessPriority(INT32 which, INT32 pid);
|
||||||
extern LosProcessCB *OsGetUserInitProcess(VOID);
|
extern LosProcessCB *OsGetUserInitProcess(VOID);
|
||||||
extern LosProcessCB *OsGetIdleProcess(VOID);
|
extern LosProcessCB *OsGetIdleProcess(VOID);
|
||||||
|
|
@ -553,7 +553,6 @@ extern VOID OsProcessThreadGroupDestroy(VOID);
|
||||||
extern UINT32 OsGetProcessGroupCB(UINT32 pid, UINTPTR *ppgroupLeader);
|
extern UINT32 OsGetProcessGroupCB(UINT32 pid, UINTPTR *ppgroupLeader);
|
||||||
extern LosProcessCB *OsGetDefaultProcessCB(VOID);
|
extern LosProcessCB *OsGetDefaultProcessCB(VOID);
|
||||||
extern ProcessGroup *OsCreateProcessGroup(LosProcessCB *processCB);
|
extern ProcessGroup *OsCreateProcessGroup(LosProcessCB *processCB);
|
||||||
INT32 OsSchedulerParamCheck(UINT16 policy, BOOL isThread, const LosSchedParam *param);
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
#if __cplusplus
|
#if __cplusplus
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -68,10 +68,6 @@ extern "C" {
|
||||||
#define OS_SCHED_TICK_TO_CYCLE(ticks) ((UINT64)ticks * OS_CYCLE_PER_TICK)
|
#define OS_SCHED_TICK_TO_CYCLE(ticks) ((UINT64)ticks * OS_CYCLE_PER_TICK)
|
||||||
#define AFFI_MASK_TO_CPUID(mask) ((UINT16)((mask) - 1))
|
#define AFFI_MASK_TO_CPUID(mask) ((UINT16)((mask) - 1))
|
||||||
|
|
||||||
#define OS_SCHED_EDF_MIN_RUNTIME 100 /* 100 us */
|
|
||||||
#define OS_SCHED_EDF_MIN_DEADLINE 400 /* 400 us */
|
|
||||||
#define OS_SCHED_EDF_MAX_DEADLINE 5000000 /* 5 s */
|
|
||||||
|
|
||||||
extern UINT32 g_taskScheduled;
|
extern UINT32 g_taskScheduled;
|
||||||
#define OS_SCHEDULER_ACTIVE (g_taskScheduled & (1U << ArchCurrCpuid()))
|
#define OS_SCHEDULER_ACTIVE (g_taskScheduled & (1U << ArchCurrCpuid()))
|
||||||
#define OS_SCHEDULER_ALL_ACTIVE (g_taskScheduled == LOSCFG_KERNEL_CPU_MASK)
|
#define OS_SCHEDULER_ALL_ACTIVE (g_taskScheduled == LOSCFG_KERNEL_CPU_MASK)
|
||||||
|
|
@ -102,16 +98,9 @@ typedef struct {
|
||||||
UINT32 queueBitmap;
|
UINT32 queueBitmap;
|
||||||
} HPFRunqueue;
|
} HPFRunqueue;
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
LOS_DL_LIST root;
|
|
||||||
LOS_DL_LIST waitList;
|
|
||||||
UINT64 period;
|
|
||||||
} EDFRunqueue;
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
SortLinkAttribute timeoutQueue; /* task timeout queue */
|
SortLinkAttribute timeoutQueue; /* task timeout queue */
|
||||||
HPFRunqueue *hpfRunqueue;
|
HPFRunqueue *hpfRunqueue;
|
||||||
EDFRunqueue *edfRunqueue;
|
|
||||||
UINT64 responseTime; /* Response time for current CPU tick interrupts */
|
UINT64 responseTime; /* Response time for current CPU tick interrupts */
|
||||||
UINT32 responseID; /* The response ID of the current CPU tick interrupt */
|
UINT32 responseID; /* The response ID of the current CPU tick interrupt */
|
||||||
LosTaskCB *idleTask; /* idle task id */
|
LosTaskCB *idleTask; /* idle task id */
|
||||||
|
|
@ -223,52 +212,30 @@ STATIC INLINE VOID OsSchedRunqueuePendingSet(VOID)
|
||||||
OsSchedRunqueue()->schedFlag |= INT_PEND_RESCH;
|
OsSchedRunqueue()->schedFlag |= INT_PEND_RESCH;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define LOS_SCHED_NORMAL 0U
|
#define LOS_SCHED_NORMAL 0U
|
||||||
#define LOS_SCHED_FIFO 1U
|
#define LOS_SCHED_FIFO 1U
|
||||||
#define LOS_SCHED_RR 2U
|
#define LOS_SCHED_RR 2U
|
||||||
#define LOS_SCHED_IDLE 3U
|
#define LOS_SCHED_IDLE 3U
|
||||||
#define LOS_SCHED_DEADLINE 6U
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
UINT16 policy;
|
UINT16 policy;
|
||||||
/* HPF scheduling parameters */
|
|
||||||
UINT16 basePrio;
|
UINT16 basePrio;
|
||||||
UINT16 priority;
|
UINT16 priority;
|
||||||
UINT32 timeSlice;
|
UINT32 timeSlice;
|
||||||
|
|
||||||
/* EDF scheduling parameters */
|
|
||||||
INT32 runTimeUs;
|
|
||||||
UINT32 deadlineUs;
|
|
||||||
UINT32 periodUs;
|
|
||||||
} SchedParam;
|
} SchedParam;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
UINT16 policy; /* This field must be present for all scheduling policies and must be the first in the structure */
|
UINT16 policy; /* This field must be present for all scheduling policies and must be the first in the structure */
|
||||||
UINT16 basePrio;
|
UINT16 basePrio;
|
||||||
UINT16 priority;
|
UINT16 priority;
|
||||||
UINT32 initTimeSlice; /* cycle */
|
UINT32 initTimeSlice;
|
||||||
UINT32 priBitmap; /* Bitmap for recording the change of task priority, the priority can not be greater than 31 */
|
UINT32 priBitmap; /**< Bitmap for recording the change of task priority, the priority can not be greater than 31 */
|
||||||
} SchedHPF;
|
} SchedHPF;
|
||||||
|
|
||||||
#define EDF_UNUSED 0
|
|
||||||
#define EDF_NEXT_PERIOD 1
|
|
||||||
#define EDF_WAIT_FOREVER 2
|
|
||||||
#define EDF_INIT 3
|
|
||||||
typedef struct {
|
|
||||||
UINT16 policy;
|
|
||||||
UINT16 cpuid;
|
|
||||||
UINT32 flags;
|
|
||||||
INT32 runTime; /* cycle */
|
|
||||||
UINT64 deadline; /* deadline >> runTime */
|
|
||||||
UINT64 period; /* period >= deadline */
|
|
||||||
UINT64 finishTime; /* startTime + deadline */
|
|
||||||
} SchedEDF;
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
union {
|
union {
|
||||||
SchedEDF edf;
|
|
||||||
SchedHPF hpf;
|
SchedHPF hpf;
|
||||||
};
|
} Policy;
|
||||||
} SchedPolicy;
|
} SchedPolicy;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|
@ -276,7 +243,6 @@ typedef struct {
|
||||||
VOID (*enqueue)(SchedRunqueue *rq, LosTaskCB *taskCB);
|
VOID (*enqueue)(SchedRunqueue *rq, LosTaskCB *taskCB);
|
||||||
VOID (*start)(SchedRunqueue *rq, LosTaskCB *taskCB);
|
VOID (*start)(SchedRunqueue *rq, LosTaskCB *taskCB);
|
||||||
VOID (*exit)(LosTaskCB *taskCB);
|
VOID (*exit)(LosTaskCB *taskCB);
|
||||||
UINT64 (*waitTimeGet)(LosTaskCB *taskCB);
|
|
||||||
UINT32 (*wait)(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 timeout);
|
UINT32 (*wait)(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 timeout);
|
||||||
VOID (*wake)(LosTaskCB *taskCB);
|
VOID (*wake)(LosTaskCB *taskCB);
|
||||||
BOOL (*schedParamModify)(LosTaskCB *taskCB, const SchedParam *param);
|
BOOL (*schedParamModify)(LosTaskCB *taskCB, const SchedParam *param);
|
||||||
|
|
@ -497,12 +463,6 @@ STATIC INLINE BOOL OsTaskIsBlocked(const LosTaskCB *taskCB)
|
||||||
return ((taskCB->taskStatus & (OS_TASK_STATUS_SUSPENDED | OS_TASK_STATUS_PENDING | OS_TASK_STATUS_DELAY)) != 0);
|
return ((taskCB->taskStatus & (OS_TASK_STATUS_SUSPENDED | OS_TASK_STATUS_PENDING | OS_TASK_STATUS_DELAY)) != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
STATIC INLINE BOOL OsSchedPolicyIsEDF(const LosTaskCB *taskCB)
|
|
||||||
{
|
|
||||||
const SchedEDF *sched = (const SchedEDF *)&taskCB->sp;
|
|
||||||
return (sched->policy == LOS_SCHED_DEADLINE);
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC INLINE LosTaskCB *OsCurrTaskGet(VOID)
|
STATIC INLINE LosTaskCB *OsCurrTaskGet(VOID)
|
||||||
{
|
{
|
||||||
return (LosTaskCB *)ArchCurrTaskGet();
|
return (LosTaskCB *)ArchCurrTaskGet();
|
||||||
|
|
@ -663,16 +623,6 @@ STATIC INLINE VOID SchedTaskUnfreeze(LosTaskCB *taskCB)
|
||||||
BOOL OsSchedLimitCheckTime(LosTaskCB *task);
|
BOOL OsSchedLimitCheckTime(LosTaskCB *task);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
STATIC INLINE LosTaskCB *EDFRunqueueTopTaskGet(EDFRunqueue *rq)
|
|
||||||
{
|
|
||||||
LOS_DL_LIST *root = &rq->root;
|
|
||||||
if (LOS_ListEmpty(root)) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return LOS_DL_LIST_ENTRY(LOS_DL_LIST_FIRST(root), LosTaskCB, pendList);
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC INLINE LosTaskCB *HPFRunqueueTopTaskGet(HPFRunqueue *rq)
|
STATIC INLINE LosTaskCB *HPFRunqueueTopTaskGet(HPFRunqueue *rq)
|
||||||
{
|
{
|
||||||
LosTaskCB *newTask = NULL;
|
LosTaskCB *newTask = NULL;
|
||||||
|
|
@ -710,16 +660,9 @@ STATIC INLINE LosTaskCB *HPFRunqueueTopTaskGet(HPFRunqueue *rq)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID EDFProcessDefaultSchedParamGet(SchedParam *param);
|
|
||||||
VOID EDFSchedPolicyInit(SchedRunqueue *rq);
|
|
||||||
UINT32 EDFTaskSchedParamInit(LosTaskCB *taskCB, UINT16 policy,
|
|
||||||
const SchedParam *parentParam,
|
|
||||||
const LosSchedParam *param);
|
|
||||||
|
|
||||||
VOID HPFSchedPolicyInit(SchedRunqueue *rq);
|
VOID HPFSchedPolicyInit(SchedRunqueue *rq);
|
||||||
VOID HPFTaskSchedParamInit(LosTaskCB *taskCB, UINT16 policy,
|
VOID HPFTaskSchedParamInit(LosTaskCB *taskCB, UINT16 policy,
|
||||||
const SchedParam *parentParam,
|
const SchedParam *parentParam, const TSK_INIT_PARAM_S *param);
|
||||||
const LosSchedParam *param);
|
|
||||||
VOID HPFProcessDefaultSchedParamGet(SchedParam *param);
|
VOID HPFProcessDefaultSchedParamGet(SchedParam *param);
|
||||||
|
|
||||||
VOID IdleTaskSchedParamInit(LosTaskCB *taskCB);
|
VOID IdleTaskSchedParamInit(LosTaskCB *taskCB);
|
||||||
|
|
@ -727,8 +670,7 @@ VOID IdleTaskSchedParamInit(LosTaskCB *taskCB);
|
||||||
INT32 OsSchedParamCompare(const LosTaskCB *task1, const LosTaskCB *task2);
|
INT32 OsSchedParamCompare(const LosTaskCB *task1, const LosTaskCB *task2);
|
||||||
VOID OsSchedPriorityInheritance(LosTaskCB *owner, const SchedParam *param);
|
VOID OsSchedPriorityInheritance(LosTaskCB *owner, const SchedParam *param);
|
||||||
UINT32 OsSchedParamInit(LosTaskCB *taskCB, UINT16 policy,
|
UINT32 OsSchedParamInit(LosTaskCB *taskCB, UINT16 policy,
|
||||||
const SchedParam *parentParam,
|
const SchedParam *parentParam, const TSK_INIT_PARAM_S *param);
|
||||||
const LosSchedParam *param);
|
|
||||||
VOID OsSchedProcessDefaultSchedParamGet(UINT16 policy, SchedParam *param);
|
VOID OsSchedProcessDefaultSchedParamGet(UINT16 policy, SchedParam *param);
|
||||||
|
|
||||||
VOID OsSchedResponseTimeReset(UINT64 responseTime);
|
VOID OsSchedResponseTimeReset(UINT64 responseTime);
|
||||||
|
|
|
||||||
|
|
@ -57,11 +57,9 @@ typedef struct {
|
||||||
#ifdef LOSCFG_SCHED_TICK_DEBUG
|
#ifdef LOSCFG_SCHED_TICK_DEBUG
|
||||||
VOID OsSchedDebugRecordData(VOID);
|
VOID OsSchedDebugRecordData(VOID);
|
||||||
UINT32 OsShellShowTickResponse(VOID);
|
UINT32 OsShellShowTickResponse(VOID);
|
||||||
|
UINT32 OsShellShowSchedStatistics(VOID);
|
||||||
UINT32 OsSchedDebugInit(VOID);
|
UINT32 OsSchedDebugInit(VOID);
|
||||||
#endif
|
#endif
|
||||||
UINT32 OsShellShowSchedStatistics(VOID);
|
|
||||||
UINT32 OsShellShowEdfSchedStatistics(VOID);
|
|
||||||
VOID EDFDebugRecord(UINTPTR *taskCB, UINT64 oldFinish);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
|
||||||
|
|
@ -101,16 +101,6 @@ extern "C" {
|
||||||
*/
|
*/
|
||||||
#define OS_NS_PER_TICK (OS_SYS_NS_PER_SECOND / LOSCFG_BASE_CORE_TICK_PER_SECOND)
|
#define OS_NS_PER_TICK (OS_SYS_NS_PER_SECOND / LOSCFG_BASE_CORE_TICK_PER_SECOND)
|
||||||
|
|
||||||
#define OS_US_TO_CYCLE(time, freq) ((((time) / OS_SYS_US_PER_SECOND) * (freq)) + \
|
|
||||||
(((time) % OS_SYS_US_PER_SECOND) * (freq) / OS_SYS_US_PER_SECOND))
|
|
||||||
|
|
||||||
#define OS_SYS_US_TO_CYCLE(time) OS_US_TO_CYCLE((time), OS_SYS_CLOCK)
|
|
||||||
|
|
||||||
#define OS_CYCLE_TO_US(cycle, freq) ((((cycle) / (freq)) * OS_SYS_US_PER_SECOND) + \
|
|
||||||
((cycle) % (freq) * OS_SYS_US_PER_SECOND / (freq)))
|
|
||||||
|
|
||||||
#define OS_SYS_CYCLE_TO_US(cycle) OS_CYCLE_TO_US((cycle), OS_SYS_CLOCK)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ingroup los_sys
|
* @ingroup los_sys
|
||||||
* The maximum length of name.
|
* The maximum length of name.
|
||||||
|
|
|
||||||
|
|
@ -157,8 +157,7 @@ typedef struct VmSpace {
|
||||||
#define VM_MAP_REGION_FLAG_SHM (1<<16)
|
#define VM_MAP_REGION_FLAG_SHM (1<<16)
|
||||||
#define VM_MAP_REGION_FLAG_FIXED (1<<17)
|
#define VM_MAP_REGION_FLAG_FIXED (1<<17)
|
||||||
#define VM_MAP_REGION_FLAG_FIXED_NOREPLACE (1<<18)
|
#define VM_MAP_REGION_FLAG_FIXED_NOREPLACE (1<<18)
|
||||||
#define VM_MAP_REGION_FLAG_LITEIPC (1<<19)
|
#define VM_MAP_REGION_FLAG_INVALID (1<<19) /* indicates that flags are not specified */
|
||||||
#define VM_MAP_REGION_FLAG_INVALID (1<<20) /* indicates that flags are not specified */
|
|
||||||
|
|
||||||
STATIC INLINE UINT32 OsCvtProtFlagsToRegionFlags(unsigned long prot, unsigned long flags)
|
STATIC INLINE UINT32 OsCvtProtFlagsToRegionFlags(unsigned long prot, unsigned long flags)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ STATIC VOID SortQueueIndexArray(UINT32 *indexArray, UINT32 count)
|
||||||
IpcSortParam queueSortParam;
|
IpcSortParam queueSortParam;
|
||||||
queueSortParam.buf = (CHAR *)g_queueDebugArray;
|
queueSortParam.buf = (CHAR *)g_queueDebugArray;
|
||||||
queueSortParam.ipcDebugCBSize = sizeof(QueueDebugCB);
|
queueSortParam.ipcDebugCBSize = sizeof(QueueDebugCB);
|
||||||
queueSortParam.ipcDebugCBCnt = LOSCFG_BASE_IPC_QUEUE_LIMIT;
|
queueSortParam.ipcDebugCBCnt = LOSCFG_BASE_IPC_SEM_LIMIT;
|
||||||
queueSortParam.sortElemOff = LOS_OFF_SET_OF(QueueDebugCB, lastAccessTime);
|
queueSortParam.sortElemOff = LOS_OFF_SET_OF(QueueDebugCB, lastAccessTime);
|
||||||
|
|
||||||
if (count > 0) {
|
if (count > 0) {
|
||||||
|
|
|
||||||
|
|
@ -887,7 +887,7 @@ STATIC UINT32 OsMemPoolInit(VOID *pool, UINT32 size)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef LOSCFG_MEM_MUL_POOL
|
#ifdef LOSCFG_MEM_MUL_POOL
|
||||||
STATIC VOID OsMemPoolDeInit(const VOID *pool, UINT32 size)
|
STATIC VOID OsMemPoolDeinit(const VOID *pool, UINT32 size)
|
||||||
{
|
{
|
||||||
#ifdef LOSCFG_KERNEL_LMS
|
#ifdef LOSCFG_KERNEL_LMS
|
||||||
if (g_lms != NULL) {
|
if (g_lms != NULL) {
|
||||||
|
|
|
||||||
|
|
@ -53,9 +53,6 @@
|
||||||
#include "los_sched_pri.h"
|
#include "los_sched_pri.h"
|
||||||
#include "los_swtmr_pri.h"
|
#include "los_swtmr_pri.h"
|
||||||
#include "los_info_pri.h"
|
#include "los_info_pri.h"
|
||||||
#ifdef LOSCFG_SCHED_DEBUG
|
|
||||||
#include "los_statistics_pri.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define OS_PROCESS_MEM_INFO 0x2U
|
#define OS_PROCESS_MEM_INFO 0x2U
|
||||||
#undef SHOW
|
#undef SHOW
|
||||||
|
|
@ -96,8 +93,6 @@ STATIC UINT8 *ConvertSchedPolicyToString(UINT16 policy)
|
||||||
return (UINT8 *)"RR";
|
return (UINT8 *)"RR";
|
||||||
} else if (policy == LOS_SCHED_FIFO) {
|
} else if (policy == LOS_SCHED_FIFO) {
|
||||||
return (UINT8 *)"FIFO";
|
return (UINT8 *)"FIFO";
|
||||||
} else if (policy == LOS_SCHED_DEADLINE) {
|
|
||||||
return (UINT8 *)"EDF";
|
|
||||||
} else if (policy == LOS_SCHED_IDLE) {
|
} else if (policy == LOS_SCHED_IDLE) {
|
||||||
return (UINT8 *)"IDLE";
|
return (UINT8 *)"IDLE";
|
||||||
}
|
}
|
||||||
|
|
@ -205,10 +200,12 @@ STATIC UINT8 *ConvertTaskStatusToString(UINT16 taskStatus)
|
||||||
return (UINT8 *)"Suspended";
|
return (UINT8 *)"Suspended";
|
||||||
} else if (taskStatus & OS_TASK_STATUS_DELAY) {
|
} else if (taskStatus & OS_TASK_STATUS_DELAY) {
|
||||||
return (UINT8 *)"Delay";
|
return (UINT8 *)"Delay";
|
||||||
} else if (taskStatus & OS_TASK_STATUS_PEND_TIME) {
|
|
||||||
return (UINT8 *)"PendTime";
|
|
||||||
} else if (taskStatus & OS_TASK_STATUS_PENDING) {
|
} else if (taskStatus & OS_TASK_STATUS_PENDING) {
|
||||||
return (UINT8 *)"Pending";
|
if (taskStatus & OS_TASK_STATUS_PEND_TIME) {
|
||||||
|
return (UINT8 *)"PendTime";
|
||||||
|
} else {
|
||||||
|
return (UINT8 *)"Pending";
|
||||||
|
}
|
||||||
} else if (taskStatus & OS_TASK_STATUS_EXIT) {
|
} else if (taskStatus & OS_TASK_STATUS_EXIT) {
|
||||||
return (UINT8 *)"Exit";
|
return (UINT8 *)"Exit";
|
||||||
}
|
}
|
||||||
|
|
@ -379,7 +376,6 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdTskInfoGet(UINT32 processID, VOID *seqBu
|
||||||
(VOID)memset_s(threadInfo, sizeof(ProcessThreadInfo), 0, sizeof(ProcessThreadInfo));
|
(VOID)memset_s(threadInfo, sizeof(ProcessThreadInfo), 0, sizeof(ProcessThreadInfo));
|
||||||
|
|
||||||
if (OsGetProcessThreadInfo(processID, threadInfo) != LOS_OK) {
|
if (OsGetProcessThreadInfo(processID, threadInfo) != LOS_OK) {
|
||||||
(VOID)LOS_MemFree(m_aucSysMem1, threadInfo);
|
|
||||||
return LOS_NOK;
|
return LOS_NOK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -417,20 +413,11 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdDumpTask(INT32 argc, const CHAR **argv)
|
||||||
}
|
}
|
||||||
goto TASK_HELP;
|
goto TASK_HELP;
|
||||||
#endif
|
#endif
|
||||||
#ifdef LOSCFG_SCHED_HPF_DEBUG
|
|
||||||
} else if (strcmp("-t", argv[0]) == 0) {
|
} else if (strcmp("-t", argv[0]) == 0) {
|
||||||
if (!OsShellShowSchedStatistics()) {
|
if (!OsShellShowSchedStatistics()) {
|
||||||
return LOS_OK;
|
return LOS_OK;
|
||||||
}
|
}
|
||||||
goto TASK_HELP;
|
goto TASK_HELP;
|
||||||
#endif
|
|
||||||
#ifdef LOSCFG_SCHED_EDF_DEBUG
|
|
||||||
} else if (strcmp("-e", argv[0]) == 0) {
|
|
||||||
if (!OsShellShowEdfSchedStatistics()) {
|
|
||||||
return LOS_OK;
|
|
||||||
}
|
|
||||||
goto TASK_HELP;
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
goto TASK_HELP;
|
goto TASK_HELP;
|
||||||
|
|
|
||||||
|
|
@ -1,403 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2023-2023 Huawei Device Co., Ltd. All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without modification,
|
|
||||||
* are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this list of
|
|
||||||
* conditions and the following disclaimer.
|
|
||||||
*
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
|
||||||
* of conditions and the following disclaimer in the documentation and/or other materials
|
|
||||||
* provided with the distribution.
|
|
||||||
*
|
|
||||||
* 3. Neither the name of the copyright holder nor the names of its contributors may be used
|
|
||||||
* to endorse or promote products derived from this software without specific prior written
|
|
||||||
* permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
|
||||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
||||||
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
||||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
||||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
||||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "los_sched_pri.h"
|
|
||||||
#include "los_task_pri.h"
|
|
||||||
#include "los_process_pri.h"
|
|
||||||
#include "los_hook.h"
|
|
||||||
#include "los_tick_pri.h"
|
|
||||||
#include "los_sys_pri.h"
|
|
||||||
|
|
||||||
STATIC EDFRunqueue g_schedEDF;
|
|
||||||
|
|
||||||
STATIC VOID EDFDequeue(SchedRunqueue *rq, LosTaskCB *taskCB);
|
|
||||||
STATIC VOID EDFEnqueue(SchedRunqueue *rq, LosTaskCB *taskCB);
|
|
||||||
STATIC UINT64 EDFWaitTimeGet(LosTaskCB *taskCB);
|
|
||||||
STATIC UINT32 EDFWait(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 ticks);
|
|
||||||
STATIC VOID EDFWake(LosTaskCB *resumedTask);
|
|
||||||
STATIC BOOL EDFSchedParamModify(LosTaskCB *taskCB, const SchedParam *param);
|
|
||||||
STATIC UINT32 EDFSchedParamGet(const LosTaskCB *taskCB, SchedParam *param);
|
|
||||||
STATIC UINT32 EDFDelay(LosTaskCB *runTask, UINT64 waitTime);
|
|
||||||
STATIC VOID EDFYield(LosTaskCB *runTask);
|
|
||||||
STATIC VOID EDFExit(LosTaskCB *taskCB);
|
|
||||||
STATIC UINT32 EDFSuspend(LosTaskCB *taskCB);
|
|
||||||
STATIC UINT32 EDFResume(LosTaskCB *taskCB, BOOL *needSched);
|
|
||||||
STATIC UINT64 EDFTimeSliceGet(const LosTaskCB *taskCB);
|
|
||||||
STATIC VOID EDFTimeSliceUpdate(SchedRunqueue *rq, LosTaskCB *taskCB, UINT64 currTime);
|
|
||||||
STATIC INT32 EDFParamCompare(const SchedPolicy *sp1, const SchedPolicy *sp2);
|
|
||||||
STATIC VOID EDFPriorityInheritance(LosTaskCB *owner, const SchedParam *param);
|
|
||||||
STATIC VOID EDFPriorityRestore(LosTaskCB *owner, const LOS_DL_LIST *list, const SchedParam *param);
|
|
||||||
|
|
||||||
const STATIC SchedOps g_deadlineOps = {
|
|
||||||
.dequeue = EDFDequeue,
|
|
||||||
.enqueue = EDFEnqueue,
|
|
||||||
.waitTimeGet = EDFWaitTimeGet,
|
|
||||||
.wait = EDFWait,
|
|
||||||
.wake = EDFWake,
|
|
||||||
.schedParamModify = EDFSchedParamModify,
|
|
||||||
.schedParamGet = EDFSchedParamGet,
|
|
||||||
.delay = EDFDelay,
|
|
||||||
.yield = EDFYield,
|
|
||||||
.start = EDFDequeue,
|
|
||||||
.exit = EDFExit,
|
|
||||||
.suspend = EDFSuspend,
|
|
||||||
.resume = EDFResume,
|
|
||||||
.deadlineGet = EDFTimeSliceGet,
|
|
||||||
.timeSliceUpdate = EDFTimeSliceUpdate,
|
|
||||||
.schedParamCompare = EDFParamCompare,
|
|
||||||
.priorityInheritance = EDFPriorityInheritance,
|
|
||||||
.priorityRestore = EDFPriorityRestore,
|
|
||||||
};
|
|
||||||
|
|
||||||
STATIC VOID EDFTimeSliceUpdate(SchedRunqueue *rq, LosTaskCB *taskCB, UINT64 currTime)
|
|
||||||
{
|
|
||||||
SchedEDF *sched = (SchedEDF *)&taskCB->sp;
|
|
||||||
|
|
||||||
LOS_ASSERT(currTime >= taskCB->startTime);
|
|
||||||
|
|
||||||
if (taskCB->timeSlice <= 0) {
|
|
||||||
taskCB->irqUsedTime = 0;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
INT32 incTime = (currTime - taskCB->startTime - taskCB->irqUsedTime);
|
|
||||||
LOS_ASSERT(incTime >= 0);
|
|
||||||
|
|
||||||
#ifdef LOSCFG_SCHED_EDF_DEBUG
|
|
||||||
taskCB->schedStat.timeSliceRealTime += incTime;
|
|
||||||
taskCB->schedStat.allRuntime += (currTime - taskCB->startTime);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
taskCB->timeSlice -= incTime;
|
|
||||||
taskCB->irqUsedTime = 0;
|
|
||||||
taskCB->startTime = currTime;
|
|
||||||
|
|
||||||
if ((sched->finishTime > currTime) && (taskCB->timeSlice > 0)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
rq->schedFlag |= INT_PEND_RESCH;
|
|
||||||
if (sched->finishTime <= currTime) {
|
|
||||||
#ifdef LOSCFG_SCHED_EDF_DEBUG
|
|
||||||
EDFDebugRecord((UINTPTR *)taskCB, sched->finishTime);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
taskCB->timeSlice = 0;
|
|
||||||
PrintExcInfo("EDF task %u is timeout, runTime: %d us period: %llu us\n", taskCB->taskID,
|
|
||||||
(INT32)OS_SYS_CYCLE_TO_US((UINT64)sched->runTime), OS_SYS_CYCLE_TO_US(sched->period));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC UINT64 EDFTimeSliceGet(const LosTaskCB *taskCB)
|
|
||||||
{
|
|
||||||
SchedEDF *sched = (SchedEDF *)&taskCB->sp;
|
|
||||||
UINT64 endTime = taskCB->startTime + taskCB->timeSlice;
|
|
||||||
return (endTime > sched->finishTime) ? sched->finishTime : endTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC VOID DeadlineQueueInsert(EDFRunqueue *rq, LosTaskCB *taskCB)
|
|
||||||
{
|
|
||||||
LOS_DL_LIST *root = &rq->root;
|
|
||||||
if (LOS_ListEmpty(root)) {
|
|
||||||
LOS_ListTailInsert(root, &taskCB->pendList);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
LOS_DL_LIST *list = root->pstNext;
|
|
||||||
do {
|
|
||||||
LosTaskCB *readyTask = LOS_DL_LIST_ENTRY(list, LosTaskCB, pendList);
|
|
||||||
if (EDFParamCompare(&readyTask->sp, &taskCB->sp) > 0) {
|
|
||||||
LOS_ListHeadInsert(list, &taskCB->pendList);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
list = list->pstNext;
|
|
||||||
} while (list != root);
|
|
||||||
|
|
||||||
LOS_ListHeadInsert(list, &taskCB->pendList);
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC VOID EDFEnqueue(SchedRunqueue *rq, LosTaskCB *taskCB)
|
|
||||||
{
|
|
||||||
LOS_ASSERT(!(taskCB->taskStatus & OS_TASK_STATUS_READY));
|
|
||||||
|
|
||||||
EDFRunqueue *erq = rq->edfRunqueue;
|
|
||||||
SchedEDF *sched = (SchedEDF *)&taskCB->sp;
|
|
||||||
if (taskCB->timeSlice <= 0) {
|
|
||||||
#ifdef LOSCFG_SCHED_EDF_DEBUG
|
|
||||||
UINT64 oldFinish = sched->finishTime;
|
|
||||||
#endif
|
|
||||||
UINT64 currTime = OsGetCurrSchedTimeCycle();
|
|
||||||
if (sched->flags == EDF_INIT) {
|
|
||||||
sched->finishTime = currTime;
|
|
||||||
} else if (sched->flags != EDF_NEXT_PERIOD) {
|
|
||||||
/* The start time of the next period */
|
|
||||||
sched->finishTime = (sched->finishTime - sched->deadline) + sched->period;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Calculate the start time of the next period */
|
|
||||||
while (1) {
|
|
||||||
/* The deadline of the next period */
|
|
||||||
UINT64 finishTime = sched->finishTime + sched->deadline;
|
|
||||||
if ((finishTime <= currTime) || ((sched->finishTime + sched->runTime) > finishTime)) {
|
|
||||||
/* This period cannot meet the minimum running time, so it is migrated to the next period */
|
|
||||||
sched->finishTime += sched->period;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sched->finishTime > currTime) {
|
|
||||||
/* Wait for the next period to start */
|
|
||||||
LOS_ListTailInsert(&erq->waitList, &taskCB->pendList);
|
|
||||||
taskCB->waitTime = OS_SCHED_MAX_RESPONSE_TIME;
|
|
||||||
if (!OsTaskIsRunning(taskCB)) {
|
|
||||||
OsSchedTimeoutQueueAdd(taskCB, sched->finishTime);
|
|
||||||
}
|
|
||||||
#ifdef LOSCFG_SCHED_EDF_DEBUG
|
|
||||||
if (oldFinish != sched->finishTime) {
|
|
||||||
EDFDebugRecord((UINTPTR *)taskCB, oldFinish);
|
|
||||||
taskCB->schedStat.allRuntime = 0;
|
|
||||||
taskCB->schedStat.timeSliceRealTime = 0;
|
|
||||||
taskCB->schedStat.pendTime = 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
taskCB->taskStatus |= OS_TASK_STATUS_PEND_TIME;
|
|
||||||
sched->flags = EDF_NEXT_PERIOD;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
sched->finishTime += sched->deadline;
|
|
||||||
taskCB->timeSlice = sched->runTime;
|
|
||||||
sched->flags = EDF_UNUSED;
|
|
||||||
}
|
|
||||||
|
|
||||||
DeadlineQueueInsert(erq, taskCB);
|
|
||||||
taskCB->taskStatus &= ~(OS_TASK_STATUS_BLOCKED | OS_TASK_STATUS_TIMEOUT);
|
|
||||||
taskCB->taskStatus |= OS_TASK_STATUS_READY;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC VOID EDFDequeue(SchedRunqueue *rq, LosTaskCB *taskCB)
|
|
||||||
{
|
|
||||||
(VOID)rq;
|
|
||||||
LOS_ListDelete(&taskCB->pendList);
|
|
||||||
taskCB->taskStatus &= ~OS_TASK_STATUS_READY;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC VOID EDFExit(LosTaskCB *taskCB)
|
|
||||||
{
|
|
||||||
if (taskCB->taskStatus & OS_TASK_STATUS_READY) {
|
|
||||||
EDFDequeue(OsSchedRunqueue(), taskCB);
|
|
||||||
} else if (taskCB->taskStatus & OS_TASK_STATUS_PENDING) {
|
|
||||||
LOS_ListDelete(&taskCB->pendList);
|
|
||||||
taskCB->taskStatus &= ~OS_TASK_STATUS_PENDING;
|
|
||||||
}
|
|
||||||
if (taskCB->taskStatus & (OS_TASK_STATUS_DELAY | OS_TASK_STATUS_PEND_TIME)) {
|
|
||||||
OsSchedTimeoutQueueDelete(taskCB);
|
|
||||||
taskCB->taskStatus &= ~(OS_TASK_STATUS_DELAY | OS_TASK_STATUS_PEND_TIME);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC VOID EDFYield(LosTaskCB *runTask)
|
|
||||||
{
|
|
||||||
SchedRunqueue *rq = OsSchedRunqueue();
|
|
||||||
runTask->timeSlice = 0;
|
|
||||||
|
|
||||||
runTask->startTime = OsGetCurrSchedTimeCycle();
|
|
||||||
EDFEnqueue(rq, runTask);
|
|
||||||
OsSchedResched();
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC UINT32 EDFDelay(LosTaskCB *runTask, UINT64 waitTime)
|
|
||||||
{
|
|
||||||
runTask->taskStatus |= OS_TASK_STATUS_DELAY;
|
|
||||||
runTask->waitTime = waitTime;
|
|
||||||
OsSchedResched();
|
|
||||||
return LOS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC UINT64 EDFWaitTimeGet(LosTaskCB *taskCB)
|
|
||||||
{
|
|
||||||
const SchedEDF *sched = (const SchedEDF *)&taskCB->sp;
|
|
||||||
if (sched->flags != EDF_WAIT_FOREVER) {
|
|
||||||
taskCB->waitTime += taskCB->startTime;
|
|
||||||
}
|
|
||||||
return (taskCB->waitTime >= sched->finishTime) ? sched->finishTime : taskCB->waitTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC UINT32 EDFWait(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 ticks)
|
|
||||||
{
|
|
||||||
SchedEDF *sched = (SchedEDF *)&runTask->sp;
|
|
||||||
runTask->taskStatus |= (OS_TASK_STATUS_PENDING | OS_TASK_STATUS_PEND_TIME);
|
|
||||||
LOS_ListTailInsert(list, &runTask->pendList);
|
|
||||||
|
|
||||||
if (ticks != LOS_WAIT_FOREVER) {
|
|
||||||
runTask->waitTime = OS_SCHED_TICK_TO_CYCLE(ticks);
|
|
||||||
} else {
|
|
||||||
sched->flags = EDF_WAIT_FOREVER;
|
|
||||||
runTask->waitTime = OS_SCHED_MAX_RESPONSE_TIME;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (OsPreemptableInSched()) {
|
|
||||||
OsSchedResched();
|
|
||||||
if (runTask->taskStatus & OS_TASK_STATUS_TIMEOUT) {
|
|
||||||
runTask->taskStatus &= ~OS_TASK_STATUS_TIMEOUT;
|
|
||||||
return LOS_ERRNO_TSK_TIMEOUT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return LOS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC VOID EDFWake(LosTaskCB *resumedTask)
|
|
||||||
{
|
|
||||||
LOS_ListDelete(&resumedTask->pendList);
|
|
||||||
resumedTask->taskStatus &= ~OS_TASK_STATUS_PENDING;
|
|
||||||
|
|
||||||
if (resumedTask->taskStatus & OS_TASK_STATUS_PEND_TIME) {
|
|
||||||
OsSchedTimeoutQueueDelete(resumedTask);
|
|
||||||
resumedTask->taskStatus &= ~OS_TASK_STATUS_PEND_TIME;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(resumedTask->taskStatus & OS_TASK_STATUS_SUSPENDED)) {
|
|
||||||
#ifdef LOSCFG_SCHED_EDF_DEBUG
|
|
||||||
resumedTask->schedStat.pendTime += OsGetCurrSchedTimeCycle() - resumedTask->startTime;
|
|
||||||
resumedTask->schedStat.pendCount++;
|
|
||||||
#endif
|
|
||||||
EDFEnqueue(OsSchedRunqueue(), resumedTask);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC BOOL EDFSchedParamModify(LosTaskCB *taskCB, const SchedParam *param)
|
|
||||||
{
|
|
||||||
SchedRunqueue *rq = OsSchedRunqueue();
|
|
||||||
SchedEDF *sched = (SchedEDF *)&taskCB->sp;
|
|
||||||
|
|
||||||
taskCB->timeSlice = 0;
|
|
||||||
sched->runTime = (INT32)OS_SYS_US_TO_CYCLE(param->runTimeUs);
|
|
||||||
sched->period = OS_SYS_US_TO_CYCLE(param->periodUs);
|
|
||||||
|
|
||||||
if (taskCB->taskStatus & OS_TASK_STATUS_READY) {
|
|
||||||
EDFDequeue(rq, taskCB);
|
|
||||||
sched->deadline = OS_SYS_US_TO_CYCLE(param->deadlineUs);
|
|
||||||
EDFEnqueue(rq, taskCB);
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
sched->deadline = OS_SYS_US_TO_CYCLE(param->deadlineUs);
|
|
||||||
if (taskCB->taskStatus & OS_TASK_STATUS_INIT) {
|
|
||||||
EDFEnqueue(rq, taskCB);
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (taskCB->taskStatus & OS_TASK_STATUS_RUNNING) {
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC UINT32 EDFSchedParamGet(const LosTaskCB *taskCB, SchedParam *param)
|
|
||||||
{
|
|
||||||
SchedEDF *sched = (SchedEDF *)&taskCB->sp;
|
|
||||||
param->policy = sched->policy;
|
|
||||||
param->runTimeUs = (INT32)OS_SYS_CYCLE_TO_US((UINT64)sched->runTime);
|
|
||||||
param->deadlineUs = OS_SYS_CYCLE_TO_US(sched->deadline);
|
|
||||||
param->periodUs = OS_SYS_CYCLE_TO_US(sched->period);
|
|
||||||
return LOS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC UINT32 EDFSuspend(LosTaskCB *taskCB)
|
|
||||||
{
|
|
||||||
return LOS_EOPNOTSUPP;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC UINT32 EDFResume(LosTaskCB *taskCB, BOOL *needSched)
|
|
||||||
{
|
|
||||||
return LOS_EOPNOTSUPP;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC INT32 EDFParamCompare(const SchedPolicy *sp1, const SchedPolicy *sp2)
|
|
||||||
{
|
|
||||||
const SchedEDF *param1 = (const SchedEDF *)sp1;
|
|
||||||
const SchedEDF *param2 = (const SchedEDF *)sp2;
|
|
||||||
|
|
||||||
return (INT32)(param1->finishTime - param2->finishTime);
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC VOID EDFPriorityInheritance(LosTaskCB *owner, const SchedParam *param)
|
|
||||||
{
|
|
||||||
(VOID)owner;
|
|
||||||
(VOID)param;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC VOID EDFPriorityRestore(LosTaskCB *owner, const LOS_DL_LIST *list, const SchedParam *param)
|
|
||||||
{
|
|
||||||
(VOID)owner;
|
|
||||||
(VOID)list;
|
|
||||||
(VOID)param;
|
|
||||||
}
|
|
||||||
|
|
||||||
UINT32 EDFTaskSchedParamInit(LosTaskCB *taskCB, UINT16 policy,
|
|
||||||
const SchedParam *parentParam,
|
|
||||||
const LosSchedParam *param)
|
|
||||||
{
|
|
||||||
(VOID)parentParam;
|
|
||||||
SchedEDF *sched = (SchedEDF *)&taskCB->sp;
|
|
||||||
sched->flags = EDF_INIT;
|
|
||||||
sched->policy = policy;
|
|
||||||
sched->runTime = (INT32)OS_SYS_US_TO_CYCLE((UINT64)param->runTimeUs);
|
|
||||||
sched->deadline = OS_SYS_US_TO_CYCLE(param->deadlineUs);
|
|
||||||
sched->period = OS_SYS_US_TO_CYCLE(param->periodUs);
|
|
||||||
sched->finishTime = 0;
|
|
||||||
taskCB->timeSlice = 0;
|
|
||||||
taskCB->ops = &g_deadlineOps;
|
|
||||||
return LOS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
VOID EDFProcessDefaultSchedParamGet(SchedParam *param)
|
|
||||||
{
|
|
||||||
param->runTimeUs = OS_SCHED_EDF_MIN_RUNTIME;
|
|
||||||
param->deadlineUs = OS_SCHED_EDF_MAX_DEADLINE;
|
|
||||||
param->periodUs = param->deadlineUs;
|
|
||||||
}
|
|
||||||
|
|
||||||
VOID EDFSchedPolicyInit(SchedRunqueue *rq)
|
|
||||||
{
|
|
||||||
if (ArchCurrCpuid() > 0) {
|
|
||||||
rq->edfRunqueue = &g_schedEDF;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
EDFRunqueue *erq = &g_schedEDF;
|
|
||||||
erq->period = OS_SCHED_MAX_RESPONSE_TIME;
|
|
||||||
LOS_ListInit(&erq->root);
|
|
||||||
LOS_ListInit(&erq->waitList);
|
|
||||||
rq->edfRunqueue = erq;
|
|
||||||
}
|
|
||||||
|
|
@ -48,7 +48,6 @@ STATIC VOID IdlePriorityRestore(LosTaskCB *owner, const LOS_DL_LIST *list, const
|
||||||
const STATIC SchedOps g_idleOps = {
|
const STATIC SchedOps g_idleOps = {
|
||||||
.dequeue = IdleDequeue,
|
.dequeue = IdleDequeue,
|
||||||
.enqueue = IdleEnqueue,
|
.enqueue = IdleEnqueue,
|
||||||
.waitTimeGet = NULL,
|
|
||||||
.wait = IdleWait,
|
.wait = IdleWait,
|
||||||
.wake = IdleWake,
|
.wake = IdleWake,
|
||||||
.schedParamModify = NULL,
|
.schedParamModify = NULL,
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,6 @@ STATIC HPFRunqueue g_schedHPF;
|
||||||
|
|
||||||
STATIC VOID HPFDequeue(SchedRunqueue *rq, LosTaskCB *taskCB);
|
STATIC VOID HPFDequeue(SchedRunqueue *rq, LosTaskCB *taskCB);
|
||||||
STATIC VOID HPFEnqueue(SchedRunqueue *rq, LosTaskCB *taskCB);
|
STATIC VOID HPFEnqueue(SchedRunqueue *rq, LosTaskCB *taskCB);
|
||||||
STATIC UINT64 HPFWaitTimeGet(LosTaskCB *taskCB);
|
|
||||||
STATIC UINT32 HPFWait(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 ticks);
|
STATIC UINT32 HPFWait(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 ticks);
|
||||||
STATIC VOID HPFWake(LosTaskCB *resumedTask);
|
STATIC VOID HPFWake(LosTaskCB *resumedTask);
|
||||||
STATIC BOOL HPFSchedParamModify(LosTaskCB *taskCB, const SchedParam *param);
|
STATIC BOOL HPFSchedParamModify(LosTaskCB *taskCB, const SchedParam *param);
|
||||||
|
|
@ -67,7 +66,6 @@ STATIC VOID HPFPriorityRestore(LosTaskCB *owner, const LOS_DL_LIST *list, const
|
||||||
const STATIC SchedOps g_priorityOps = {
|
const STATIC SchedOps g_priorityOps = {
|
||||||
.dequeue = HPFDequeue,
|
.dequeue = HPFDequeue,
|
||||||
.enqueue = HPFEnqueue,
|
.enqueue = HPFEnqueue,
|
||||||
.waitTimeGet = HPFWaitTimeGet,
|
|
||||||
.wait = HPFWait,
|
.wait = HPFWait,
|
||||||
.wake = HPFWake,
|
.wake = HPFWake,
|
||||||
.schedParamModify = HPFSchedParamModify,
|
.schedParamModify = HPFSchedParamModify,
|
||||||
|
|
@ -96,7 +94,7 @@ STATIC VOID HPFTimeSliceUpdate(SchedRunqueue *rq, LosTaskCB *taskCB, UINT64 curr
|
||||||
|
|
||||||
if (sched->policy == LOS_SCHED_RR) {
|
if (sched->policy == LOS_SCHED_RR) {
|
||||||
taskCB->timeSlice -= incTime;
|
taskCB->timeSlice -= incTime;
|
||||||
#ifdef LOSCFG_SCHED_HPF_DEBUG
|
#ifdef LOSCFG_SCHED_DEBUG
|
||||||
taskCB->schedStat.timeSliceRealTime += incTime;
|
taskCB->schedStat.timeSliceRealTime += incTime;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
@ -109,7 +107,7 @@ STATIC VOID HPFTimeSliceUpdate(SchedRunqueue *rq, LosTaskCB *taskCB, UINT64 curr
|
||||||
rq->schedFlag |= INT_PEND_RESCH;
|
rq->schedFlag |= INT_PEND_RESCH;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef LOSCFG_SCHED_HPF_DEBUG
|
#ifdef LOSCFG_SCHED_DEBUG
|
||||||
taskCB->schedStat.allRuntime += incTime;
|
taskCB->schedStat.allRuntime += incTime;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
@ -217,7 +215,7 @@ STATIC INLINE VOID PriQueInsert(HPFRunqueue *rq, LosTaskCB *taskCB)
|
||||||
sched->initTimeSlice = TimeSliceCalculate(rq, sched->basePrio, sched->priority);
|
sched->initTimeSlice = TimeSliceCalculate(rq, sched->basePrio, sched->priority);
|
||||||
taskCB->timeSlice = sched->initTimeSlice;
|
taskCB->timeSlice = sched->initTimeSlice;
|
||||||
PriQueTailInsert(rq, sched->basePrio, &taskCB->pendList, sched->priority);
|
PriQueTailInsert(rq, sched->basePrio, &taskCB->pendList, sched->priority);
|
||||||
#ifdef LOSCFG_SCHED_HPF_DEBUG
|
#ifdef LOSCFG_SCHED_DEBUG
|
||||||
taskCB->schedStat.timeSliceTime = taskCB->schedStat.timeSliceRealTime;
|
taskCB->schedStat.timeSliceTime = taskCB->schedStat.timeSliceRealTime;
|
||||||
taskCB->schedStat.timeSliceCount++;
|
taskCB->schedStat.timeSliceCount++;
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -246,7 +244,7 @@ STATIC INLINE VOID PriQueInsert(HPFRunqueue *rq, LosTaskCB *taskCB)
|
||||||
|
|
||||||
STATIC VOID HPFEnqueue(SchedRunqueue *rq, LosTaskCB *taskCB)
|
STATIC VOID HPFEnqueue(SchedRunqueue *rq, LosTaskCB *taskCB)
|
||||||
{
|
{
|
||||||
#ifdef LOSCFG_SCHED_HPF_DEBUG
|
#ifdef LOSCFG_SCHED_DEBUG
|
||||||
if (!(taskCB->taskStatus & OS_TASK_STATUS_RUNNING)) {
|
if (!(taskCB->taskStatus & OS_TASK_STATUS_RUNNING)) {
|
||||||
taskCB->startTime = OsGetCurrSchedTimeCycle();
|
taskCB->startTime = OsGetCurrSchedTimeCycle();
|
||||||
}
|
}
|
||||||
|
|
@ -303,12 +301,6 @@ STATIC UINT32 HPFDelay(LosTaskCB *runTask, UINT64 waitTime)
|
||||||
return LOS_OK;
|
return LOS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
STATIC UINT64 HPFWaitTimeGet(LosTaskCB *taskCB)
|
|
||||||
{
|
|
||||||
taskCB->waitTime += taskCB->startTime;
|
|
||||||
return taskCB->waitTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC UINT32 HPFWait(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 ticks)
|
STATIC UINT32 HPFWait(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 ticks)
|
||||||
{
|
{
|
||||||
runTask->taskStatus |= OS_TASK_STATUS_PENDING;
|
runTask->taskStatus |= OS_TASK_STATUS_PENDING;
|
||||||
|
|
@ -341,7 +333,7 @@ STATIC VOID HPFWake(LosTaskCB *resumedTask)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(resumedTask->taskStatus & OS_TASK_STATUS_SUSPENDED)) {
|
if (!(resumedTask->taskStatus & OS_TASK_STATUS_SUSPENDED)) {
|
||||||
#ifdef LOSCFG_SCHED_HPF_DEBUG
|
#ifdef LOSCFG_SCHED_DEBUG
|
||||||
resumedTask->schedStat.pendTime += OsGetCurrSchedTimeCycle() - resumedTask->startTime;
|
resumedTask->schedStat.pendTime += OsGetCurrSchedTimeCycle() - resumedTask->startTime;
|
||||||
resumedTask->schedStat.pendCount++;
|
resumedTask->schedStat.pendCount++;
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -516,13 +508,13 @@ STATIC VOID HPFPriorityRestore(LosTaskCB *owner, const LOS_DL_LIST *list, const
|
||||||
|
|
||||||
VOID HPFTaskSchedParamInit(LosTaskCB *taskCB, UINT16 policy,
|
VOID HPFTaskSchedParamInit(LosTaskCB *taskCB, UINT16 policy,
|
||||||
const SchedParam *parentParam,
|
const SchedParam *parentParam,
|
||||||
const LosSchedParam *param)
|
const TSK_INIT_PARAM_S *param)
|
||||||
{
|
{
|
||||||
SchedHPF *sched = (SchedHPF *)&taskCB->sp;
|
SchedHPF *sched = (SchedHPF *)&taskCB->sp;
|
||||||
|
|
||||||
sched->policy = policy;
|
sched->policy = policy;
|
||||||
if (param != NULL) {
|
if (param != NULL) {
|
||||||
sched->priority = param->priority;
|
sched->priority = param->usTaskPrio;
|
||||||
} else {
|
} else {
|
||||||
sched->priority = parentParam->priority;
|
sched->priority = parentParam->priority;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -102,26 +102,15 @@ VOID OsSchedExpireTimeUpdate(VOID)
|
||||||
|
|
||||||
STATIC INLINE VOID SchedTimeoutTaskWake(SchedRunqueue *rq, UINT64 currTime, LosTaskCB *taskCB, BOOL *needSched)
|
STATIC INLINE VOID SchedTimeoutTaskWake(SchedRunqueue *rq, UINT64 currTime, LosTaskCB *taskCB, BOOL *needSched)
|
||||||
{
|
{
|
||||||
LOS_SpinLock(&g_taskSpin);
|
#ifndef LOSCFG_SCHED_DEBUG
|
||||||
if (OsSchedPolicyIsEDF(taskCB)) {
|
(VOID)currTime;
|
||||||
SchedEDF *sched = (SchedEDF *)&taskCB->sp;
|
#endif
|
||||||
if (sched->finishTime <= currTime) {
|
|
||||||
if (taskCB->timeSlice >= 0) {
|
|
||||||
PrintExcInfo("EDF task: %u name: %s is timeout, timeout for %llu us.\n",
|
|
||||||
taskCB->taskID, taskCB->taskName, OS_SYS_CYCLE_TO_US(currTime - sched->finishTime));
|
|
||||||
}
|
|
||||||
taskCB->timeSlice = 0;
|
|
||||||
}
|
|
||||||
if (sched->flags == EDF_WAIT_FOREVER) {
|
|
||||||
taskCB->taskStatus &= ~OS_TASK_STATUS_PEND_TIME;
|
|
||||||
sched->flags = EDF_UNUSED;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
LOS_SpinLock(&g_taskSpin);
|
||||||
UINT16 tempStatus = taskCB->taskStatus;
|
UINT16 tempStatus = taskCB->taskStatus;
|
||||||
if (tempStatus & (OS_TASK_STATUS_PEND_TIME | OS_TASK_STATUS_DELAY)) {
|
if (tempStatus & (OS_TASK_STATUS_PENDING | OS_TASK_STATUS_DELAY)) {
|
||||||
taskCB->taskStatus &= ~(OS_TASK_STATUS_PENDING | OS_TASK_STATUS_PEND_TIME | OS_TASK_STATUS_DELAY);
|
taskCB->taskStatus &= ~(OS_TASK_STATUS_PENDING | OS_TASK_STATUS_PEND_TIME | OS_TASK_STATUS_DELAY);
|
||||||
if (tempStatus & OS_TASK_STATUS_PEND_TIME) {
|
if (tempStatus & OS_TASK_STATUS_PENDING) {
|
||||||
taskCB->taskStatus |= OS_TASK_STATUS_TIMEOUT;
|
taskCB->taskStatus |= OS_TASK_STATUS_TIMEOUT;
|
||||||
LOS_ListDelete(&taskCB->pendList);
|
LOS_ListDelete(&taskCB->pendList);
|
||||||
taskCB->taskMux = NULL;
|
taskCB->taskMux = NULL;
|
||||||
|
|
@ -129,7 +118,7 @@ STATIC INLINE VOID SchedTimeoutTaskWake(SchedRunqueue *rq, UINT64 currTime, LosT
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(tempStatus & OS_TASK_STATUS_SUSPENDED)) {
|
if (!(tempStatus & OS_TASK_STATUS_SUSPENDED)) {
|
||||||
#ifdef LOSCFG_SCHED_HPF_DEBUG
|
#ifdef LOSCFG_SCHED_DEBUG
|
||||||
taskCB->schedStat.pendTime += currTime - taskCB->startTime;
|
taskCB->schedStat.pendTime += currTime - taskCB->startTime;
|
||||||
taskCB->schedStat.pendCount++;
|
taskCB->schedStat.pendCount++;
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -223,10 +212,8 @@ VOID OsSchedRunqueueIdleInit(LosTaskCB *idleTask)
|
||||||
|
|
||||||
UINT32 OsSchedInit(VOID)
|
UINT32 OsSchedInit(VOID)
|
||||||
{
|
{
|
||||||
for (UINT16 cpuid = 0; cpuid < LOSCFG_KERNEL_CORE_NUM; cpuid++) {
|
for (UINT16 cpuId = 0; cpuId < LOSCFG_KERNEL_CORE_NUM; cpuId++) {
|
||||||
SchedRunqueue *rq = OsSchedRunqueueByID(cpuid);
|
HPFSchedPolicyInit(OsSchedRunqueueByID(cpuId));
|
||||||
EDFSchedPolicyInit(rq);
|
|
||||||
HPFSchedPolicyInit(rq);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef LOSCFG_SCHED_TICK_DEBUG
|
#ifdef LOSCFG_SCHED_TICK_DEBUG
|
||||||
|
|
@ -260,15 +247,13 @@ INT32 OsSchedParamCompare(const LosTaskCB *task1, const LosTaskCB *task2)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT32 OsSchedParamInit(LosTaskCB *taskCB, UINT16 policy, const SchedParam *parentParam, const LosSchedParam *param)
|
UINT32 OsSchedParamInit(LosTaskCB *taskCB, UINT16 policy, const SchedParam *parentParam, const TSK_INIT_PARAM_S *param)
|
||||||
{
|
{
|
||||||
switch (policy) {
|
switch (policy) {
|
||||||
case LOS_SCHED_FIFO:
|
case LOS_SCHED_FIFO:
|
||||||
case LOS_SCHED_RR:
|
case LOS_SCHED_RR:
|
||||||
HPFTaskSchedParamInit(taskCB, policy, parentParam, param);
|
HPFTaskSchedParamInit(taskCB, policy, parentParam, param);
|
||||||
break;
|
break;
|
||||||
case LOS_SCHED_DEADLINE:
|
|
||||||
return EDFTaskSchedParamInit(taskCB, policy, parentParam, param);
|
|
||||||
case LOS_SCHED_IDLE:
|
case LOS_SCHED_IDLE:
|
||||||
IdleTaskSchedParamInit(taskCB);
|
IdleTaskSchedParamInit(taskCB);
|
||||||
break;
|
break;
|
||||||
|
|
@ -286,9 +271,6 @@ VOID OsSchedProcessDefaultSchedParamGet(UINT16 policy, SchedParam *param)
|
||||||
case LOS_SCHED_RR:
|
case LOS_SCHED_RR:
|
||||||
HPFProcessDefaultSchedParamGet(param);
|
HPFProcessDefaultSchedParamGet(param);
|
||||||
break;
|
break;
|
||||||
case LOS_SCHED_DEADLINE:
|
|
||||||
EDFProcessDefaultSchedParamGet(param);
|
|
||||||
break;
|
|
||||||
case LOS_SCHED_IDLE:
|
case LOS_SCHED_IDLE:
|
||||||
default:
|
default:
|
||||||
PRINT_ERR("Invalid process-level scheduling policy, %u\n", policy);
|
PRINT_ERR("Invalid process-level scheduling policy, %u\n", policy);
|
||||||
|
|
@ -299,19 +281,12 @@ VOID OsSchedProcessDefaultSchedParamGet(UINT16 policy, SchedParam *param)
|
||||||
|
|
||||||
STATIC LosTaskCB *TopTaskGet(SchedRunqueue *rq)
|
STATIC LosTaskCB *TopTaskGet(SchedRunqueue *rq)
|
||||||
{
|
{
|
||||||
LosTaskCB *newTask = EDFRunqueueTopTaskGet(rq->edfRunqueue);
|
LosTaskCB *newTask = HPFRunqueueTopTaskGet(rq->hpfRunqueue);
|
||||||
if (newTask != NULL) {
|
|
||||||
goto FIND;
|
if (newTask == NULL) {
|
||||||
|
newTask = rq->idleTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
newTask = HPFRunqueueTopTaskGet(rq->hpfRunqueue);
|
|
||||||
if (newTask != NULL) {
|
|
||||||
goto FIND;
|
|
||||||
}
|
|
||||||
|
|
||||||
newTask = rq->idleTask;
|
|
||||||
|
|
||||||
FIND:
|
|
||||||
newTask->ops->start(rq, newTask);
|
newTask->ops->start(rq, newTask);
|
||||||
return newTask;
|
return newTask;
|
||||||
}
|
}
|
||||||
|
|
@ -412,7 +387,7 @@ STATIC VOID SchedTaskSwitch(SchedRunqueue *rq, LosTaskCB *runTask, LosTaskCB *ne
|
||||||
OsCpupCycleEndStart(runTask, newTask);
|
OsCpupCycleEndStart(runTask, newTask);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef LOSCFG_SCHED_HPF_DEBUG
|
#ifdef LOSCFG_SCHED_DEBUG
|
||||||
UINT64 waitStartTime = newTask->startTime;
|
UINT64 waitStartTime = newTask->startTime;
|
||||||
#endif
|
#endif
|
||||||
if (runTask->taskStatus & OS_TASK_STATUS_READY) {
|
if (runTask->taskStatus & OS_TASK_STATUS_READY) {
|
||||||
|
|
@ -425,14 +400,14 @@ STATIC VOID SchedTaskSwitch(SchedRunqueue *rq, LosTaskCB *runTask, LosTaskCB *ne
|
||||||
runTask->ops->timeSliceUpdate(rq, runTask, newTask->startTime);
|
runTask->ops->timeSliceUpdate(rq, runTask, newTask->startTime);
|
||||||
|
|
||||||
if (runTask->taskStatus & (OS_TASK_STATUS_PEND_TIME | OS_TASK_STATUS_DELAY)) {
|
if (runTask->taskStatus & (OS_TASK_STATUS_PEND_TIME | OS_TASK_STATUS_DELAY)) {
|
||||||
OsSchedTimeoutQueueAdd(runTask, runTask->ops->waitTimeGet(runTask));
|
OsSchedTimeoutQueueAdd(runTask, runTask->startTime + runTask->waitTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT64 deadline = newTask->ops->deadlineGet(newTask);
|
UINT64 deadline = newTask->ops->deadlineGet(newTask);
|
||||||
SchedNextExpireTimeSet(newTask->taskID, deadline, runTask->taskID);
|
SchedNextExpireTimeSet(newTask->taskID, deadline, runTask->taskID);
|
||||||
|
|
||||||
#ifdef LOSCFG_SCHED_HPF_DEBUG
|
#ifdef LOSCFG_SCHED_DEBUG
|
||||||
newTask->schedStat.waitSchedTime += newTask->startTime - waitStartTime;
|
newTask->schedStat.waitSchedTime += newTask->startTime - waitStartTime;
|
||||||
newTask->schedStat.waitSchedCount++;
|
newTask->schedStat.waitSchedCount++;
|
||||||
runTask->schedStat.runTime = runTask->schedStat.allRuntime;
|
runTask->schedStat.runTime = runTask->schedStat.allRuntime;
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,6 @@ UINT32 OsShellShowTickResponse(VOID)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef LOSCFG_SCHED_HPF_DEBUG
|
|
||||||
STATIC VOID SchedDataGet(const LosTaskCB *taskCB, UINT64 *runTime, UINT64 *timeSlice,
|
STATIC VOID SchedDataGet(const LosTaskCB *taskCB, UINT64 *runTime, UINT64 *timeSlice,
|
||||||
UINT64 *pendTime, UINT64 *schedWait)
|
UINT64 *pendTime, UINT64 *schedWait)
|
||||||
{
|
{
|
||||||
|
|
@ -129,7 +128,6 @@ UINT32 OsShellShowSchedStatistics(VOID)
|
||||||
UINT32 taskLinkNum[LOSCFG_KERNEL_CORE_NUM];
|
UINT32 taskLinkNum[LOSCFG_KERNEL_CORE_NUM];
|
||||||
UINT32 intSave;
|
UINT32 intSave;
|
||||||
LosTaskCB task;
|
LosTaskCB task;
|
||||||
SchedEDF *sched = NULL;
|
|
||||||
|
|
||||||
SCHEDULER_LOCK(intSave);
|
SCHEDULER_LOCK(intSave);
|
||||||
for (UINT16 cpu = 0; cpu < LOSCFG_KERNEL_CORE_NUM; cpu++) {
|
for (UINT16 cpu = 0; cpu < LOSCFG_KERNEL_CORE_NUM; cpu++) {
|
||||||
|
|
@ -152,12 +150,6 @@ UINT32 OsShellShowSchedStatistics(VOID)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
sched = (SchedEDF *)&taskCB->sp;
|
|
||||||
if (sched->policy == LOS_SCHED_DEADLINE) {
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
(VOID)memcpy_s(&task, sizeof(LosTaskCB), taskCB, sizeof(LosTaskCB));
|
(VOID)memcpy_s(&task, sizeof(LosTaskCB), taskCB, sizeof(LosTaskCB));
|
||||||
SCHEDULER_UNLOCK(intSave);
|
SCHEDULER_UNLOCK(intSave);
|
||||||
|
|
||||||
|
|
@ -178,168 +170,3 @@ UINT32 OsShellShowSchedStatistics(VOID)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef LOSCFG_SCHED_EDF_DEBUG
|
|
||||||
#define EDF_DEBUG_NODE 20
|
|
||||||
typedef struct {
|
|
||||||
UINT32 tid;
|
|
||||||
INT32 runTimeUs;
|
|
||||||
UINT64 deadlineUs;
|
|
||||||
UINT64 periodUs;
|
|
||||||
UINT64 startTime;
|
|
||||||
UINT64 finishTime;
|
|
||||||
UINT64 nextfinishTime;
|
|
||||||
UINT64 timeSliceUnused;
|
|
||||||
UINT64 timeSliceRealTime;
|
|
||||||
UINT64 allRuntime;
|
|
||||||
UINT64 pendTime;
|
|
||||||
} EDFDebug;
|
|
||||||
|
|
||||||
STATIC EDFDebug g_edfNode[EDF_DEBUG_NODE];
|
|
||||||
STATIC INT32 g_edfNodePointer = 0;
|
|
||||||
|
|
||||||
VOID EDFDebugRecord(UINTPTR *task, UINT64 oldFinish)
|
|
||||||
{
|
|
||||||
LosTaskCB *taskCB = (LosTaskCB *)task;
|
|
||||||
SchedEDF *sched = (SchedEDF *)&taskCB->sp;
|
|
||||||
SchedParam param;
|
|
||||||
|
|
||||||
// when print edf info, will stop record
|
|
||||||
if (g_edfNodePointer == (EDF_DEBUG_NODE + 1)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
taskCB->ops->schedParamGet(taskCB, ¶m);
|
|
||||||
g_edfNode[g_edfNodePointer].tid = taskCB->taskID;
|
|
||||||
g_edfNode[g_edfNodePointer].runTimeUs =param.runTimeUs;
|
|
||||||
g_edfNode[g_edfNodePointer].deadlineUs =param.deadlineUs;
|
|
||||||
g_edfNode[g_edfNodePointer].periodUs =param.periodUs;
|
|
||||||
g_edfNode[g_edfNodePointer].startTime = taskCB->startTime;
|
|
||||||
if (taskCB->timeSlice <= 0) {
|
|
||||||
taskCB->irqUsedTime = 0;
|
|
||||||
g_edfNode[g_edfNodePointer].timeSliceUnused = 0;
|
|
||||||
} else {
|
|
||||||
g_edfNode[g_edfNodePointer].timeSliceUnused = taskCB->timeSlice;
|
|
||||||
}
|
|
||||||
g_edfNode[g_edfNodePointer].finishTime = oldFinish;
|
|
||||||
g_edfNode[g_edfNodePointer].nextfinishTime = sched->finishTime;
|
|
||||||
g_edfNode[g_edfNodePointer].timeSliceRealTime = taskCB->schedStat.timeSliceRealTime;
|
|
||||||
g_edfNode[g_edfNodePointer].allRuntime = taskCB->schedStat.allRuntime;
|
|
||||||
g_edfNode[g_edfNodePointer].pendTime = taskCB->schedStat.pendTime;
|
|
||||||
|
|
||||||
g_edfNodePointer++;
|
|
||||||
if (g_edfNodePointer == EDF_DEBUG_NODE) {
|
|
||||||
g_edfNodePointer = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
STATIC VOID EDFInfoPrint(int idx)
|
|
||||||
{
|
|
||||||
INT32 runTimeUs;
|
|
||||||
UINT64 deadlineUs;
|
|
||||||
UINT64 periodUs;
|
|
||||||
UINT64 startTime;
|
|
||||||
UINT64 timeSlice;
|
|
||||||
UINT64 finishTime;
|
|
||||||
UINT64 nextfinishTime;
|
|
||||||
UINT64 pendTime;
|
|
||||||
UINT64 allRuntime;
|
|
||||||
UINT64 timeSliceRealTime;
|
|
||||||
CHAR *status = NULL;
|
|
||||||
|
|
||||||
startTime = OS_SYS_CYCLE_TO_US(g_edfNode[idx].startTime);
|
|
||||||
timeSlice = OS_SYS_CYCLE_TO_US(g_edfNode[idx].timeSliceUnused);
|
|
||||||
finishTime = OS_SYS_CYCLE_TO_US(g_edfNode[idx].finishTime);
|
|
||||||
nextfinishTime = OS_SYS_CYCLE_TO_US(g_edfNode[idx].nextfinishTime);
|
|
||||||
pendTime = OS_SYS_CYCLE_TO_US(g_edfNode[idx].pendTime);
|
|
||||||
allRuntime = OS_SYS_CYCLE_TO_US(g_edfNode[idx].allRuntime);
|
|
||||||
timeSliceRealTime = OS_SYS_CYCLE_TO_US(g_edfNode[idx].timeSliceRealTime);
|
|
||||||
runTimeUs = g_edfNode[idx].runTimeUs;
|
|
||||||
deadlineUs = g_edfNode[idx].deadlineUs;
|
|
||||||
periodUs = g_edfNode[idx].periodUs;
|
|
||||||
|
|
||||||
if (timeSlice > 0) {
|
|
||||||
status = "TIMEOUT";
|
|
||||||
} else if (nextfinishTime == finishTime) {
|
|
||||||
status = "NEXT PERIOD";
|
|
||||||
} else {
|
|
||||||
status = "WAIT RUN";
|
|
||||||
}
|
|
||||||
|
|
||||||
PRINTK("%4u%9d%9llu%9llu%12llu%12llu%12llu%9llu%9llu%9llu%9llu %-12s\n",
|
|
||||||
g_edfNode[idx].tid, runTimeUs, deadlineUs, periodUs,
|
|
||||||
startTime, finishTime, nextfinishTime, allRuntime, timeSliceRealTime,
|
|
||||||
timeSlice, pendTime, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
VOID OsEDFDebugPrint(VOID)
|
|
||||||
{
|
|
||||||
INT32 max;
|
|
||||||
UINT32 intSave;
|
|
||||||
INT32 i;
|
|
||||||
|
|
||||||
SCHEDULER_LOCK(intSave);
|
|
||||||
max = g_edfNodePointer;
|
|
||||||
g_edfNodePointer = EDF_DEBUG_NODE + 1;
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
|
||||||
|
|
||||||
PRINTK("\r\nlast %d sched is: (in microsecond)\r\n", EDF_DEBUG_NODE);
|
|
||||||
|
|
||||||
PRINTK(" TID RunTime Deadline Period StartTime "
|
|
||||||
"CurPeriod NextPeriod AllRun RealRun TimeOut WaitTime Status\n");
|
|
||||||
|
|
||||||
for (i = max; i < EDF_DEBUG_NODE; i++) {
|
|
||||||
EDFInfoPrint(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < max; i++) {
|
|
||||||
EDFInfoPrint(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
SCHEDULER_LOCK(intSave);
|
|
||||||
g_edfNodePointer = max;
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
|
||||||
}
|
|
||||||
|
|
||||||
UINT32 OsShellShowEdfSchedStatistics(VOID)
|
|
||||||
{
|
|
||||||
UINT32 intSave;
|
|
||||||
LosTaskCB task;
|
|
||||||
UINT64 curTime;
|
|
||||||
UINT64 deadline;
|
|
||||||
UINT64 finishTime;
|
|
||||||
SchedEDF *sched = NULL;
|
|
||||||
|
|
||||||
PRINTK("Now Alive EDF Thread:\n");
|
|
||||||
PRINTK("TID CurTime DeadTime FinishTime taskName\n");
|
|
||||||
|
|
||||||
for (UINT32 tid = 0; tid < g_taskMaxNum; tid++) {
|
|
||||||
LosTaskCB *taskCB = g_taskCBArray + tid;
|
|
||||||
SCHEDULER_LOCK(intSave);
|
|
||||||
if (OsTaskIsUnused(taskCB)) {
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
sched = (SchedEDF *)&taskCB->sp;
|
|
||||||
if (sched->policy != LOS_SCHED_DEADLINE) {
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
(VOID)memcpy_s(&task, sizeof(LosTaskCB), taskCB, sizeof(LosTaskCB));
|
|
||||||
|
|
||||||
curTime = OS_SYS_CYCLE_TO_US(HalClockGetCycles());
|
|
||||||
finishTime = OS_SYS_CYCLE_TO_US(sched->finishTime);
|
|
||||||
deadline = OS_SYS_CYCLE_TO_US(taskCB->ops->deadlineGet(taskCB));
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
|
||||||
|
|
||||||
PRINTK("%3u%15llu%15llu%15llu %-32s\n",
|
|
||||||
task.taskID, curTime, deadline, finishTime, task.taskName);
|
|
||||||
}
|
|
||||||
|
|
||||||
OsEDFDebugPrint();
|
|
||||||
|
|
||||||
return LOS_OK;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
|
|
@ -76,8 +76,6 @@ const CHAR *OsGetRegionNameOrFilePath(LosVmMapRegion *region)
|
||||||
return "MMAP";
|
return "MMAP";
|
||||||
} else if (region->regionFlags & VM_MAP_REGION_FLAG_SHM) {
|
} else if (region->regionFlags & VM_MAP_REGION_FLAG_SHM) {
|
||||||
return "SHM";
|
return "SHM";
|
||||||
} else if (region->regionFlags & VM_MAP_REGION_FLAG_LITEIPC) {
|
|
||||||
return "LITEIPC";
|
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -261,7 +261,7 @@ STATIC UINT32 GetDirtySize(LosFilePage *fpage, struct Vnode *vnode)
|
||||||
|
|
||||||
STATIC INT32 OsFlushDirtyPage(LosFilePage *fpage)
|
STATIC INT32 OsFlushDirtyPage(LosFilePage *fpage)
|
||||||
{
|
{
|
||||||
ssize_t ret;
|
UINT32 ret;
|
||||||
size_t len;
|
size_t len;
|
||||||
char *buff = NULL;
|
char *buff = NULL;
|
||||||
struct Vnode *vnode = fpage->mapping->host;
|
struct Vnode *vnode = fpage->mapping->host;
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ STATIC struct VmPhysArea g_physArea[] = {
|
||||||
struct VmPhysSeg g_vmPhysSeg[VM_PHYS_SEG_MAX];
|
struct VmPhysSeg g_vmPhysSeg[VM_PHYS_SEG_MAX];
|
||||||
INT32 g_vmPhysSegNum = 0;
|
INT32 g_vmPhysSegNum = 0;
|
||||||
|
|
||||||
LosVmPhysSeg *OsGVmPhysSegGet(void)
|
LosVmPhysSeg *OsGVmPhysSegGet()
|
||||||
{
|
{
|
||||||
return g_vmPhysSeg;
|
return g_vmPhysSeg;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -273,8 +273,6 @@ STATIC UINT32 OsInheritOldRegionName(UINT32 oldRegionFlags)
|
||||||
vmFlags |= VM_MAP_REGION_FLAG_MMAP;
|
vmFlags |= VM_MAP_REGION_FLAG_MMAP;
|
||||||
} else if (oldRegionFlags & VM_MAP_REGION_FLAG_SHM) {
|
} else if (oldRegionFlags & VM_MAP_REGION_FLAG_SHM) {
|
||||||
vmFlags |= VM_MAP_REGION_FLAG_SHM;
|
vmFlags |= VM_MAP_REGION_FLAG_SHM;
|
||||||
} else if (oldRegionFlags & VM_MAP_REGION_FLAG_LITEIPC) {
|
|
||||||
vmFlags |= VM_MAP_REGION_FLAG_LITEIPC;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return vmFlags;
|
return vmFlags;
|
||||||
|
|
@ -300,9 +298,7 @@ INT32 LOS_DoMprotect(VADDR_T vaddr, size_t len, unsigned long prot)
|
||||||
goto OUT_MPROTECT;
|
goto OUT_MPROTECT;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((region->regionFlags & VM_MAP_REGION_FLAG_VDSO) ||
|
if ((region->regionFlags & VM_MAP_REGION_FLAG_VDSO) || (region->regionFlags & VM_MAP_REGION_FLAG_HEAP)) {
|
||||||
(region->regionFlags & VM_MAP_REGION_FLAG_HEAP) ||
|
|
||||||
(region->regionFlags & VM_MAP_REGION_FLAG_LITEIPC)) {
|
|
||||||
ret = -EPERM;
|
ret = -EPERM;
|
||||||
goto OUT_MPROTECT;
|
goto OUT_MPROTECT;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -689,9 +689,6 @@ INT32 ShmCtl(INT32 shmid, INT32 cmd, struct shmid_ds *buf)
|
||||||
(shm_perm.mode & ACCESSPERMS);
|
(shm_perm.mode & ACCESSPERMS);
|
||||||
seg->ds.shm_ctime = time(NULL);
|
seg->ds.shm_ctime = time(NULL);
|
||||||
#ifdef LOSCFG_SHELL
|
#ifdef LOSCFG_SHELL
|
||||||
if (OsProcessIDUserCheckInvalid(shm_perm.uid)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
(VOID)memcpy_s(seg->ownerName, OS_PCB_NAME_LEN, OS_PCB_FROM_PID(shm_perm.uid)->processName,
|
(VOID)memcpy_s(seg->ownerName, OS_PCB_NAME_LEN, OS_PCB_FROM_PID(shm_perm.uid)->processName,
|
||||||
OS_PCB_NAME_LEN);
|
OS_PCB_NAME_LEN);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -687,7 +687,7 @@ STATIC ssize_t ConsoleRead(struct file *filep, CHAR *buffer, size_t bufLen)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (userBuf) {
|
if (userBuf) {
|
||||||
if (LOS_ArchCopyToUser(buffer, sbuffer, ret) != 0) {
|
if (LOS_ArchCopyToUser(buffer, sbuffer, bufLen) != 0) {
|
||||||
ret = -EFAULT;
|
ret = -EFAULT;
|
||||||
goto ERROUT;
|
goto ERROUT;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ import("//kernel/liteos_a/liteos.gni")
|
||||||
group("extended") {
|
group("extended") {
|
||||||
deps = [
|
deps = [
|
||||||
"blackbox",
|
"blackbox",
|
||||||
"container",
|
|
||||||
"cppsupport",
|
"cppsupport",
|
||||||
"cpup",
|
"cpup",
|
||||||
"dynload",
|
"dynload",
|
||||||
|
|
@ -53,7 +52,6 @@ group("extended") {
|
||||||
config("public") {
|
config("public") {
|
||||||
configs = [
|
configs = [
|
||||||
"blackbox:public",
|
"blackbox:public",
|
||||||
"container:public",
|
|
||||||
"cpup:public",
|
"cpup:public",
|
||||||
"dynload:public",
|
"dynload:public",
|
||||||
"hidumper:public",
|
"hidumper:public",
|
||||||
|
|
|
||||||
|
|
@ -113,54 +113,6 @@ config KERNEL_HOOK
|
||||||
default n
|
default n
|
||||||
depends on KERNEL_EXTKERNEL && DEBUG_VERSION
|
depends on KERNEL_EXTKERNEL && DEBUG_VERSION
|
||||||
|
|
||||||
|
|
||||||
######################### config options of container ####################
|
|
||||||
config KERNEL_CONTAINER
|
|
||||||
bool "Enable container Feature"
|
|
||||||
default n
|
|
||||||
depends on KERNEL_VM
|
|
||||||
|
|
||||||
config PID_CONTAINER
|
|
||||||
bool "Enable pid container Feature"
|
|
||||||
default n
|
|
||||||
depends on KERNEL_CONTAINER
|
|
||||||
|
|
||||||
config UTS_CONTAINER
|
|
||||||
bool "Enable uts container Feature"
|
|
||||||
default n
|
|
||||||
depends on KERNEL_CONTAINER
|
|
||||||
|
|
||||||
config MNT_CONTAINER
|
|
||||||
bool "Enable mnt container Feature"
|
|
||||||
default n
|
|
||||||
depends on KERNEL_CONTAINER
|
|
||||||
|
|
||||||
config CHROOT
|
|
||||||
bool "Enable chroot"
|
|
||||||
default n
|
|
||||||
depends on MNT_CONTAINER
|
|
||||||
|
|
||||||
config IPC_CONTAINER
|
|
||||||
bool "Enable ipc container Feature"
|
|
||||||
default n
|
|
||||||
depends on KERNEL_CONTAINER
|
|
||||||
|
|
||||||
config TIME_CONTAINER
|
|
||||||
bool "Enable time container"
|
|
||||||
default n
|
|
||||||
depends on KERNEL_CONTAINER
|
|
||||||
|
|
||||||
config USER_CONTAINER
|
|
||||||
bool "Enable user container"
|
|
||||||
default n
|
|
||||||
depends on KERNEL_CONTAINER
|
|
||||||
|
|
||||||
config NET_CONTAINER
|
|
||||||
bool "Enable net container"
|
|
||||||
default n
|
|
||||||
depends on KERNEL_CONTAINER
|
|
||||||
|
|
||||||
|
|
||||||
######################### config options of trace #########################
|
######################### config options of trace #########################
|
||||||
source "kernel/extended/trace/Kconfig"
|
source "kernel/extended/trace/Kconfig"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,65 +0,0 @@
|
||||||
# Copyright (c) 2023-2023 Huawei Device Co., Ltd. All rights reserved.
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without modification,
|
|
||||||
# are permitted provided that the following conditions are met:
|
|
||||||
#
|
|
||||||
# 1. Redistributions of source code must retain the above copyright notice, this list of
|
|
||||||
# conditions and the following disclaimer.
|
|
||||||
#
|
|
||||||
# 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
|
||||||
# of conditions and the following disclaimer in the documentation and/or other materials
|
|
||||||
# provided with the distribution.
|
|
||||||
#
|
|
||||||
# 3. Neither the name of the copyright holder nor the names of its contributors may be used
|
|
||||||
# to endorse or promote products derived from this software without specific prior written
|
|
||||||
# permission.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
|
||||||
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
||||||
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
||||||
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
||||||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_KERNEL_CONTAINER)
|
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
|
||||||
kernel_module(module_name) {
|
|
||||||
sources = [ "los_container.c" ]
|
|
||||||
if (defined(LOSCFG_IPC_CONTAINER)) {
|
|
||||||
sources += [ "los_ipc_container.c" ]
|
|
||||||
}
|
|
||||||
if (defined(LOSCFG_MNT_CONTAINER)) {
|
|
||||||
sources += [ "los_mnt_container.c" ]
|
|
||||||
}
|
|
||||||
if (defined(LOSCFG_NET_CONTAINER)) {
|
|
||||||
sources += [ "los_net_container.c" ]
|
|
||||||
}
|
|
||||||
if (defined(LOSCFG_PID_CONTAINER)) {
|
|
||||||
sources += [ "los_pid_container.c" ]
|
|
||||||
}
|
|
||||||
if (defined(LOSCFG_TIME_CONTAINER)) {
|
|
||||||
sources += [ "los_time_container.c" ]
|
|
||||||
}
|
|
||||||
if (defined(LOSCFG_USER_CONTAINER)) {
|
|
||||||
sources += [
|
|
||||||
"los_credentials.c",
|
|
||||||
"los_user_container.c",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
if (defined(LOSCFG_UTS_CONTAINER)) {
|
|
||||||
sources += [ "los_uts_container.c" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
public_configs = [ ":public" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
config("public") {
|
|
||||||
include_dirs = [ "." ]
|
|
||||||
}
|
|
||||||
|
|
@ -1,63 +0,0 @@
|
||||||
# Copyright (c) 2023-2023 Huawei Device Co., Ltd. All rights reserved.
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without modification,
|
|
||||||
# are permitted provided that the following conditions are met:
|
|
||||||
#
|
|
||||||
# 1. Redistributions of source code must retain the above copyright notice, this list of
|
|
||||||
# conditions and the following disclaimer.
|
|
||||||
#
|
|
||||||
# 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
|
||||||
# of conditions and the following disclaimer in the documentation and/or other materials
|
|
||||||
# provided with the distribution.
|
|
||||||
#
|
|
||||||
# 3. Neither the name of the copyright holder nor the names of its contributors may be used
|
|
||||||
# to endorse or promote products derived from this software without specific prior written
|
|
||||||
# permission.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
|
||||||
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
||||||
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
||||||
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
||||||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
|
|
||||||
include $(LITEOSTOPDIR)/config.mk
|
|
||||||
|
|
||||||
MODULE_NAME := $(notdir $(shell pwd))
|
|
||||||
|
|
||||||
LOCAL_SRCS := $(wildcard *.c)
|
|
||||||
|
|
||||||
ifneq ($(LOSCFG_IPC_CONTAINER), y)
|
|
||||||
LOCAL_SRCS += $(filter-out los_ipc_container.c, $(LOCAL_SRCS))
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(LOSCFG_MNT_CONTAINER), y)
|
|
||||||
LOCAL_SRCS += $(filter-out los_mnt_container.c, $(LOCAL_SRCS))
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(LOSCFG_NET_CONTAINER), y)
|
|
||||||
LOCAL_SRCS += $(filter-out los_net_container.c, $(LOCAL_SRCS))
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(LOSCFG_PID_CONTAINER), y)
|
|
||||||
LOCAL_SRCS += $(filter-out los_pid_container.c, $(LOCAL_SRCS))
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(LOSCFG_TIME_CONTAINER), y)
|
|
||||||
LOCAL_SRCS += $(filter-out los_time_container.c, $(LOCAL_SRCS))
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(LOSCFG_USER_CONTAINER), y)
|
|
||||||
LOCAL_SRCS += $(filter-out los_credentials.c los_user_container.c, $(LOCAL_SRCS))
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(LOSCFG_UTS_CONTAINER), y)
|
|
||||||
LOCAL_SRCS += $(filter-out los_uts_container.c, $(LOCAL_SRCS))
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(MODULE)
|
|
||||||
|
|
@ -278,6 +278,7 @@ static void DumpFaultLog(void)
|
||||||
|
|
||||||
static void DumpMemData(struct MemDumpParam *param)
|
static void DumpMemData(struct MemDumpParam *param)
|
||||||
{
|
{
|
||||||
|
PRINTK("\nDumpType: %d\n", param->type);
|
||||||
PRINTK("Unsupported now!\n");
|
PRINTK("Unsupported now!\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ module_switch = defined(LOSCFG_BASE_CORE_HILOG)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
kernel_module(module_name) {
|
kernel_module(module_name) {
|
||||||
sources = [
|
sources = [
|
||||||
"$HIVIEWDFX_HILOG_LITE_DIR/frameworks/featured/hiview_log.c",
|
"//base/hiviewdfx/hilog_lite/frameworks/featured/hiview_log.c",
|
||||||
"los_hilog.c",
|
"los_hilog.c",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
@ -42,8 +42,8 @@ kernel_module(module_name) {
|
||||||
|
|
||||||
config("public") {
|
config("public") {
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"$HIVIEWDFX_HILOG_LITE_DIR/interfaces/native/kits",
|
"//base/hiviewdfx/hilog_lite/interfaces/native/kits",
|
||||||
"$HIVIEWDFX_HILOG_LITE_DIR/interfaces/native/kits/hilog",
|
"//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog",
|
||||||
".",
|
".",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -239,7 +239,6 @@ LITE_OS_SEC_TEXT STATIC int LiteIpcMmap(struct file *filep, LosVmMapRegion *regi
|
||||||
goto ERROR_MAP_OUT;
|
goto ERROR_MAP_OUT;
|
||||||
}
|
}
|
||||||
ipcInfo->pool.poolSize = region->range.size;
|
ipcInfo->pool.poolSize = region->range.size;
|
||||||
region->regionFlags |= VM_MAP_REGION_FLAG_LITEIPC;
|
|
||||||
return 0;
|
return 0;
|
||||||
ERROR_MAP_OUT:
|
ERROR_MAP_OUT:
|
||||||
LOS_VFree(ipcInfo->pool.kvaddr);
|
LOS_VFree(ipcInfo->pool.kvaddr);
|
||||||
|
|
@ -758,10 +757,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 HandlePtr(LosProcessCB *pcb, SpecialObj *obj, BOO
|
||||||
obj->content.ptr.buff = (VOID *)GetIpcUserAddr(pcb, (INTPTR)buf);
|
obj->content.ptr.buff = (VOID *)GetIpcUserAddr(pcb, (INTPTR)buf);
|
||||||
EnableIpcNodeFreeByUser(pcb, (VOID *)buf);
|
EnableIpcNodeFreeByUser(pcb, (VOID *)buf);
|
||||||
} else {
|
} else {
|
||||||
buf = (VOID *)GetIpcKernelAddr(pcb, (INTPTR)obj->content.ptr.buff);
|
(VOID)LiteIpcNodeFree(pcb, (VOID *)GetIpcKernelAddr(pcb, (INTPTR)obj->content.ptr.buff));
|
||||||
if (IsIpcNode(pcb, buf) == TRUE) {
|
|
||||||
(VOID)LiteIpcNodeFree(pcb, buf);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return LOS_OK;
|
return LOS_OK;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
|
import("//third_party/NuttX/NuttX.gni")
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_KERNEL_PIPE)
|
module_switch = defined(LOSCFG_KERNEL_PIPE)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
|
|
|
||||||
|
|
@ -485,35 +485,29 @@ UINT32 OsDevLimitWriteDeny(ProcLimitSet *plimit, const CHAR *buf, UINT32 size)
|
||||||
return DevLimitUpdateAccess(plimit, buf, DEVLIMIT_DENY);
|
return DevLimitUpdateAccess(plimit, buf, DEVLIMIT_DENY);
|
||||||
}
|
}
|
||||||
|
|
||||||
STATIC VOID DevLimitItemSetAccess(CHAR *accArray, INT16 access)
|
STATIC VOID DevLimitItemSetAccess(CHAR *acc, INT16 access)
|
||||||
{
|
{
|
||||||
INT32 index = 0;
|
INT32 index = 0;
|
||||||
(VOID)memset_s(accArray, ACCLEN, 0, ACCLEN);
|
(VOID)memset_s(acc, ACCLEN, 0, ACCLEN);
|
||||||
if (access & DEVLIMIT_ACC_READ) {
|
if (access & DEVLIMIT_ACC_READ) {
|
||||||
accArray[index] = 'r';
|
acc[index++] = 'r';
|
||||||
index++;
|
|
||||||
}
|
}
|
||||||
if (access & DEVLIMIT_ACC_WRITE) {
|
if (access & DEVLIMIT_ACC_WRITE) {
|
||||||
accArray[index] = 'w';
|
acc[index++] = 'w';
|
||||||
index++;
|
|
||||||
}
|
}
|
||||||
if (access & DEVLIMIT_ACC_MKNOD) {
|
if (access & DEVLIMIT_ACC_MKNOD) {
|
||||||
accArray[index] = 'm';
|
acc[index++] = 'm';
|
||||||
index++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
STATIC CHAR DevLimitItemTypeToChar(INT16 type)
|
STATIC CHAR DevLimitItemTypeToChar(INT16 type)
|
||||||
{
|
{
|
||||||
switch (type) {
|
if (type == DEVLIMIT_DEV_ALL) {
|
||||||
case DEVLIMIT_DEV_ALL:
|
return 'a';
|
||||||
return 'a';
|
} else if (type == DEVLIMIT_DEV_CHAR) {
|
||||||
case DEVLIMIT_DEV_CHAR:
|
return 'c';
|
||||||
return 'c';
|
} else if (type == DEVLIMIT_DEV_BLOCK) {
|
||||||
case DEVLIMIT_DEV_BLOCK:
|
return 'b';
|
||||||
return 'b';
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
return 'X';
|
return 'X';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -47,13 +47,13 @@
|
||||||
|
|
||||||
extern INT32 LOS_Fork(UINT32 flags, const CHAR *name, const TSK_ENTRY_FUNC entry, UINT32 stackSize);
|
extern INT32 LOS_Fork(UINT32 flags, const CHAR *name, const TSK_ENTRY_FUNC entry, UINT32 stackSize);
|
||||||
|
|
||||||
extern INT32 LOS_SetProcessPriority(INT32 pid, INT32 prio);
|
extern INT32 LOS_SetProcessPriority(INT32 pid, UINT16 prio);
|
||||||
|
|
||||||
extern INT32 LOS_GetProcessPriority(INT32 pid);
|
extern INT32 LOS_GetProcessPriority(INT32 pid);
|
||||||
|
|
||||||
extern INT32 LOS_GetProcessScheduler(INT32 pid, INT32 *policy, LosSchedParam *schedParam);
|
extern INT32 LOS_GetProcessScheduler(INT32 pid);
|
||||||
|
|
||||||
extern INT32 LOS_SetProcessScheduler(INT32 pid, UINT16 policy, const LosSchedParam *schedParam);
|
extern INT32 LOS_SetProcessScheduler(INT32 pid, UINT16 policy, UINT16 prio);
|
||||||
|
|
||||||
extern UINT32 LOS_GetCurrProcessID(VOID);
|
extern UINT32 LOS_GetCurrProcessID(VOID);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -514,21 +514,8 @@ typedef struct tagTskInitParam {
|
||||||
UINT16 consoleID; /**< The console id of task belongs */
|
UINT16 consoleID; /**< The console id of task belongs */
|
||||||
UINTPTR processID;
|
UINTPTR processID;
|
||||||
UserTaskParam userParam;
|
UserTaskParam userParam;
|
||||||
/* edf parameters */
|
|
||||||
UINT32 runTimeUs;
|
|
||||||
UINT64 deadlineUs;
|
|
||||||
UINT64 periodUs;
|
|
||||||
} TSK_INIT_PARAM_S;
|
} TSK_INIT_PARAM_S;
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
union {
|
|
||||||
INT32 priority;
|
|
||||||
INT32 runTimeUs;
|
|
||||||
};
|
|
||||||
INT32 deadlineUs;
|
|
||||||
INT32 periodUs;
|
|
||||||
} LosSchedParam;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ingroup los_task
|
* @ingroup los_task
|
||||||
* Task name length
|
* Task name length
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,11 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_MUSL_DIR/porting/liteos_a/kernel/musl.gni")
|
|
||||||
import("$THIRDPARTY_OPTIMIZED_ROUTINES_DIR/optimized-routines.gni")
|
MUSLDIR = "$LITEOSTHIRDPARTY/musl"
|
||||||
|
|
||||||
|
import("//third_party/optimized-routines/optimized-routines.gni")
|
||||||
|
import("$MUSLDIR/porting/liteos_a/kernel/musl.gni")
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_LIBC_MUSL)
|
module_switch = defined(LOSCFG_LIBC_MUSL)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,5 @@ else
|
||||||
LOCAL_FLAGS += -frounding-math -Wno-unused-but-set-variable
|
LOCAL_FLAGS += -frounding-math -Wno-unused-but-set-variable
|
||||||
endif
|
endif
|
||||||
LOCAL_FLAGS += -Wno-shift-op-parentheses -Wno-logical-op-parentheses -Wno-bitwise-op-parentheses -Wno-unknown-pragmas
|
LOCAL_FLAGS += -Wno-shift-op-parentheses -Wno-logical-op-parentheses -Wno-bitwise-op-parentheses -Wno-unknown-pragmas
|
||||||
LOCAL_FLAGS += -Wno-unused-but-set-variable
|
|
||||||
|
|
||||||
include $(MODULE)
|
include $(MODULE)
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_MUSL_DIR/porting/liteos_a_newlib/kernel/newlib.gni")
|
import("//third_party/musl/porting/liteos_a_newlib/kernel/newlib.gni")
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_LIBC_NEWLIB)
|
module_switch = defined(LOSCFG_LIBC_NEWLIB)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_FREEBSD_DIR/FreeBSD.gni")
|
import("//third_party/FreeBSD/FreeBSD.gni")
|
||||||
|
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
kernel_module(module_name) {
|
kernel_module(module_name) {
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
import("//kernel/liteos_a/liteos.gni")
|
||||||
import("$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR/libsec_src.gni")
|
import("//third_party/bounds_checking_function/libsec_src.gni")
|
||||||
|
|
||||||
module_switch = defined(LOSCFG_LIB_LIBC)
|
module_switch = defined(LOSCFG_LIB_LIBC)
|
||||||
module_name = get_path_info(rebase_path("."), "name")
|
module_name = get_path_info(rebase_path("."), "name")
|
||||||
|
|
|
||||||
15
liteos.gni
15
liteos.gni
|
|
@ -32,19 +32,6 @@ import("$root_out_dir/config.gni")
|
||||||
LITEOSTOPDIR = "//kernel/liteos_a"
|
LITEOSTOPDIR = "//kernel/liteos_a"
|
||||||
LITEOSTHIRDPARTY = "//third_party"
|
LITEOSTHIRDPARTY = "//third_party"
|
||||||
HDFTOPDIR = "//drivers/hdf_core/adapter/khdf/liteos"
|
HDFTOPDIR = "//drivers/hdf_core/adapter/khdf/liteos"
|
||||||
HIVIEWDFX_HILOG_LITE_DIR = "//base/hiviewdfx/hilog_lite"
|
|
||||||
DRIVERS_LITEOS_DIR = "//drivers/liteos"
|
|
||||||
THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR =
|
|
||||||
"//third_party/bounds_checking_function"
|
|
||||||
THIRDPARTY_FATFS_DIR = "//third_party/FatFs"
|
|
||||||
THIRDPARTY_NUTTX_DIR = "//third_party/NuttX"
|
|
||||||
THIRDPARTY_MUSL_DIR = "//third_party/musl"
|
|
||||||
THIRDPARTY_TOYBOX_DIR = "//third_party/toybox"
|
|
||||||
THIRDPARTY_MKSH_DIR = "//third_party/mksh"
|
|
||||||
THIRDPARTY_FREEBSD_DIR = "//third_party/FreeBSD"
|
|
||||||
THIRDPARTY_OPTIMIZED_ROUTINES_DIR = "//third_party/optimized-routines"
|
|
||||||
THIRDPARTY_GOOGLETEST_DIR = "//third_party/googletest"
|
|
||||||
KERNEL_LINUX_DIR = "//kernel/linux/linux-5.10"
|
|
||||||
|
|
||||||
ARCH = ""
|
ARCH = ""
|
||||||
if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
|
if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
|
||||||
|
|
@ -148,8 +135,8 @@ set_defaults("kernel_module") {
|
||||||
"$LITEOSTOPDIR:los_config",
|
"$LITEOSTOPDIR:los_config",
|
||||||
]
|
]
|
||||||
visibility = [
|
visibility = [
|
||||||
":*",
|
|
||||||
"$LITEOSTOPDIR:*",
|
"$LITEOSTOPDIR:*",
|
||||||
|
":*",
|
||||||
"..:*",
|
"..:*",
|
||||||
"../..:*",
|
"../..:*",
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,7 @@ INT32 CmdLog(INT32 argc, const CHAR **argv)
|
||||||
PRINTK("not support yet\n");
|
PRINTK("not support yet\n");
|
||||||
}
|
}
|
||||||
} else if (!strncmp(argv[0], "path", strlen(argv[0]) + 1)) {
|
} else if (!strncmp(argv[0], "path", strlen(argv[0]) + 1)) {
|
||||||
|
OsLkLogFileSet(argv[1]);
|
||||||
PRINTK("not support yet\n");
|
PRINTK("not support yet\n");
|
||||||
} else {
|
} else {
|
||||||
PRINTK("Usage: log level <num>\n");
|
PRINTK("Usage: log level <num>\n");
|
||||||
|
|
|
||||||
|
|
@ -321,7 +321,7 @@ static unsigned int ProcRealProcessIDGet(unsigned int pid)
|
||||||
|
|
||||||
SCHEDULER_LOCK(intSave);
|
SCHEDULER_LOCK(intSave);
|
||||||
LosProcessCB *pcb = OsGetPCBFromVpid(pid);
|
LosProcessCB *pcb = OsGetPCBFromVpid(pid);
|
||||||
if (OsProcessIsInactive(pcb)) {
|
if (pcb == NULL) {
|
||||||
SCHEDULER_UNLOCK(intSave);
|
SCHEDULER_UNLOCK(intSave);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -94,15 +94,9 @@ int SysMqClose(mqd_t personal)
|
||||||
int SysMqNotify(mqd_t personal, const struct sigevent *sigev)
|
int SysMqNotify(mqd_t personal, const struct sigevent *sigev)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
struct sigevent ksigev;
|
|
||||||
|
|
||||||
ret = LOS_ArchCopyFromUser(&ksigev, sigev, sizeof(struct sigevent));
|
|
||||||
if (ret != 0) {
|
|
||||||
return -EFAULT;
|
|
||||||
}
|
|
||||||
|
|
||||||
MQUEUE_FD_U2K(personal);
|
MQUEUE_FD_U2K(personal);
|
||||||
ret = OsMqNotify(personal, &ksigev);
|
ret = OsMqNotify(personal, sigev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
return -get_errno();
|
return -get_errno();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -72,10 +72,10 @@ extern unsigned int SysGetGroupId(void);
|
||||||
extern unsigned int SysGetTid(void);
|
extern unsigned int SysGetTid(void);
|
||||||
extern void SysSchedYield(int type);
|
extern void SysSchedYield(int type);
|
||||||
extern int SysSchedGetScheduler(int id, int flag);
|
extern int SysSchedGetScheduler(int id, int flag);
|
||||||
extern int SysSchedSetScheduler(int id, int policy, const LosSchedParam *userParam, int flag);
|
extern int SysSchedSetScheduler(int id, int policy, int prio, int flag);
|
||||||
extern int SysSchedGetParam(int id, LosSchedParam *userParam, int flag);
|
extern int SysSchedGetParam(int id, int flag);
|
||||||
extern int SysSchedSetParam(int id, const LosSchedParam *userParam, int flag);
|
extern int SysSchedSetParam(int id, unsigned int prio, int flag);
|
||||||
extern int SysSetProcessPriority(int which, int who, int prio);
|
extern int SysSetProcessPriority(int which, int who, unsigned int prio);
|
||||||
extern int SysGetProcessPriority(int which, int who);
|
extern int SysGetProcessPriority(int which, int who);
|
||||||
extern int SysSchedGetPriorityMin(int policy);
|
extern int SysSchedGetPriorityMin(int policy);
|
||||||
extern int SysSchedGetPriorityMax(int policy);
|
extern int SysSchedGetPriorityMax(int policy);
|
||||||
|
|
|
||||||
|
|
@ -401,7 +401,7 @@ ssize_t SysSendMsg(int s, const struct msghdr *message, int flags)
|
||||||
CHECK_ASPACE(message, sizeof(struct msghdr));
|
CHECK_ASPACE(message, sizeof(struct msghdr));
|
||||||
CPY_FROM_CONST_USER(struct msghdr, message);
|
CPY_FROM_CONST_USER(struct msghdr, message);
|
||||||
|
|
||||||
if (message && (size_t)message->msg_iovlen > IOV_MAX) {
|
if (message && message->msg_iovlen > IOV_MAX) {
|
||||||
set_errno(EMSGSIZE);
|
set_errno(EMSGSIZE);
|
||||||
return -get_errno();
|
return -get_errno();
|
||||||
}
|
}
|
||||||
|
|
@ -449,7 +449,7 @@ ssize_t SysRecvMsg(int s, struct msghdr *message, int flags)
|
||||||
CHECK_ASPACE(message, sizeof(struct msghdr));
|
CHECK_ASPACE(message, sizeof(struct msghdr));
|
||||||
CPY_FROM_NONCONST_USER(message);
|
CPY_FROM_NONCONST_USER(message);
|
||||||
|
|
||||||
if (message && (size_t)message->msg_iovlen > IOV_MAX) {
|
if (message && message->msg_iovlen > IOV_MAX) {
|
||||||
set_errno(EMSGSIZE);
|
set_errno(EMSGSIZE);
|
||||||
return -get_errno();
|
return -get_errno();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -60,44 +60,23 @@ static int OsPermissionToCheck(unsigned int pid, unsigned int who)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int UserTaskSchedulerCheck(unsigned int tid, int policy, const LosSchedParam *schedParam, bool policyFlag)
|
static int OsUserTaskSchedulerSet(unsigned int tid, unsigned short policy, unsigned short priority, bool policyFlag)
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
int processPolicy;
|
|
||||||
|
|
||||||
if (OS_TID_CHECK_INVALID(tid)) {
|
|
||||||
return EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = OsSchedulerParamCheck(policy, TRUE, schedParam);
|
|
||||||
if (ret != 0) {
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (policyFlag) {
|
|
||||||
ret = LOS_GetProcessScheduler(LOS_GetCurrProcessID(), &processPolicy, NULL);
|
|
||||||
if (ret < 0) {
|
|
||||||
return -ret;
|
|
||||||
}
|
|
||||||
if ((processPolicy != LOS_SCHED_DEADLINE) && (policy == LOS_SCHED_DEADLINE)) {
|
|
||||||
return EPERM;
|
|
||||||
} else if ((processPolicy == LOS_SCHED_DEADLINE) && (policy != LOS_SCHED_DEADLINE)) {
|
|
||||||
return EPERM;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int OsUserTaskSchedulerSet(unsigned int tid, int policy, const LosSchedParam *schedParam, bool policyFlag)
|
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
unsigned int intSave;
|
unsigned int intSave;
|
||||||
bool needSched = false;
|
bool needSched = false;
|
||||||
SchedParam param = { 0 };
|
SchedParam param = { 0 };
|
||||||
|
|
||||||
ret = UserTaskSchedulerCheck(tid, policy, schedParam, policyFlag);
|
if (OS_TID_CHECK_INVALID(tid)) {
|
||||||
if (ret != 0) {
|
return EINVAL;
|
||||||
return ret;
|
}
|
||||||
|
|
||||||
|
if (priority > OS_TASK_PRIORITY_LOWEST) {
|
||||||
|
return EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((policy != LOS_SCHED_FIFO) && (policy != LOS_SCHED_RR)) {
|
||||||
|
return EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
LosTaskCB *taskCB = OS_TCB_FROM_TID(tid);
|
LosTaskCB *taskCB = OS_TCB_FROM_TID(tid);
|
||||||
|
|
@ -109,22 +88,8 @@ static int OsUserTaskSchedulerSet(unsigned int tid, int policy, const LosSchedPa
|
||||||
}
|
}
|
||||||
|
|
||||||
taskCB->ops->schedParamGet(taskCB, ¶m);
|
taskCB->ops->schedParamGet(taskCB, ¶m);
|
||||||
param.policy = (policyFlag == true) ? (UINT16)policy : param.policy;
|
param.policy = (policyFlag == true) ? policy : param.policy;
|
||||||
if ((param.policy == LOS_SCHED_RR) || (param.policy == LOS_SCHED_FIFO)) {
|
param.priority = priority;
|
||||||
param.priority = schedParam->priority;
|
|
||||||
} else if (param.policy == LOS_SCHED_DEADLINE) {
|
|
||||||
#ifdef LOSCFG_SECURITY_CAPABILITY
|
|
||||||
/* user mode process with privilege of CAP_SCHED_SETPRIORITY can change the priority */
|
|
||||||
if (!IsCapPermit(CAP_SCHED_SETPRIORITY)) {
|
|
||||||
SCHEDULER_UNLOCK(intSave);
|
|
||||||
return EPERM;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
param.runTimeUs = schedParam->runTimeUs;
|
|
||||||
param.deadlineUs = schedParam->deadlineUs;
|
|
||||||
param.periodUs = schedParam->periodUs;
|
|
||||||
}
|
|
||||||
|
|
||||||
needSched = taskCB->ops->schedParamModify(taskCB, ¶m);
|
needSched = taskCB->ops->schedParamModify(taskCB, ¶m);
|
||||||
SCHEDULER_UNLOCK(intSave);
|
SCHEDULER_UNLOCK(intSave);
|
||||||
|
|
||||||
|
|
@ -148,7 +113,6 @@ int SysSchedGetScheduler(int id, int flag)
|
||||||
{
|
{
|
||||||
unsigned int intSave;
|
unsigned int intSave;
|
||||||
SchedParam param = { 0 };
|
SchedParam param = { 0 };
|
||||||
int policy;
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (flag < 0) {
|
if (flag < 0) {
|
||||||
|
|
@ -173,57 +137,43 @@ int SysSchedGetScheduler(int id, int flag)
|
||||||
id = (int)LOS_GetCurrProcessID();
|
id = (int)LOS_GetCurrProcessID();
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = LOS_GetProcessScheduler(id, &policy, NULL);
|
return LOS_GetProcessScheduler(id);
|
||||||
if (ret < 0) {
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
return policy;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int SysSchedSetScheduler(int id, int policy, const LosSchedParam *userParam, int flag)
|
int SysSchedSetScheduler(int id, int policy, int prio, int flag)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
LosSchedParam param;
|
|
||||||
|
|
||||||
if (LOS_ArchCopyFromUser(¶m, userParam, sizeof(LosSchedParam)) != 0) {
|
|
||||||
return -EFAULT;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flag < 0) {
|
if (flag < 0) {
|
||||||
return -OsUserTaskSchedulerSet(id, policy, ¶m, true);
|
return -OsUserTaskSchedulerSet(id, policy, prio, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy == LOS_SCHED_RR) {
|
if (prio < OS_USER_PROCESS_PRIORITY_HIGHEST) {
|
||||||
#ifdef LOSCFG_KERNEL_PLIMITS
|
return -EINVAL;
|
||||||
if (param.priority < OsPidLimitGetPriorityLimit()) {
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
if (param.priority < OS_USER_PROCESS_PRIORITY_HIGHEST) {
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (id == 0) {
|
if (id == 0) {
|
||||||
id = (int)LOS_GetCurrProcessID();
|
id = (int)LOS_GetCurrProcessID();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef LOSCFG_KERNEL_PLIMITS
|
||||||
|
if (prio < OsPidLimitGetPriorityLimit()) {
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
ret = OsPermissionToCheck(id, LOS_GetCurrProcessID());
|
ret = OsPermissionToCheck(id, LOS_GetCurrProcessID());
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
return OsSetProcessScheduler(LOS_PRIO_PROCESS, id, policy, ¶m);
|
return OsSetProcessScheduler(LOS_PRIO_PROCESS, id, prio, policy);
|
||||||
}
|
}
|
||||||
|
|
||||||
int SysSchedGetParam(int id, LosSchedParam *userParam, int flag)
|
int SysSchedGetParam(int id, int flag)
|
||||||
{
|
{
|
||||||
LosSchedParam schedParam = {0};
|
|
||||||
SchedParam param = { 0 };
|
SchedParam param = { 0 };
|
||||||
unsigned int intSave;
|
unsigned int intSave;
|
||||||
int ret;
|
|
||||||
|
|
||||||
if (flag < 0) {
|
if (flag < 0) {
|
||||||
if (OS_TID_CHECK_INVALID(id)) {
|
if (OS_TID_CHECK_INVALID(id)) {
|
||||||
|
|
@ -232,7 +182,7 @@ int SysSchedGetParam(int id, LosSchedParam *userParam, int flag)
|
||||||
|
|
||||||
LosTaskCB *taskCB = OS_TCB_FROM_TID(id);
|
LosTaskCB *taskCB = OS_TCB_FROM_TID(id);
|
||||||
SCHEDULER_LOCK(intSave);
|
SCHEDULER_LOCK(intSave);
|
||||||
ret = OsUserTaskOperatePermissionsCheck(taskCB);
|
int ret = OsUserTaskOperatePermissionsCheck(taskCB);
|
||||||
if (ret != LOS_OK) {
|
if (ret != LOS_OK) {
|
||||||
SCHEDULER_UNLOCK(intSave);
|
SCHEDULER_UNLOCK(intSave);
|
||||||
return -ret;
|
return -ret;
|
||||||
|
|
@ -240,39 +190,25 @@ int SysSchedGetParam(int id, LosSchedParam *userParam, int flag)
|
||||||
|
|
||||||
taskCB->ops->schedParamGet(taskCB, ¶m);
|
taskCB->ops->schedParamGet(taskCB, ¶m);
|
||||||
SCHEDULER_UNLOCK(intSave);
|
SCHEDULER_UNLOCK(intSave);
|
||||||
if (param.policy == LOS_SCHED_DEADLINE) {
|
return (int)param.priority;
|
||||||
schedParam.runTimeUs = param.runTimeUs;
|
|
||||||
schedParam.deadlineUs = param.deadlineUs;
|
|
||||||
schedParam.periodUs = param.periodUs;
|
|
||||||
} else {
|
|
||||||
schedParam.priority = param.priority;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (id == 0) {
|
|
||||||
id = (int)LOS_GetCurrProcessID();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (OS_PID_CHECK_INVALID(id)) {
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = LOS_GetProcessScheduler(id, NULL, &schedParam);
|
|
||||||
if (ret < 0) {
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (LOS_ArchCopyToUser(userParam, &schedParam, sizeof(LosSchedParam))) {
|
if (id == 0) {
|
||||||
return -EFAULT;
|
id = (int)LOS_GetCurrProcessID();
|
||||||
}
|
}
|
||||||
return 0;
|
|
||||||
|
if (OS_PID_CHECK_INVALID(id)) {
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return OsGetProcessPriority(LOS_PRIO_PROCESS, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
int SysSetProcessPriority(int which, int who, int prio)
|
int SysSetProcessPriority(int which, int who, unsigned int prio)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (which != LOS_PRIO_PROCESS) {
|
if (prio < OS_USER_PROCESS_PRIORITY_HIGHEST) {
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -284,10 +220,6 @@ int SysSetProcessPriority(int which, int who, int prio)
|
||||||
if (prio < OsPidLimitGetPriorityLimit()) {
|
if (prio < OsPidLimitGetPriorityLimit()) {
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
if (prio < OS_USER_PROCESS_PRIORITY_HIGHEST) {
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ret = OsPermissionToCheck(who, LOS_GetCurrProcessID());
|
ret = OsPermissionToCheck(who, LOS_GetCurrProcessID());
|
||||||
|
|
@ -295,31 +227,22 @@ int SysSetProcessPriority(int which, int who, int prio)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
return LOS_SetProcessPriority(who, prio);
|
return OsSetProcessScheduler(which, who, prio, LOS_GetProcessScheduler(who));
|
||||||
}
|
}
|
||||||
|
|
||||||
int SysSchedSetParam(int id, const LosSchedParam *userParam, int flag)
|
int SysSchedSetParam(int id, unsigned int prio, int flag)
|
||||||
{
|
{
|
||||||
int ret, policy;
|
|
||||||
LosSchedParam param;
|
|
||||||
|
|
||||||
if (flag < 0) {
|
if (flag < 0) {
|
||||||
if (LOS_ArchCopyFromUser(¶m, userParam, sizeof(LosSchedParam)) != 0) {
|
return -OsUserTaskSchedulerSet(id, LOS_SCHED_RR, prio, false);
|
||||||
return -EFAULT;
|
|
||||||
}
|
|
||||||
return -OsUserTaskSchedulerSet(id, LOS_SCHED_RR, ¶m, false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (id == 0) {
|
#ifdef LOSCFG_KERNEL_PLIMITS
|
||||||
id = (int)LOS_GetCurrProcessID();
|
if (prio < OsPidLimitGetPriorityLimit()) {
|
||||||
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
ret = LOS_GetProcessScheduler(id, &policy, NULL);
|
return SysSetProcessPriority(LOS_PRIO_PROCESS, id, prio);
|
||||||
if (ret < 0) {
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
return SysSchedSetScheduler(id, policy, userParam, flag);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int SysGetProcessPriority(int which, int who)
|
int SysGetProcessPriority(int which, int who)
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,7 @@ SYSCALL_HAND_DEF(__NR_sethostname, SysSetHostName, int, ARG_NUM_2)
|
||||||
SYSCALL_HAND_DEF(__NR_mprotect, SysMprotect, int, ARG_NUM_3)
|
SYSCALL_HAND_DEF(__NR_mprotect, SysMprotect, int, ARG_NUM_3)
|
||||||
SYSCALL_HAND_DEF(__NR_getpgid, SysGetProcessGroupID, int, ARG_NUM_1)
|
SYSCALL_HAND_DEF(__NR_getpgid, SysGetProcessGroupID, int, ARG_NUM_1)
|
||||||
SYSCALL_HAND_DEF(__NR_sched_setparam, SysSchedSetParam, int, ARG_NUM_3)
|
SYSCALL_HAND_DEF(__NR_sched_setparam, SysSchedSetParam, int, ARG_NUM_3)
|
||||||
SYSCALL_HAND_DEF(__NR_sched_getparam, SysSchedGetParam, int, ARG_NUM_3)
|
SYSCALL_HAND_DEF(__NR_sched_getparam, SysSchedGetParam, int, ARG_NUM_2)
|
||||||
SYSCALL_HAND_DEF(__NR_sched_setscheduler, SysSchedSetScheduler, int, ARG_NUM_4)
|
SYSCALL_HAND_DEF(__NR_sched_setscheduler, SysSchedSetScheduler, int, ARG_NUM_4)
|
||||||
SYSCALL_HAND_DEF(__NR_sched_getscheduler, SysSchedGetScheduler, int, ARG_NUM_2)
|
SYSCALL_HAND_DEF(__NR_sched_getscheduler, SysSchedGetScheduler, int, ARG_NUM_2)
|
||||||
SYSCALL_HAND_DEF(__NR_sched_yield, SysSchedYield, void, ARG_NUM_1)
|
SYSCALL_HAND_DEF(__NR_sched_yield, SysSchedYield, void, ARG_NUM_1)
|
||||||
|
|
|
||||||
|
|
@ -39,21 +39,21 @@ declare_args() {
|
||||||
config("liteos_kernel_test_public") {
|
config("liteos_kernel_test_public") {
|
||||||
cflags = [ "-Wno-error" ]
|
cflags = [ "-Wno-error" ]
|
||||||
include_dirs = [
|
include_dirs = [
|
||||||
"$LITEOSTOPDIR/kernel/include",
|
"//kernel/liteos_a/kernel/include",
|
||||||
"$LITEOSTOPDIR/kernel/base/include",
|
"//kernel/liteos_a/kernel/base/include",
|
||||||
"$LITEOSTOPDIR/kernel/common",
|
"//kernel/liteos_a/kernel/common",
|
||||||
"$LITEOSTOPDIR/arch/arm/arm/include",
|
"//kernel/liteos_a/arch/arm/arm/include",
|
||||||
"$LITEOSTOPDIR/arch/arm/include",
|
"//kernel/liteos_a/arch/arm/include",
|
||||||
"$LITEOSTOPDIR/extended/include",
|
"//kernel/liteos_a/extended/include",
|
||||||
"$THIRDPARTY_MUSL_DIR/porting/liteos_a/kernel/include",
|
"//third_party/musl/porting/liteos_a/kernel/include",
|
||||||
"$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR/include/",
|
"//third_party/bounds_checking_function/include/",
|
||||||
"$LITEOSTOPDIR/lib/libscrew/include",
|
"//kernel/liteos_a/lib/libscrew/include",
|
||||||
"$LITEOSTOPDIR/fs/vfs",
|
"//kernel/liteos_a/fs/vfs",
|
||||||
"$LITEOSTOPDIR/fs/proc/include",
|
"//kernel/liteos_a/fs/proc/include",
|
||||||
"$LITEOSTOPDIR/fs/jffs2/include",
|
"//kernel/liteos_a/fs/jffs2/include",
|
||||||
"$LITEOSTOPDIR/fs/nfs/include",
|
"//kernel/liteos_a/fs/nfs/include",
|
||||||
"$LITEOSTOPDIR/bsd/compat/linuxkpi/include",
|
"//kernel/liteos_a/bsd/compat/linuxkpi/include",
|
||||||
"include",
|
"//kernel/liteos_a/testsuites/kernel/include",
|
||||||
]
|
]
|
||||||
|
|
||||||
if (LOSCFG_TEST_KERNEL_BASE) {
|
if (LOSCFG_TEST_KERNEL_BASE) {
|
||||||
|
|
|
||||||
|
|
@ -260,5 +260,5 @@ kernel_module("test_core") {
|
||||||
]
|
]
|
||||||
|
|
||||||
public_configs =
|
public_configs =
|
||||||
[ "$LITEOSTOPDIR/testsuites/kernel:liteos_kernel_test_public" ]
|
[ "//kernel/liteos_a/testsuites/kernel:liteos_kernel_test_public" ]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -107,5 +107,5 @@ kernel_module("test_ipc") {
|
||||||
]
|
]
|
||||||
|
|
||||||
public_configs =
|
public_configs =
|
||||||
[ "$LITEOSTOPDIR/testsuites/kernel:liteos_kernel_test_public" ]
|
[ "//kernel/liteos_a/testsuites/kernel:liteos_kernel_test_public" ]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -67,8 +67,6 @@ config("public_config_for_pressure") {
|
||||||
group("unittest") {
|
group("unittest") {
|
||||||
deps = []
|
deps = []
|
||||||
if (ohos_build_type == "debug") {
|
if (ohos_build_type == "debug") {
|
||||||
deps += [ "tools:liteos_unittest_run" ]
|
|
||||||
|
|
||||||
# basic test
|
# basic test
|
||||||
if (LOSCFG_USER_TEST_BASIC == true) {
|
if (LOSCFG_USER_TEST_BASIC == true) {
|
||||||
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
|
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
|
||||||
|
|
@ -115,24 +113,10 @@ group("unittest") {
|
||||||
# libc test
|
# libc test
|
||||||
if (LOSCFG_USER_TEST_LIBC == true) {
|
if (LOSCFG_USER_TEST_LIBC == true) {
|
||||||
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
|
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
|
||||||
deps += [
|
deps += [ "libc:liteos_a_libc_unittest_door" ]
|
||||||
"libc/io:liteos_a_libc_io_unittest_door",
|
|
||||||
"libc/misc:liteos_a_libc_misc_unittest_door",
|
|
||||||
"libc/posix:liteos_a_libc_posix_unittest_door",
|
|
||||||
"libc/sys:liteos_a_libc_sys_unittest_door",
|
|
||||||
"libc/time:liteos_a_libc_time_unittest_door",
|
|
||||||
"libc/util:liteos_a_libc_util_unittest_door",
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
|
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
|
||||||
deps += [
|
deps += [ "libc:liteos_a_libc_unittest" ]
|
||||||
"libc/io:liteos_a_libc_io_unittest",
|
|
||||||
"libc/misc:liteos_a_libc_misc_unittest",
|
|
||||||
"libc/posix:liteos_a_libc_posix_unittest",
|
|
||||||
"libc/sys:liteos_a_libc_sys_unittest",
|
|
||||||
"libc/time:liteos_a_libc_time_unittest",
|
|
||||||
"libc/util:liteos_a_libc_util_unittest",
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -149,11 +133,8 @@ group("unittest") {
|
||||||
# process test
|
# process test
|
||||||
if (LOSCFG_USER_TEST_PROCESS_THREAD == true) {
|
if (LOSCFG_USER_TEST_PROCESS_THREAD == true) {
|
||||||
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
|
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
|
||||||
deps += [
|
deps += [ "process/basic:liteos_a_process_basic_unittest_door" ]
|
||||||
"process/basic/process:liteos_a_process_basic_process_unittest_door",
|
deps += [ "process/lock:liteos_a_process_lock_unittest_door" ]
|
||||||
"process/basic/pthread:liteos_a_process_basic_pthread_unittest_door",
|
|
||||||
"process/lock:liteos_a_process_lock_unittest_door",
|
|
||||||
]
|
|
||||||
if (LOSCFG_USER_TEST_PROCESS_FS == true) {
|
if (LOSCFG_USER_TEST_PROCESS_FS == true) {
|
||||||
deps += [ "process/fs:liteos_a_process_fs_unittest_door" ]
|
deps += [ "process/fs:liteos_a_process_fs_unittest_door" ]
|
||||||
}
|
}
|
||||||
|
|
@ -162,11 +143,8 @@ group("unittest") {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
|
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
|
||||||
deps += [
|
deps += [ "process/basic:liteos_a_process_basic_unittest" ]
|
||||||
"process/basic/process:liteos_a_process_basic_process_unittest",
|
deps += [ "process/lock:liteos_a_process_lock_unittest" ]
|
||||||
"process/basic/pthread:liteos_a_process_basic_pthread_unittest",
|
|
||||||
"process/lock:liteos_a_process_lock_unittest",
|
|
||||||
]
|
|
||||||
if (LOSCFG_USER_TEST_PROCESS_FS == true) {
|
if (LOSCFG_USER_TEST_PROCESS_FS == true) {
|
||||||
deps += [ "process/fs:liteos_a_process_fs_unittest" ]
|
deps += [ "process/fs:liteos_a_process_fs_unittest" ]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,8 @@
|
||||||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
import("//build/lite/config/test.gni")
|
||||||
|
import("//kernel/liteos_a/testsuites/unittest/config.gni")
|
||||||
import("./config.gni")
|
import("./config.gni")
|
||||||
|
|
||||||
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
|
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
|
||||||
|
|
@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
|
||||||
sources_full = []
|
sources_full = []
|
||||||
sources += sources_full
|
sources += sources_full
|
||||||
configs = [ "..:public_config_for_door" ]
|
configs = [ "..:public_config_for_door" ]
|
||||||
deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
|
deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
|
||||||
sources += sources_smoke
|
sources += sources_smoke
|
||||||
sources += sources_full
|
sources += sources_full
|
||||||
configs = [ "..:public_config_for_all" ]
|
configs = [ "..:public_config_for_all" ]
|
||||||
deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
|
deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,11 +27,10 @@
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//build/lite/config/test.gni")
|
import("//build/lite/config/test.gni")
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
|
||||||
import("//kernel/liteos_a/testsuites/unittest/config.gni")
|
import("//kernel/liteos_a/testsuites/unittest/config.gni")
|
||||||
|
|
||||||
common_include_dirs = [
|
common_include_dirs = [
|
||||||
"$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
|
"//third_party/googletest/googletest/include",
|
||||||
"../common/include",
|
"../common/include",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
|
* Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
|
||||||
* Copyright (c) 2020-2023 Huawei Device Co., Ltd. All rights reserved.
|
* Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without modification,
|
* Redistribution and use in source and binary forms, with or without modification,
|
||||||
* are permitted provided that the following conditions are met:
|
* are permitted provided that the following conditions are met:
|
||||||
|
|
@ -42,52 +42,40 @@ static int Testcase(void)
|
||||||
char *workingPath = "/usr/bin";
|
char *workingPath = "/usr/bin";
|
||||||
void *handle = nullptr;
|
void *handle = nullptr;
|
||||||
int (*func)(int);
|
int (*func)(int);
|
||||||
char curPath[1024] = { 0 }; /* 1024, buffer size */
|
|
||||||
|
|
||||||
handle = getcwd(curPath, sizeof(curPath));
|
|
||||||
ICUNIT_ASSERT_NOT_EQUAL(handle, NULL, handle);
|
|
||||||
|
|
||||||
ret = chdir(workingPath);
|
ret = chdir(workingPath);
|
||||||
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
|
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
|
||||||
|
|
||||||
handle = dlopen(NULL, RTLD_NOW | RTLD_LOCAL);
|
handle = dlopen(NULL, RTLD_NOW | RTLD_LOCAL);
|
||||||
ICUNIT_GOTO_NOT_EQUAL(handle, NULL, 1, EXIT1); /* 1, return value */
|
ICUNIT_ASSERT_NOT_EQUAL(handle, NULL, handle);
|
||||||
|
|
||||||
ret = dlclose(handle);
|
ret = dlclose(handle);
|
||||||
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
|
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
|
||||||
|
|
||||||
handle = dlopen(LIBCSO_REAL_PATH, RTLD_NOW);
|
handle = dlopen(LIBCSO_REAL_PATH, RTLD_NOW);
|
||||||
ICUNIT_GOTO_NOT_EQUAL(handle, NULL, 1, EXIT1); /* 1, return value */
|
ICUNIT_ASSERT_NOT_EQUAL(handle, NULL, handle);
|
||||||
|
|
||||||
func = reinterpret_cast<int (*)(int)>(dlsym(handle, SYMBOL_TO_FIND));
|
func = reinterpret_cast<int (*)(int)>(dlsym(handle, SYMBOL_TO_FIND));
|
||||||
ICUNIT_GOTO_NOT_EQUAL(func, NULL, func, EXIT);
|
ICUNIT_GOTO_NOT_EQUAL(func, NULL, func, EXIT);
|
||||||
ICUNIT_GOTO_EQUAL(func, SYMBOL_TO_MATCH, func, EXIT);
|
ICUNIT_GOTO_EQUAL(func, SYMBOL_TO_MATCH, func, EXIT);
|
||||||
|
|
||||||
ret = dlclose(handle);
|
ret = dlclose(handle);
|
||||||
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
|
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
|
||||||
|
|
||||||
handle = dlopen(LIBCSO_RELATIVE_PATH, RTLD_NOW);
|
handle = dlopen(LIBCSO_RELATIVE_PATH, RTLD_NOW);
|
||||||
ICUNIT_GOTO_NOT_EQUAL(handle, NULL, 1, EXIT1); /* 1, return value */
|
ICUNIT_ASSERT_NOT_EQUAL(handle, NULL, handle);
|
||||||
|
|
||||||
func = reinterpret_cast<int (*)(int)>(dlsym(handle, SYMBOL_TO_FIND));
|
func = reinterpret_cast<int (*)(int)>(dlsym(handle, SYMBOL_TO_FIND));
|
||||||
ICUNIT_GOTO_NOT_EQUAL(func, NULL, func, EXIT);
|
ICUNIT_GOTO_NOT_EQUAL(func, NULL, func, EXIT);
|
||||||
|
|
||||||
ret = dlclose(handle);
|
ret = dlclose(handle);
|
||||||
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT);
|
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
|
||||||
|
|
||||||
ret = chdir(curPath);
|
|
||||||
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT1);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
EXIT:
|
EXIT:
|
||||||
dlclose(handle);
|
dlclose(handle);
|
||||||
|
return 0;
|
||||||
EXIT1:
|
|
||||||
ret = chdir(curPath);
|
|
||||||
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
|
|
||||||
|
|
||||||
return 1; /* 1, return value */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ItTestDynload002(void)
|
void ItTestDynload002(void)
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
*/
|
*/
|
||||||
#include "it_test_exc.h"
|
#include "it_test_exc.h"
|
||||||
|
|
||||||
__attribute__((optnone)) static int TestCase(void)
|
static int TestCase(void)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
int status = 0;
|
int status = 0;
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
#include "it_test_exc.h"
|
#include "it_test_exc.h"
|
||||||
#include "pthread.h"
|
#include "pthread.h"
|
||||||
|
|
||||||
__attribute__((optnone)) static void *ThreadFunc2(void *arg)
|
static void *ThreadFunc2(void *arg)
|
||||||
{
|
{
|
||||||
while (1) {
|
while (1) {
|
||||||
}
|
}
|
||||||
|
|
@ -39,7 +39,7 @@ __attribute__((optnone)) static void *ThreadFunc2(void *arg)
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
__attribute__((optnone)) static void *ThreadFunc1(void *arg)
|
static void *ThreadFunc1(void *arg)
|
||||||
{
|
{
|
||||||
int *test = nullptr;
|
int *test = nullptr;
|
||||||
*test = 0x1;
|
*test = 0x1;
|
||||||
|
|
@ -77,8 +77,7 @@ static int TestThread(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int TestCase(void)
|
||||||
__attribute__((optnone)) static int TestCase(void)
|
|
||||||
{
|
{
|
||||||
int *test = nullptr;
|
int *test = nullptr;
|
||||||
int count = 5;
|
int count = 5;
|
||||||
|
|
|
||||||
|
|
@ -34,15 +34,14 @@
|
||||||
#define TEST_THREAD_COUNT 5
|
#define TEST_THREAD_COUNT 5
|
||||||
static volatile int g_testCondFlag;
|
static volatile int g_testCondFlag;
|
||||||
static int g_count[TEST_THREAD_COUNT];
|
static int g_count[TEST_THREAD_COUNT];
|
||||||
|
static void *ThreadFunc2(void *arg)
|
||||||
__attribute__((optnone)) static void *ThreadFunc2(void *arg)
|
|
||||||
{
|
{
|
||||||
int count = *(int *)arg;
|
int count = *(int *)arg;
|
||||||
int *test = nullptr;
|
int *test = nullptr;
|
||||||
|
|
||||||
g_testCondFlag++;
|
g_testCondFlag++;
|
||||||
|
|
||||||
while (g_testCondFlag < 2) { /* 2, no special meaning */
|
while (g_testCondFlag < 2) {
|
||||||
}
|
}
|
||||||
|
|
||||||
*test = 0x1;
|
*test = 0x1;
|
||||||
|
|
@ -84,7 +83,7 @@ static int TestThread(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
__attribute__((optnone)) static int TestCase(void)
|
static int TestCase(void)
|
||||||
{
|
{
|
||||||
int *test = nullptr;
|
int *test = nullptr;
|
||||||
int count = 5;
|
int count = 5;
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@
|
||||||
|
|
||||||
#define TEST_THREAD_COUNT 5
|
#define TEST_THREAD_COUNT 5
|
||||||
|
|
||||||
__attribute__((optnone)) static int TestThread(void)
|
static int TestThread(void)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
int *test = nullptr; // For triggering an exceptioin
|
int *test = nullptr; // For triggering an exceptioin
|
||||||
|
|
@ -53,7 +53,7 @@ __attribute__((optnone)) static int TestThread(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
__attribute__((optnone)) static int TestCase(void)
|
static int TestCase(void)
|
||||||
{
|
{
|
||||||
int count = 5;
|
int count = 5;
|
||||||
int status = 0;
|
int status = 0;
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
*/
|
*/
|
||||||
#include "it_test_exc.h"
|
#include "it_test_exc.h"
|
||||||
|
|
||||||
__attribute__((optnone)) static void Child(void)
|
static void Child(void)
|
||||||
{
|
{
|
||||||
while (1) {
|
while (1) {
|
||||||
printf("@@@@@@@@@@@@@ pid : %d getppid : %d @@@@@@@@@@@@@@@@\n", getpid(), getppid());
|
printf("@@@@@@@@@@@@@ pid : %d getppid : %d @@@@@@@@@@@@@@@@\n", getpid(), getppid());
|
||||||
|
|
@ -41,7 +41,7 @@ static void TestKill(int sig)
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
__attribute__((optnone)) static int TestCase(void)
|
static int TestCase(void)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
void (*retptr)(int) = NULL;
|
void (*retptr)(int) = NULL;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
|
# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
|
||||||
# Copyright (c) 2020-2023 Huawei Device Co., Ltd. All rights reserved.
|
# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms, with or without modification,
|
# Redistribution and use in source and binary forms, with or without modification,
|
||||||
# are permitted provided that the following conditions are met:
|
# are permitted provided that the following conditions are met:
|
||||||
|
|
@ -64,11 +64,11 @@ LOSCFG_USER_TEST_MEM_VM = true
|
||||||
LOSCFG_USER_TEST_PROCESS_THREAD = true
|
LOSCFG_USER_TEST_PROCESS_THREAD = true
|
||||||
|
|
||||||
# Module list
|
# Module list
|
||||||
LOSCFG_USER_TEST_PROCESS_BASIC_PROCESS = true
|
LOSCFG_USER_TEST_MUTEX = true
|
||||||
LOSCFG_USER_TEST_PROCESS_BASIC_PTHREAD = true
|
LOSCFG_USER_TEST_PROCESS = true
|
||||||
LOSCFG_USER_TEST_PROCESS_LOCK_MUTEX = true
|
LOSCFG_USER_TEST_PTHREAD = true
|
||||||
LOSCFG_USER_TEST_PROCESS_LOCK_RWLOCK = true
|
LOSCFG_USER_TEST_RWLOCK = true
|
||||||
LOSCFG_USER_TEST_PROCESS_LOCK_SPINLOCK = true
|
LOSCFG_USER_TEST_SPINLOCK = true
|
||||||
|
|
||||||
########## extended test ##########
|
########## extended test ##########
|
||||||
# Control switch for extended function test
|
# Control switch for extended function test
|
||||||
|
|
@ -102,15 +102,15 @@ LOSCFG_USER_TEST_FS_VFAT = false
|
||||||
LOSCFG_USER_TEST_LIBC = true
|
LOSCFG_USER_TEST_LIBC = true
|
||||||
|
|
||||||
# Module list
|
# Module list
|
||||||
LOSCFG_USER_TEST_LIBC_IO = true
|
LOSCFG_USER_TEST_IO = true
|
||||||
LOSCFG_USER_TEST_LIBC_MISC = true
|
LOSCFG_USER_TEST_MISC = true
|
||||||
LOSCFG_USER_TEST_LIBC_POSIX_MEM = true
|
LOSCFG_USER_TEST_POSIX_MEM = true
|
||||||
LOSCFG_USER_TEST_LIBC_POSIX_MQUEUE = true
|
LOSCFG_USER_TEST_POSIX_MQUEUE = true
|
||||||
LOSCFG_USER_TEST_LIBC_POSIX_PTHREAD = false
|
LOSCFG_USER_TEST_POSIX_PTHREAD = false
|
||||||
LOSCFG_USER_TEST_LIBC_SYS = true
|
LOSCFG_USER_TEST_SYS = true
|
||||||
LOSCFG_USER_TEST_LIBC_TIME_CLOCK = true
|
LOSCFG_USER_TEST_TIME_CLOCK = true
|
||||||
LOSCFG_USER_TEST_LIBC_TIME_TIMER = true
|
LOSCFG_USER_TEST_TIME_TIMER = true
|
||||||
LOSCFG_USER_TEST_LIBC_UTIL = true
|
LOSCFG_USER_TEST_UTIL = true
|
||||||
|
|
||||||
########## net test ##########
|
########## net test ##########
|
||||||
# Control switch for network function test
|
# Control switch for network function test
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,8 @@
|
||||||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
import("//build/lite/config/test.gni")
|
||||||
|
import("//kernel/liteos_a/testsuites/unittest/config.gni")
|
||||||
import("./config.gni")
|
import("./config.gni")
|
||||||
|
|
||||||
config("container_config") {
|
config("container_config") {
|
||||||
|
|
@ -67,7 +69,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
|
||||||
"..:public_config_for_door",
|
"..:public_config_for_door",
|
||||||
":container_config",
|
":container_config",
|
||||||
]
|
]
|
||||||
deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
|
deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -83,6 +85,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
|
||||||
"..:public_config_for_all",
|
"..:public_config_for_all",
|
||||||
":container_config",
|
":container_config",
|
||||||
]
|
]
|
||||||
deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
|
deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,12 +26,10 @@
|
||||||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
import("//build/lite/config/test.gni")
|
|
||||||
import("//kernel/liteos_a/liteos.gni")
|
|
||||||
import("//kernel/liteos_a/testsuites/unittest/config.gni")
|
import("//kernel/liteos_a/testsuites/unittest/config.gni")
|
||||||
|
|
||||||
common_include_dirs = [
|
common_include_dirs = [
|
||||||
"$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
|
"//third_party/googletest/googletest/include",
|
||||||
"../common/include",
|
"../common/include",
|
||||||
"$TEST_UNITTEST_DIR/container",
|
"$TEST_UNITTEST_DIR/container",
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue