未验证 提交 12e40076 编写于 作者: O openharmony_ci 提交者: Gitee

!8116 modify samgr

Merge pull request !8116 from huangxiaolinabc123/8_15
......@@ -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"
]
}
]
......
......@@ -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<a name="section20064420420"></a>
......
......@@ -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.
......
......@@ -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 <log.h>
......
......@@ -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": []
......
......@@ -15,7 +15,7 @@ The System Ability Manager (SAMGR) subsystem implements the system service frame
## Directory Structure<a name="section161941989596"></a>
```
/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)
......@@ -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)
......
......@@ -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"
]
}
]
......
......@@ -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
......
......@@ -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"
```
### 安全子系统适配
......
......@@ -636,7 +636,7 @@ HDF驱动框架提供了一套应用访问硬件的统一接口,可以简化
```
{
"subsystem": "distributedschedule",
"subsystem": "systemabilitymgr",
"components": [
{
"component": "samgr_lite"
......
......@@ -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上的读写事件。
......
......@@ -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 <log.h>
......
......@@ -133,7 +133,7 @@
"hitrace_native",
"ipc",
"safwk",
"samgr_standard",
"samgr",
"utils_base"
],
"third_party": []
......
......@@ -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)
......
......@@ -21,7 +21,7 @@
## 目录<a name="section161941989596"></a>
```
/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)
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册