From 5090ca611e535ea61e1752799fcd0c73a85f190d Mon Sep 17 00:00:00 2001 From: huangxiaolinabc123 Date: Mon, 15 Aug 2022 14:36:13 +0800 Subject: [PATCH] modify samgr Signed-off-by: huangxiaolinabc123 Change-Id: Iade128668b3ef50e92f2847893bda8c851111154 --- .../porting-bes2600w-on-minisystem-display-demo.md | 8 ++++---- en/device-dev/porting/porting-chip-board-component.md | 2 +- en/device-dev/subsystems/subsys-boot-init-service.md | 2 +- en/device-dev/subsystems/subsys-dfx-hilog-lite.md | 4 ++-- .../subsystems/subsys-dfx-hisysevent-logging-config.md | 2 +- en/readme/SAMGR.md | 10 +++++----- en/readme/ai.md | 2 +- .../porting-bes2600w-on-minisystem-display-demo.md | 4 ++-- .../device-dev/porting/porting-chip-board-component.md | 2 +- .../porting/porting-stm32f407-on-minisystem-eth.md | 10 +++++----- zh-cn/device-dev/porting/porting-w800-combo-demo.md | 2 +- .../device-dev/subsystems/subsys-boot-init-service.md | 2 +- zh-cn/device-dev/subsystems/subsys-dfx-hilog-lite.md | 4 ++-- .../subsystems/subsys-dfx-hisysevent-logging-config.md | 2 +- ...345\212\241\345\255\220\347\263\273\347\273\237.md" | 2 +- ...347\220\206\345\255\220\347\263\273\347\273\237.md" | 10 +++++----- 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/en/device-dev/porting/porting-bes2600w-on-minisystem-display-demo.md b/en/device-dev/porting/porting-bes2600w-on-minisystem-display-demo.md index 18daf4c282..fb15da8d6f 100644 --- a/en/device-dev/porting/porting-bes2600w-on-minisystem-display-demo.md +++ b/en/device-dev/porting/porting-bes2600w-on-minisystem-display-demo.md @@ -1167,18 +1167,18 @@ boolean HilogProc_Impl(const HiLogContent *hilogContent, uint32 len) HiviewRegisterHilogProc(HilogProc_Impl); ``` -#### distributedschedule Subsystem Adaptation +#### systemabilitymgr Subsystem Adaptation -To adapt the `distributedschedule` subsystem, you need to add the `samgr_lite` component in the `config.json` file, as shown below: +To adapt the `systemabilitymgr` subsystem, you need to add the `samgr_lite` component in the `config.json` file, as shown below: ``` { - "subsystem": "distributedschedule", + "subsystem": "systemabilitymgr", "components": [ { "component": "samgr_lite", "features": [ - "config_ohos_distributedschedule_samgr_lite_shared_task_size = 4096" + "config_ohos_systemabilitymgr_samgr_lite_shared_task_size = 4096" ] } ] diff --git a/en/device-dev/porting/porting-chip-board-component.md b/en/device-dev/porting/porting-chip-board-component.md index a793dd8b84..337bcea901 100644 --- a/en/device-dev/porting/porting-chip-board-component.md +++ b/en/device-dev/porting/porting-chip-board-component.md @@ -11,7 +11,7 @@ This service-oriented framework enables you to develop services, features, and e >![](../public_sys-resources/icon-notice.gif) **NOTICE:** >This module must be used during board-level system porting. Otherwise, other service modules cannot run properly. -For details about how to use SAMGR, see [samgr\_lite](https://gitee.com/openharmony/distributedschedule_samgr_lite/blob/master/README.md). +For details about how to use SAMGR, see [samgr\_lite](https://gitee.com/openharmony/systemabilitymgr_samgr_lite/blob/master/README.md). ## DFX diff --git a/en/device-dev/subsystems/subsys-boot-init-service.md b/en/device-dev/subsystems/subsys-boot-init-service.md index 44a3927654..38f88f250c 100644 --- a/en/device-dev/subsystems/subsys-boot-init-service.md +++ b/en/device-dev/subsystems/subsys-boot-init-service.md @@ -55,7 +55,7 @@ Service configuration allows you to configure services on demand to create diffe ``` - SA process on-demand startup - For details, see [samgr Usage](https://gitee.com/openharmony/distributedschedule_samgr/blob/master/README.md). + For details, see [samgr Usage](https://gitee.com/openharmony/systemabilitymgr_samgr/blob/master/README.md). - Socket process on-demand startup 1. The init process creates a socket for socket processes in the pre-fork phase and listens to read/write events on this socket. diff --git a/en/device-dev/subsystems/subsys-dfx-hilog-lite.md b/en/device-dev/subsystems/subsys-dfx-hilog-lite.md index 6f65a7c76e..2f345943e2 100644 --- a/en/device-dev/subsystems/subsys-dfx-hilog-lite.md +++ b/en/device-dev/subsystems/subsys-dfx-hilog-lite.md @@ -78,7 +78,7 @@ The following provides an example of how the Samgr\_Lite module uses the HiLog\_ HiLogRegisterModule(HILOG_MODULE_SAMGR, "SAMGR"); ``` -3. Add the header file dependencies to the **foundation/distributedschedule/samgr\_lite/samgr/BUILD.gn** file. +3. Add the header file dependencies to the **foundation/systemabilitymgr/samgr\_lite/samgr/BUILD.gn** file. ``` include_dirs = [ @@ -86,7 +86,7 @@ The following provides an example of how the Samgr\_Lite module uses the HiLog\_ ] ``` -4. Reference the header file in the **foundation/distributedschedule/samgr\_lite/samgr/source/message.c** file and call the related APIs. +4. Reference the header file in the **foundation/systemabilitymgr/samgr\_lite/samgr/source/message.c** file and call the related APIs. ``` #include diff --git a/en/device-dev/subsystems/subsys-dfx-hisysevent-logging-config.md b/en/device-dev/subsystems/subsys-dfx-hisysevent-logging-config.md index 7647bf18fd..3252a629a5 100644 --- a/en/device-dev/subsystems/subsys-dfx-hisysevent-logging-config.md +++ b/en/device-dev/subsystems/subsys-dfx-hisysevent-logging-config.md @@ -120,7 +120,7 @@ In the **bundle.js** file, use the ```hisysevent_config``` attribute to specify "hitrace_native", "ipc", "safwk", - "samgr_standard", + "samgr", "utils_base" ], "third_party": [] diff --git a/en/readme/SAMGR.md b/en/readme/SAMGR.md index 59273729b8..63a09944e4 100644 --- a/en/readme/SAMGR.md +++ b/en/readme/SAMGR.md @@ -15,7 +15,7 @@ The System Ability Manager (SAMGR) subsystem implements the system service frame ## Directory Structure ``` -/foundation/distributedschedule +/foundation/systemabilitymgr ├── safwk # System ability framework ├── samgr # System ability manager ├── safwk_lite # Lightweight foundation process @@ -26,10 +26,10 @@ The System Ability Manager (SAMGR) subsystem implements the system service frame **SAMGR** -[distributedschedule\_safwk](https://gitee.com/openharmony/distributedschedule_safwk) +[systemabilitymgr\_safwk](https://gitee.com/openharmony/systemabilitymgr_safwk) -[distributedschedule\_samgr](https://gitee.com/openharmony/distributedschedule_samgr) +[systemabilitymgr\_samgr](https://gitee.com/openharmony/systemabilitymgr_samgr) -[distributedschedule\_safwk\_lite](https://gitee.com/openharmony/distributedschedule_safwk_lite) +[systemabilitymgr\_safwk\_lite](https://gitee.com/openharmony/systemabilitymgr_safwk_lite) -[distributedschedule\_samgr\_lite](https://gitee.com/openharmony/distributedschedule_samgr_lite) +[systemabilitymgr\_samgr\_lite](https://gitee.com/openharmony/systemabilitymgr_samgr_lite) diff --git a/en/readme/ai.md b/en/readme/ai.md index 42c4a38cd5..2bf316a765 100644 --- a/en/readme/ai.md +++ b/en/readme/ai.md @@ -416,7 +416,7 @@ Dependency repositories: [build\_lite](https://gitee.com/openharmony/build_lite/blob/master/README.md) -[distributedschedule\_samgr\_lite](https://gitee.com/openharmony/distributedschedule_samgr_lite/blob/master/README.md) +[systemabilitymgr\_samgr\_lite](https://gitee.com/openharmony/systemabilitymgr_samgr_lite/blob/master/README.md) [startup\_init\_lite](https://gitee.com/openharmony/startup_init_lite/blob/master/README.md) diff --git a/zh-cn/device-dev/porting/porting-bes2600w-on-minisystem-display-demo.md b/zh-cn/device-dev/porting/porting-bes2600w-on-minisystem-display-demo.md index b02d14e522..65cc1ca228 100644 --- a/zh-cn/device-dev/porting/porting-bes2600w-on-minisystem-display-demo.md +++ b/zh-cn/device-dev/porting/porting-bes2600w-on-minisystem-display-demo.md @@ -1172,12 +1172,12 @@ HiviewRegisterHilogProc(HilogProc_Impl); ``` { - "subsystem": "distributedschedule", + "subsystem": "systemabilitymgr", "components": [ { "component": "samgr_lite", "features": [ - "config_ohos_distributedschedule_samgr_lite_shared_task_size = 4096" + "config_ohos_systemabilitymgr_samgr_lite_shared_task_size = 4096" ] } ] diff --git a/zh-cn/device-dev/porting/porting-chip-board-component.md b/zh-cn/device-dev/porting/porting-chip-board-component.md index 555559cd0a..285f3d3b14 100644 --- a/zh-cn/device-dev/porting/porting-chip-board-component.md +++ b/zh-cn/device-dev/porting/porting-chip-board-component.md @@ -16,7 +16,7 @@ > 本组件在板级系统移植中必须要使用，否则其他服务组件无法运行。 -**SAMGR使用说明，请参考：[SAMGR 使用指导](https://gitee.com/openharmony/distributedschedule_samgr_lite/blob/master/README_zh.md)** +**SAMGR使用说明，请参考：[SAMGR 使用指导](https://gitee.com/openharmony/systemabilitymgr_samgr_lite/blob/master/README_zh.md)** ## DFX diff --git a/zh-cn/device-dev/porting/porting-stm32f407-on-minisystem-eth.md b/zh-cn/device-dev/porting/porting-stm32f407-on-minisystem-eth.md index 14751be9e5..703676d6ba 100644 --- a/zh-cn/device-dev/porting/porting-stm32f407-on-minisystem-eth.md +++ b/zh-cn/device-dev/porting/porting-stm32f407-on-minisystem-eth.md @@ -1081,13 +1081,13 @@ bool HilogProc_Impl(const HiLogContent *hilogContent, uint32_t len) HiviewRegisterHilogProc(HilogProc_Impl); ``` -### 分布式调度子系统适配 +### 系统服务管理子系统适配 -进行分布式调度子系统适配需要添加`samgr_lite`部件，直接在`config.json`配置即可。 +进行系统服务管理子系统适配需要添加`samgr_lite`部件，直接在`config.json`配置即可。 ``` { - "subsystem": "distributedschedule", + "subsystem": "systemabilitymgr", "components": [ { "component": "samgr_lite", @@ -1097,10 +1097,10 @@ HiviewRegisterHilogProc(HilogProc_Impl); } ``` -在轻量系统中，`samgr_lite`配置的共享任务栈大小默认为`2048`。在适配时可以在features中，通过`config_ohos_distributedschedule_samgr_lite_shared_task_size`重新设置共享任务栈大小。 +在轻量系统中，`samgr_lite`配置的共享任务栈大小默认为`2048`。在适配时可以在features中，通过`config_ohos_systemabilitymgr_samgr_lite_shared_task_size`重新设置共享任务栈大小。 ``` -"config_ohos_distributedschedule_samgr_lite_shared_task_size = 4096" +"config_ohos_systemabilitymgr_samgr_lite_shared_task_size = 4096" ``` ### 安全子系统适配 diff --git a/zh-cn/device-dev/porting/porting-w800-combo-demo.md b/zh-cn/device-dev/porting/porting-w800-combo-demo.md index 09a8cce377..e9a7b107a6 100755 --- a/zh-cn/device-dev/porting/porting-w800-combo-demo.md +++ b/zh-cn/device-dev/porting/porting-w800-combo-demo.md @@ -636,7 +636,7 @@ HDF驱动框架提供了一套应用访问硬件的统一接口，可以简化 ``` { - "subsystem": "distributedschedule", + "subsystem": "systemabilitymgr", "components": [ { "component": "samgr_lite" diff --git a/zh-cn/device-dev/subsystems/subsys-boot-init-service.md b/zh-cn/device-dev/subsystems/subsys-boot-init-service.md index 22c8c7f5fe..65dd5a51b1 100644 --- a/zh-cn/device-dev/subsystems/subsys-boot-init-service.md +++ b/zh-cn/device-dev/subsystems/subsys-boot-init-service.md @@ -55,7 +55,7 @@ ``` - SA进程按需启动 - 具体参考 **[samgr组件(说明3)](https://gitee.com/openharmony/distributedschedule_samgr/blob/master/README_zh.md)**。 + 具体参考 **[samgr组件(说明3)](https://gitee.com/openharmony/systemabilitymgr_samgr/blob/master/README_zh.md)**。 - socket进程按需启动 1. init进程在pre-fork阶段为socket类进程创建好socket，init进程中监听创建好的socket上的读写事件。 diff --git a/zh-cn/device-dev/subsystems/subsys-dfx-hilog-lite.md b/zh-cn/device-dev/subsystems/subsys-dfx-hilog-lite.md index cefdcee926..0aff60913d 100755 --- a/zh-cn/device-dev/subsystems/subsys-dfx-hilog-lite.md +++ b/zh-cn/device-dev/subsystems/subsys-dfx-hilog-lite.md @@ -46,7 +46,7 @@ HILOG_INFO/HILOG_WARN/HILOG_ERROR/HILOG_FATAL HiLogRegisterModule(HILOG_MODULE_SAMGR, "SAMGR"); ``` -3. 在GN文件中添加头文件依赖，文件路径为：“foundation/distributedschedule/samgr_lite/samgr/BUILD.gn“ +3. 在GN文件中添加头文件依赖，文件路径为：“foundation/systemabilitymgr/samgr_lite/samgr/BUILD.gn“ ``` include_dirs = [ @@ -54,7 +54,7 @@ HILOG_INFO/HILOG_WARN/HILOG_ERROR/HILOG_FATAL ] ``` -4. 源文件“foundation/distributedschedule/samgr_lite/samgr/source/message.c“中引用头文件并调用接口。 +4. 源文件“foundation/systemabilitymgr/samgr_lite/samgr/source/message.c“中引用头文件并调用接口。 ``` #include diff --git a/zh-cn/device-dev/subsystems/subsys-dfx-hisysevent-logging-config.md b/zh-cn/device-dev/subsystems/subsys-dfx-hisysevent-logging-config.md index ed9ee462bc..43b117e43b 100644 --- a/zh-cn/device-dev/subsystems/subsys-dfx-hisysevent-logging-config.md +++ b/zh-cn/device-dev/subsystems/subsys-dfx-hisysevent-logging-config.md @@ -133,7 +133,7 @@ "hitrace_native", "ipc", "safwk", - "samgr_standard", + "samgr", "utils_base" ], "third_party": [] diff --git "a/zh-cn/readme/AI\344\270\232\345\212\241\345\255\220\347\263\273\347\273\237.md" "b/zh-cn/readme/AI\344\270\232\345\212\241\345\255\220\347\263\273\347\273\237.md" index 50fa8c9cec..8e062d1450 100644 --- "a/zh-cn/readme/AI\344\270\232\345\212\241\345\255\220\347\263\273\347\273\237.md" +++ "b/zh-cn/readme/AI\344\270\232\345\212\241\345\255\220\347\263\273\347\273\237.md" @@ -424,7 +424,7 @@ AI业务子系统是OpenHarmony提供原生的分布式AI能力的子系统。 [build\_lite](https://gitee.com/openharmony/build_lite/blob/master/README_zh.md) -[distributedschedule\_samgr\_lite](https://gitee.com/openharmony/distributedschedule_samgr_lite/blob/master/README_zh.md) +[systemabilitymgr\_samgr\_lite](https://gitee.com/openharmony/systemabilitymgr_samgr_lite/blob/master/README_zh.md) [startup\_init\_lite](https://gitee.com/openharmony/startup_init_lite/blob/master/README_zh.md) diff --git "a/zh-cn/readme/\347\263\273\347\273\237\346\234\215\345\212\241\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237.md" "b/zh-cn/readme/\347\263\273\347\273\237\346\234\215\345\212\241\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237.md" index 1e588345a3..26b7704d75 100755 --- "a/zh-cn/readme/\347\263\273\347\273\237\346\234\215\345\212\241\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237.md" +++ "b/zh-cn/readme/\347\263\273\347\273\237\346\234\215\345\212\241\347\256\241\347\220\206\345\255\220\347\263\273\347\273\237.md" @@ -21,7 +21,7 @@ ## 目录 ``` -/foundation/distributedschedule +/foundation/systemabilitymgr ├── safwk # 系统服务框架模块 ├── samgr # 系统服务管理模块 ├── safwk_lite # 轻量foundation进程 @@ -32,10 +32,10 @@ **系统服务管理子系统** -[distributedschedule\_safwk](https://gitee.com/openharmony/distributedschedule_safwk) +[systemabilitymgr\_safwk](https://gitee.com/openharmony/systemabilitymgr_safwk) -[distributedschedule\_samgr](https://gitee.com/openharmony/distributedschedule_samgr) +[systemabilitymgr\_samgr](https://gitee.com/openharmony/systemabilitymgr_samgr) -[distributedschedule\_safwk\_lite](https://gitee.com/openharmony/distributedschedule_safwk_lite) +[systemabilitymgr\_safwk\_lite](https://gitee.com/openharmony/systemabilitymgr_safwk_lite) -[distributedschedule\_samgr\_lite](https://gitee.com/openharmony/distributedschedule_samgr_lite) +[systemabilitymgr\_samgr\_lite](https://gitee.com/openharmony/systemabilitymgr_samgr_lite) -- GitLab