!2261 FIX:修正libbegetutil.z.so innerapi对外exported_header_files范围

Merge pull request !2261 from 钟柠/0923_headfile

bundle.json

@@ -97,7 +97,8 @@
                             "syspara/parameters.h",
                             "syspara/param_wrapper.h",
                             "syspara/sysparam_errno.h",
-                            "syspara/sysversion.h"
+                            "syspara/sysversion.h",
+                            "param/init_param.h"	
                         ]
                     },
                     "name": "//base/startup/init/interfaces/innerkits:libbegetutil"

device_info/BUILD.gn

@@ -38,9 +38,8 @@ if (!defined(ohos_lite)) {
     include_dirs = [
       "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include/",
       ".",
-      "//base/startup/init/services/include",
-      "//base/startup/init/services/include/param",
       "//base/startup/init/interfaces/innerkits/include",
+      "//base/startup/init/interfaces/innerkits/include/param",
       "//base/startup/init/interfaces/innerkits/include/syspara",
       "//base/startup/init/interfaces/innerkits/syspara",
       "//base/startup/init/interfaces/hals",

interfaces/innerkits/BUILD.gn

@@ -26,8 +26,7 @@ config("exported_header_files") {
     "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/interfaces/innerkits/include/syspara",
     "//base/startup/init/interfaces/innerkits/include/token",
-    "//base/startup/init/services/include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
   ]
 }
 
@@ -35,14 +34,13 @@ include_common = [
   "./include",
   "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
   "//third_party/bounds_checking_function/include",
-  "//base/startup/init/services/include",
-  "//base/startup/init/services/include/param",
-  "//base/startup/init/interfaces/innerkits/fd_holder",
-  "//base/startup/init/services/param/include",
   "//base/startup/init/interfaces/innerkits/include",
+  "//base/startup/init/interfaces/innerkits/include/param",
+  "//base/startup/init/interfaces/innerkits/fd_holder",
   "//base/startup/init/interfaces/innerkits/include/syspara",
   "//base/startup/init/interfaces/hals",
   "//base/startup/init/interfaces/innerkits/syspara",
+  "//base/startup/init/services/param/include",
 ]
 
 if (defined(ohos_lite)) {
@@ -253,7 +251,7 @@ if (defined(ohos_lite)) {
       include_dirs += [
         "//base/startup/init/services/param/watcher/include",
         "//base/startup/init/services/log",
-        "//base/startup/init/services/include/param",
+        "//base/startup/init/interfaces/innerkits/include/param",
       ]
     } else {
       defines += [ "NO_PARAM_WATCHER" ]

interfaces/innerkits/control_fd/BUILD.gn

@@ -31,7 +31,7 @@ ohos_static_library("libcontrolfd") {
   include_dirs = [
     ".",
     "//third_party/bounds_checking_function/include",
-    "//base/startup/init/services/include",
+    "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/services/loopevent/include",
   ]
   part_name = "init"

interfaces/innerkits/file/BUILD.gn

@@ -20,7 +20,7 @@ ohos_static_library("libfile") {
   sources = [ "init_file.c" ]
   include_dirs = [
     "//base/startup/init/services/log",
-    "//base/startup/init/services/include",
+    "//base/startup/init/interfaces/innerkits/include",
     "//third_party/bounds_checking_function/include",
   ]
   public_configs = [ ":exported_header_files" ]

interfaces/innerkits/fs_manager/BUILD.gn

@@ -31,8 +31,8 @@ ohos_static_library("libfsmanager_static") {
   include_dirs = [
     "//base/startup/init/interfaces/innerkits/include",
     "//third_party/bounds_checking_function/include",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/log",
-    "//base/startup/init/services/include",
     "//base/startup/init/services/param/include",
   ]
   if (defined(global_parts_info.startup_hvb)) {

interfaces/innerkits/include/list.h

@@ -42,18 +42,18 @@ extern "C" {
  *       ListNode node;
  *       int value;
  *   } TEST_LIST_ITEM;
- * 
+ *
  * 2. Define a list and init list by OH_ListAddTail
  *   ListNode testList;
  *   c(&testList);
- * 
+ *
  * 3. Define a list item instance
  *   TEST_LIST_ITEM item;
  *   item.value = 0;
- * 
+ *
  * 4. Add list item to list
  *   OH_ListAddTail(&testList, (ListNode *)(&item));
- * 
+ *
  * 5. Advanced usage: add with order
  *   // Ordering compare function
  *   static int TestListItemCompareProc(ListNode *node, ListNode *newNode)

interfaces/innerkits/include/param/init_param.h

@@ -169,30 +169,6 @@ int SystemSetParameter(const char *name, const char *value);
  */
 int SystemReadParam(const char *name, char *value, uint32_t *len);
 
-/**
- * 对外接口
- * 查询参数，主要用于其他进程使用，找到对应属性的handle。
- *
- */
-int SystemFindParameter(const char *name, ParamHandle *handle);
-
-/**
- * 对外接口
- * 根据handle获取对应数据的修改标识。
- * commitId 获取计数变化
- *
- */
-int SystemGetParameterCommitId(ParamHandle handle, uint32_t *commitId);
-
-/**
- * 外部接口
- * 获取参数值。
- *
- */
-int SystemGetParameterValue(ParamHandle handle, char *value, unsigned int *len);
-
-long long GetSystemCommitId(void);
-
 /**
  * 对外接口
  * 查询参数，主要用于其他进程使用，需要给定足够的内存保存参数。
@@ -202,22 +178,6 @@ long long GetSystemCommitId(void);
  */
 #define SystemGetParameter SystemReadParam
 
-/**
- * 外部接口
- * 遍历参数。
- *
- */
-int SystemTraversalParameter(const char *prefix,
-    void (*traversalParameter)(ParamHandle handle, void *cookie), void *cookie);
-
-/**
- * 外部接口
- * 查询参数，主要用于其他进程使用，需要给定足够的内存保存参数。
- * 如果 value == null，获取value的长度
- * 否则value的大小认为是len
- *
- */
-int SystemGetParameterName(ParamHandle handle, char *name, unsigned int len);
 
 /**
  * 外部接口

interfaces/innerkits/include/param/sys_param.h

@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BASE_STARTUP_INIT_SYS_PARAM_H
+#define BASE_STARTUP_INIT_SYS_PARAM_H
+
+#include <stdint.h>
+#ifndef __LITEOS_M__
+#include <pthread.h>
+#endif
+
+#if (defined(PARAM_SUPPORT_STDATOMIC) || defined(__LITEOS_A__))
+#include <stdatomic.h>
+#endif
+
+#ifndef __LITEOS_A__
+#if defined FUTEX_WAIT || defined FUTEX_WAKE
+#include <linux/futex.h>
+#endif
+#endif
+
+#define MEMORY_ORDER_ACQUIRE 2
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif
+#endif
+
+#ifdef __LITEOS_M__
+#define ATOMIC_UINT32 uint32_t
+#define ATOMIC_LLONG  long long
+#define ATOMIC_UINT64_LOAD_EXPLICIT(commitId, order) *(commitId)
+
+#else
+#if (defined(PARAM_SUPPORT_STDATOMIC) || defined(__LITEOS_A__))
+#define ATOMIC_UINT32 atomic_uint
+#define ATOMIC_LLONG atomic_llong
+#define ATOMIC_UINT64_LOAD_EXPLICIT(commitId, order) atomic_load_explicit((commitId), order)
+
+#else
+#ifndef STARTUP_INIT_TEST
+#define ATOMIC_UINT32 uint32_t
+#define ATOMIC_LLONG int64_t
+static inline ATOMIC_LLONG param_atomic_uint64_load(ATOMIC_LLONG *ptr, int order)
+{
+    return *((volatile ATOMIC_LLONG *)ptr);
+}
+#define ATOMIC_UINT64_LOAD_EXPLICIT(commitId, order) param_atomic_uint64_load((commitId), order)
+#endif
+#endif
+#endif
+
+#ifdef __LITEOS_M__
+typedef struct {
+    uint32_t mutex;
+} ParamRWMutex;
+
+typedef struct {
+    uint32_t mutex;
+} ParamMutex;
+#endif
+
+// support mutex
+#ifndef STARTUP_INIT_TEST
+typedef struct {
+    pthread_rwlock_t rwlock;
+} ParamRWMutex;
+
+typedef struct {
+    pthread_mutex_t mutex;
+} ParamMutex;
+#endif
+
+#ifndef STARTUP_INIT_TEST
+typedef struct {
+    int shmid;
+} MemHandle;
+
+typedef struct {
+    ATOMIC_LLONG commitId;
+    ATOMIC_LLONG commitPersistId;
+    uint32_t trieNodeCount;
+    uint32_t paramNodeCount;
+    uint32_t securityNodeCount;
+    uint32_t currOffset;
+    uint32_t spaceSizeOffset;
+    uint32_t firstNode;
+    uint32_t dataSize;
+    char data[0];
+} ParamTrieHeader;
+
+typedef struct WorkSpace_ {
+    unsigned int flags;
+    MemHandle memHandle;
+    ParamTrieHeader *area;
+    ATOMIC_UINT32 rwSpaceLock;
+    uint32_t spaceSize;
+    uint32_t spaceIndex;
+    ParamRWMutex rwlock;
+    char fileName[0];
+} WorkSpace;
+
+typedef struct CachedParameter_ {
+    struct WorkSpace_ *workspace;
+    const char *(*cachedParameterCheck)(struct CachedParameter_ *param, int *changed);
+    long long spaceCommitId;
+    uint32_t dataCommitId;
+    uint32_t dataIndex;
+    uint32_t bufferLen;
+    uint32_t nameLen;
+    char *paramValue;
+    char data[0];
+} CachedParameter;
+
+typedef void *CachedHandle;
+#endif
+/**
+ * parameter client init
+ */
+void InitParameterClient(void);
+
+/**
+ * by name and default value，save parameter info in handle。
+ *
+ */
+CachedHandle CachedParameterCreate(const char *name, const char *defValue);
+
+/**
+ * destroy handle
+ *
+ */
+void CachedParameterDestroy(CachedHandle handle);
+
+/**
+ * if name exist，return value else return default value
+ *
+ */
+static inline const char *CachedParameterGet(CachedHandle handle)
+{
+    struct CachedParameter_ *param = (struct CachedParameter_ *)handle;
+    if (param == NULL) {
+        return NULL;
+    }
+
+    // no change, do not to find
+    long long spaceCommitId = ATOMIC_UINT64_LOAD_EXPLICIT(&param->workspace->area->commitId, MEMORY_ORDER_ACQUIRE);
+    if (param->spaceCommitId == spaceCommitId) {
+        return param->paramValue;
+    }
+    param->spaceCommitId = spaceCommitId;
+    int changed = 0;
+    if (param->cachedParameterCheck == NULL) {
+        return param->paramValue;
+    }
+    return param->cachedParameterCheck(param, &changed);
+}
+
+static inline const char *CachedParameterGetChanged(CachedHandle handle, int *changed)
+{
+    struct CachedParameter_ *param = (struct CachedParameter_ *)handle;
+    if (param == NULL) {
+        return NULL;
+    }
+    // no change, do not to find
+    long long spaceCommitId = ATOMIC_UINT64_LOAD_EXPLICIT(&param->workspace->area->commitId, MEMORY_ORDER_ACQUIRE);
+    if (param->spaceCommitId == spaceCommitId) {
+        return param->paramValue;
+    }
+    param->spaceCommitId = spaceCommitId;
+    if ((changed == NULL) || (param->cachedParameterCheck == NULL)) {
+        return param->paramValue;
+    }
+    return param->cachedParameterCheck(param, changed);
+}
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
+#endif

interfaces/innerkits/init_module_engine/BUILD.gn

@@ -26,7 +26,6 @@ if (defined(ohos_lite)) {
     visibility += [ "./../../../services/*" ]
     include_dirs = [
       "include/",
-      "//base/startup/init/services/include",
       "//base/startup/init/interfaces/innerkits/include",
       "//base/startup/init/services/log",
       "//third_party/cJSON",
@@ -73,7 +72,6 @@ if (defined(ohos_lite)) {
     include_dirs = [
       "//base/startup/init/interfaces/innerkits/init_module_engine/include",
       "//base/startup/init/interfaces/innerkits/include",
-      "//base/startup/init/services/include",
       "//base/startup/init/services/loopevent/include",
       "//base/startup/init/services/log",
       "//third_party/cJSON",

interfaces/innerkits/libbegetutil.versionscript

@@ -36,13 +36,9 @@
     OH_HashMapIsEmpty;
     OH_HashMapRemove;
     OH_HashMapTraverse;
-    SystemGetParameterName;
     SystemReadParam;
     SystemTraversalParameter;
     GetSystemCommitId;
-    SystemGetParameterValue;
-    SystemGetParameterCommitId;
-    SystemFindParameter;
     CachedParameterCreate;
     CachedParameterGet;
     CachedParameterGetChanged;

interfaces/innerkits/seccomp/BUILD.gn

@@ -37,8 +37,8 @@ if (defined(build_seccomp) && build_seccomp) {
 
     if (seccomp_enable_debug) {
       include_dirs += [
-        "../../../services/include",
-        "../../../services/include/param",
+        "../../../interfaces/innerkits/include",
+        "../../../interfaces/innerkits/include/param",
       ]
 
       defines = [ "WITH_SECCOMP_DEBUG" ]

interfaces/innerkits/syscap/BUILD.gn

@@ -22,7 +22,8 @@ ohos_shared_library("syscap") {
 
   include_dirs = [
     "../include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
+    "//base/startup/init/services/param/include",
   ]
   deps = [
     "//base/startup/init/interfaces/innerkits:libbegetutil",

interfaces/innerkits/syspara/parameter.c

@@ -19,6 +19,7 @@
 #include <stdlib.h>
 
 #include "param_comm.h"
+#include "param_init.h"
 #include "init_param.h"
 #include "init_utils.h"
 #include "sysparam_errno.h"

services/begetctl/BUILD.gn

@@ -19,8 +19,8 @@ common_include_dirs = [
   "//base/startup/init/services/param/adapter",
   "//base/startup/init/services/param/linux",
   "//base/startup/init/services/param/base",
-  "//base/startup/init/services/include/param",
-  "//base/startup/init/services/include",
+  "//base/startup/init/interfaces/innerkits/include/param",
+  "//base/startup/init/interfaces/innerkits/include",
   "//base/startup/init/services/loopevent/include",
   "//base/startup/init/services/init/include",
   "//base/startup/init/services/log",

services/begetctl/param_cmd.c

@@ -28,6 +28,7 @@
 #include "begetctl.h"
 #include "param_manager.h"
 #include "param_security.h"
+#include "param_init.h"
 #include "shell_utils.h"
 #include "init_param.h"
 #include "beget_ext.h"

services/include/param/sys_param.h

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef BASE_STARTUP_INIT_SYS_PARAM_H
-#define BASE_STARTUP_INIT_SYS_PARAM_H
-#include "param_common.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif
-#endif
-
-/**
- * parameter client init
- */
-void InitParameterClient(void);
-
-/**
- * by name and default value，save parameter info in handle。
- *
- */
-CachedHandle CachedParameterCreate(const char *name, const char *defValue);
-
-/**
- * destroy handle
- *
- */
-void CachedParameterDestroy(CachedHandle handle);
-
-/**
- * if name exist，return value else return default value
- *
- */
-static inline const char *CachedParameterGet(CachedHandle handle)
-{
-    struct CachedParameter_ *param = (struct CachedParameter_ *)handle;
-    if (param == NULL) {
-        return NULL;
-    }
-
-    // no change, do not to find
-    long long spaceCommitId = ATOMIC_UINT64_LOAD_EXPLICIT(&param->workspace->area->commitId, MEMORY_ORDER_ACQUIRE);
-    if (param->spaceCommitId == spaceCommitId) {
-        return param->paramValue;
-    }
-    param->spaceCommitId = spaceCommitId;
-    int changed = 0;
-    if (param->cachedParameterCheck == NULL) {
-        return param->paramValue;
-    }
-    return param->cachedParameterCheck(param, &changed);
-}
-
-static inline const char *CachedParameterGetChanged(CachedHandle handle, int *changed)
-{
-    struct CachedParameter_ *param = (struct CachedParameter_ *)handle;
-    if (param == NULL) {
-        return NULL;
-    }
-    // no change, do not to find
-    long long spaceCommitId = ATOMIC_UINT64_LOAD_EXPLICIT(&param->workspace->area->commitId, MEMORY_ORDER_ACQUIRE);
-    if (param->spaceCommitId == spaceCommitId) {
-        return param->paramValue;
-    }
-    param->spaceCommitId = spaceCommitId;
-    if ((changed == NULL) || (param->cachedParameterCheck == NULL)) {
-        return param->paramValue;
-    }
-    return param->cachedParameterCheck(param, changed);
-}
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-#endif

services/init/lite/BUILD.gn

@@ -49,7 +49,7 @@ executable("init") {
   include_dirs = [
     "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/interfaces/innerkits/fd_holder",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/init/include",
     "//third_party/cJSON",
     "//third_party/bounds_checking_function/include",

services/init/standard/BUILD.gn

@@ -42,7 +42,7 @@ ohos_executable("init_early") {
   ]
   include_dirs = [
     "//third_party/cJSON",
-    "//base/startup/init/services/include",
+    "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/services/init/include",
     "//base/startup/init/interfaces/innerkits/init_module_engine/include",
   ]
@@ -85,6 +85,7 @@ ohos_executable("init") {
   sources += init_common_sources
 
   include_dirs = [
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/init/include",
     "//base/startup/init/services/modules/reboot",
     "//base/startup/init/services/modules/init_context",

services/log/BUILD.gn

@@ -17,7 +17,7 @@ config("exported_header_files") {
   include_dirs = [
     "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/services/log",
-    "//base/startup/init/services/include",
+    "//base/startup/init/interfaces/innerkits/include",
   ]
 }
 

services/loopevent/BUILD.gn

@@ -28,7 +28,6 @@ common_sources = [
 common_include = [
   "//base/startup/init/services/log",
   "//base/startup/init/interfaces/innerkits/include",
-  "//base/startup/init/services/include",
   "//third_party/bounds_checking_function/include",
   "include",
   "loop",

services/modules/bootchart/BUILD.gn

@@ -19,7 +19,7 @@ ohos_shared_library("bootchart") {
   include_dirs = [
     "//base/startup/init/services/modules",
     "//base/startup/init/services/modules/bootchart",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
   ]
 
   deps = [

services/modules/bootevent/BUILD.gn

@@ -20,7 +20,7 @@ config("bootevent_static_config") {
     "//base/startup/init/services/loopevent/include",
     "//base/startup/init/services/modules/init_hook",
     "//base/startup/init/services/param/include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//third_party/bounds_checking_function/include/",
     "//base/customization/config_policy/interfaces/inner_api/include",
   ]
@@ -35,7 +35,7 @@ ohos_source_set("libbootevent_static") {
     include_dirs += [
       "//third_party/selinux/libselinux/include/",
       "//base/security/selinux_adapter/interfaces/policycoreutils/include/",
-      "//base/startup/init/services/include/param",
+      "//base/startup/init/interfaces/innerkits/include/param",
     ]
     defines = [ "WITH_SELINUX" ]
   }

services/modules/init_context/BUILD.gn

@@ -18,8 +18,8 @@ comm_include = [
   ".",
   "..",
   "../../init/include",
-  "../../include",
-  "../../include/param",
+  "//base/startup/init/interfaces/innerkits/include/param",
+  "//base/startup/init/interfaces/innerkits/include",
 ]
 
 ohos_shared_library("init_context") {

services/modules/init_eng/BUILD.gn

@@ -17,8 +17,8 @@ import("//build/ohos.gni")
 comm_include = [
   ".",
   "..",
-  "../../include",
-  "../../include/param",
+  "//base/startup/init/interfaces/innerkits/include",
+  "//base/startup/init/interfaces/innerkits/include/param",
 ]
 
 ohos_shared_library("init_eng") {

services/modules/init_hook/BUILD.gn

@@ -17,8 +17,8 @@ config("inithook_config") {
   include_dirs = [ "//base/startup/init/services/modules/init_hook" ]
 }
 comm_include = [
-  "//base/startup/init/services/include",
-  "//base/startup/init/services/include/param",
+  "//base/startup/init/interfaces/innerkits/include",
+  "//base/startup/init/interfaces/innerkits/include/param",
   "//base/startup/init/services/modules",
   "//base/startup/init/services/modules/init_hook",
   "//base/startup/init/services/init/include",

services/modules/reboot/BUILD.gn

@@ -21,7 +21,7 @@ ohos_shared_library("rebootmodule") {
     ".",
     "..",
     "../init_hook",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
   ]
   deps = [
     "//base/startup/init/interfaces/innerkits/init_module_engine:libinit_module_engine",
@@ -52,7 +52,7 @@ ohos_source_set("libreboot_static") {
     ".",
     "..",
     "../init_hook",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//third_party/bounds_checking_function/include",
   ]
   public_configs = [ "//base/startup/init/interfaces/innerkits/init_module_engine:init_module_engine_exported_config" ]

services/modules/seccomp/BUILD.gn

@@ -124,8 +124,8 @@ config("libseccomp_static_config") {
 
   if (seccomp_enable_debug) {
     include_dirs += [
-      "../../../services/include",
-      "../../../services/include/param",
+      "../../../interfaces/innerkits/include",
+      "../../../interfaces/innerkits/include/param",
     ]
 
     defines = [ "WITH_SECCOMP_DEBUG" ]

services/modules/selinux/BUILD.gn

@@ -21,8 +21,8 @@ ohos_shared_library("selinuxadp") {
     ".",
     "..",
     "../init_hook",
-    "//base/startup/init/services/include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//third_party/selinux/libselinux/include/",
     "//base/security/selinux_adapter/interfaces/policycoreutils/include/",
   ]
@@ -61,7 +61,7 @@ ohos_source_set("libselinuxadp_static") {
     ".",
     "..",
     "../init_hook",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//third_party/selinux/libselinux/include/",
     "//base/security/selinux_adapter/interfaces/policycoreutils/include/",
   ]

services/modules/sysevent/BUILD.gn

@@ -24,7 +24,7 @@ ohos_shared_library("eventmodule") {
     "..",
     "../bootevent",
     "../init_hook",
-    "../../include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
   ]
 
   deps = [

services/modules/trace/BUILD.gn

@@ -17,8 +17,8 @@ comm_include = [
   ".",
   "..",
   "../bootevent",
-  "../../include",
-  "../../include/param",
+  "//base/startup/init/interfaces/innerkits/include",
+  "//base/startup/init/interfaces/innerkits/include/param",
 ]
 
 ohos_shared_library("inittrace") {

services/modules/udid/BUILD.gn

@@ -18,10 +18,10 @@ comm_include = [
   ".",
   "..",
   "../init_hook",
-  "../../include/param",
-  "../../../interfaces/innerkits/include",
-  "../../../interfaces/innerkits/include/syspara",
-  "../../../interfaces/innerkits/syspara",
+  "//base/startup/init/interfaces/innerkits/include/param",
+  "//base/startup/init/interfaces/innerkits/include",
+  "//base/startup/init/interfaces/innerkits/include/syspara",
+  "//base/startup/init/interfaces/innerkits/syspara",
   "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
 ]
 

services/param/base/BUILD.gn

@@ -18,8 +18,7 @@ config("exported_header_files") {
   include_dirs = [
     "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
     "//base/startup/init/interfaces/innerkits/include",
-    "//base/startup/init/services/include/param",
-    "//base/startup/init/services/include",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/loopevent/include",
     "//base/startup/init/services/log",
     "//base/startup/init/services/param/include",

services/param/include/param_init.h

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef BASE_STARTUP_PARAM_INIT_H
+#define BASE_STARTUP_PARAM_INIT_H
+#include <stdint.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif
+#endif
+
+typedef uint32_t ParamHandle;
+
+/**
+ * 外部接口
+ * 查询参数，主要用于其他进程使用，需要给定足够的内存保存参数。
+ * 如果 value == null，获取value的长度
+ * 否则value的大小认为是len
+ *
+ */
+int SystemGetParameterName(ParamHandle handle, char *name, unsigned int len);
+
+/**
+ * 外部接口
+ * 遍历参数。
+ *
+ */
+int SystemTraversalParameter(const char *prefix,
+    void (*traversalParameter)(ParamHandle handle, void *cookie), void *cookie);
+
+long long GetSystemCommitId(void);
+
+/**
+ * 外部接口
+ * 获取参数值。
+ *
+ */
+int SystemGetParameterValue(ParamHandle handle, char *value, unsigned int *len);
+
+/**
+ * 对外接口
+ * 根据handle获取对应数据的修改标识。
+ * commitId 获取计数变化
+ *
+ */
+int SystemGetParameterCommitId(ParamHandle handle, uint32_t *commitId);
+
+/**
+ * 对外接口
+ * 查询参数，主要用于其他进程使用，找到对应属性的handle。
+ *
+ */
+int SystemFindParameter(const char *name, ParamHandle *handle);
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif
+#endif
+#endif

services/param/linux/BUILD.gn

@@ -17,7 +17,7 @@ config("exported_header_files") {
   visibility = [ ":*" ]
   include_dirs = [
     "//base/startup/init/interfaces/innerkits/include",
-    "//base/startup/init/interfaces/service/include/param",
+    "//base/startup/init/interfaces/interfaces/innerkits/include/param",
     "//base/startup/init/interfaces/service/param/include",
     "//third_party/bounds_checking_function/include",
     "//third_party/selinux/libselinux/include",
@@ -29,8 +29,8 @@ param_include_dirs = [
   "//base/startup/init/services/param/adapter",
   "//base/startup/init/services/param/linux",
   "//base/startup/init/services/param/base",
-  "//base/startup/init/services/include/param",
-  "//base/startup/init/services/include",
+  "//base/startup/init/interfaces/innerkits/include/param",
+  "//base/startup/init/interfaces/innerkits/include",
   "//base/startup/init/services/init/include",
   "//base/startup/init/services/log",
   "//base/startup/init/services/modules/init_hook",

services/param/liteos/BUILD.gn

@@ -19,8 +19,8 @@ param_include_dirs = [
   "//base/startup/init/services/param/include",
   "//base/startup/init/services/param/adapter",
   "//base/startup/init/services/param/base",
-  "//base/startup/init/services/include/param",
-  "//base/startup/init/services/include",
+  "//base/startup/init/interfaces/innerkits/include/param",
+  "//base/startup/init/interfaces/innerkits/include",
   "//base/startup/init/services/init/include",
   "//base/startup/init/services/log",
   "//base/startup/init/services/modules/init_hook",
@@ -60,7 +60,7 @@ config("exported_header_files") {
   visibility = [ ":*" ]
   include_dirs = [
     "//base/startup/init/interfaces/innerkits/include",
-    "//base/startup/init/interfaces/service/include/param",
+    "//base/startup/init/interfaces/interfaces/innerkits/include/param",
     "//base/startup/init/interfaces/service/param/include",
   ]
 }

services/param/liteos/param_client.c

@@ -14,6 +14,7 @@
  */
 #include "init_log.h"
 #include "init_param.h"
+#include "param_init.h"
 #include "param_manager.h"
 
 #define MIN_SLEEP (100 * 1000)

services/param/watcher/BUILD.gn

@@ -30,13 +30,12 @@ ohos_shared_library("param_watcher") {
   include_dirs = [
     "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include/",
     "//base/startup/init/services/param/include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/param/linux",
     "//base/startup/init/services/param/watcher/proxy",
     "//base/startup/init/services/param/watcher/include",
-    "//base/startup/init/services/include",
-    "//base/startup/init/services/log",
     "//base/startup/init/interfaces/innerkits/include",
+    "//base/startup/init/services/log",
     "//base/startup/init/services/loopevent/include",
     "//third_party/cJSON",
   ]

services/param/watcher/proxy/watcher_manager.cpp

@@ -21,6 +21,7 @@
 #include <thread>
 
 #include "init_param.h"
+#include "param_init.h"
 #include "parameter.h"
 #include "system_ability_definition.h"
 #include "string_ex.h"

services/sandbox/BUILD.gn

@@ -31,7 +31,7 @@ ohos_static_library("sandbox") {
   include_dirs = [
     "//third_party/bounds_checking_function/include",
     "//third_party/cJSON",
-    "//base/startup/init/services/include",
+    "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/interfaces/innerkits/include",
   ]
   if (target_cpu == "arm64" || target_cpu == "x86_64") {

services/utils/BUILD.gn

@@ -14,7 +14,7 @@ import("//base/startup/init/begetd.gni")
 config("exported_header_files") {
   visibility = [ ":*" ]
   include_dirs = [
-    "//base/startup/init/services/include",
+    "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/services/log",
   ]
 }

test/benchmark/parameter_benchmark.cpp

@@ -16,6 +16,7 @@
 #include <benchmark/benchmark.h>
 #include "benchmark_fwk.h"
 #include "init_param.h"
+#include "param_init.h"
 #include "parameter.h"
 #include "sys_param.h"
 

test/fuzztest/BUILD.gn

@@ -158,7 +158,7 @@ ohos_fuzztest("ReadFileInDirFuzzTest") {
 
   include_dirs = [
     "//base/startup/init/services/init/include",
-    "//base/startup/init/services/include",
+    "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/test/fuzztest/utils/include",
   ]
 
@@ -228,7 +228,7 @@ ohos_fuzztest("SystemDumpParametersFuzzTest") {
       "//base/startup/init/test/fuzztest/systemdumpparameters_fuzzer"
 
   include_dirs = [
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/test/fuzztest/utils/include",
   ]
 
@@ -255,7 +255,7 @@ ohos_fuzztest("FindParameterFuzzTest") {
   fuzz_config_file = "//base/startup/init/test/fuzztest/findparameter_fuzzer"
 
   include_dirs = [
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/test/fuzztest/utils/include",
   ]
 
@@ -280,7 +280,7 @@ ohos_fuzztest("GetParameterCFuzzTest") {
   fuzz_config_file = "//base/startup/init/test/fuzztest/getparameterc_fuzzer"
 
   include_dirs = [
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/test/fuzztest/utils/include",
   ]
 
@@ -306,7 +306,7 @@ ohos_fuzztest("GetParameterCommitIdFuzzTest") {
       "//base/startup/init/test/fuzztest/getparametercommitid_fuzzer"
 
   include_dirs = [
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/test/fuzztest/utils/include",
   ]
 
@@ -331,7 +331,7 @@ ohos_fuzztest("GetParameterNameFuzzTest") {
   fuzz_config_file = "//base/startup/init/test/fuzztest/getparametername_fuzzer"
 
   include_dirs = [
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/test/fuzztest/utils/include",
   ]
 
@@ -358,7 +358,7 @@ ohos_fuzztest("GetParameterValueFuzzTest") {
       "//base/startup/init/test/fuzztest/getparametervalue_fuzzer"
 
   include_dirs = [
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/test/fuzztest/utils/include",
   ]
 
@@ -384,7 +384,7 @@ ohos_fuzztest("SetParameterCFuzzTest") {
   fuzz_config_file = "//base/startup/init/test/fuzztest/setparameterc_fuzzer"
 
   include_dirs = [
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/test/fuzztest/utils/include",
   ]
 
@@ -410,9 +410,10 @@ ohos_fuzztest("SystemTraversalParameterFuzzTest") {
       "//base/startup/init/test/fuzztest/systemtraversalparameter_fuzzer"
 
   include_dirs = [
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/init/include",
     "//base/startup/init/test/fuzztest/utils/include",
+    "//base/startup/init/services/param/include",
     "//third_party/bounds_checking_function/include",
   ]
 
@@ -440,7 +441,7 @@ ohos_fuzztest("WaitParameterFuzzTest") {
   fuzz_config_file = "//base/startup/init/test/fuzztest/waitparameter_fuzzer"
 
   include_dirs = [
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/test/fuzztest/utils/include",
   ]
 
@@ -466,7 +467,7 @@ ohos_fuzztest("WatchParameterFuzzTest") {
 
   include_dirs = [
     "//base/startup/init/interfaces/innerkits/include/syspara",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/init/include",
     "//base/startup/init/test/fuzztest/utils/include",
   ]
@@ -619,7 +620,7 @@ ohos_fuzztest("GetIntParameterCFuzzTest") {
   include_dirs = [
     "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/test/fuzztest/utils/include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
   ]
 
   deps = [
@@ -1835,7 +1836,7 @@ ohos_fuzztest("ServiceWatchForStatusFuzzTest") {
   include_dirs = [
     "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/test/fuzztest/utils/include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
   ]
 
   deps = [
@@ -2893,7 +2894,7 @@ ohos_fuzztest("AddRemoteWatcherFuzzTest") {
     "//base/startup/init/services/param/watcher/proxy",
     "//base/startup/init/services/param/watcher/include",
     "//base/startup/init/services/param/include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/param/linux",
     "//base/startup/init/services/loopevent/include",
     "//base/startup/init/services/param/watcher/agent",
@@ -2938,7 +2939,7 @@ ohos_fuzztest("DelRemoteWatcherFuzzTest") {
     "//base/startup/init/services/param/watcher/proxy",
     "//base/startup/init/services/param/watcher/include",
     "//base/startup/init/services/param/include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/param/linux",
     "//base/startup/init/services/loopevent/include",
     "//base/startup/init/services/param/watcher/agent",
@@ -2983,7 +2984,7 @@ ohos_fuzztest("AddWatcherFuzzTest") {
     "//base/startup/init/services/param/watcher/proxy",
     "//base/startup/init/services/param/watcher/include",
     "//base/startup/init/services/param/include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/param/linux",
     "//base/startup/init/services/loopevent/include",
     "//base/startup/init/services/param/watcher/agent",
@@ -3026,7 +3027,7 @@ ohos_fuzztest("DelWatcherFuzzTest") {
     "//base/startup/init/services/param/watcher/proxy",
     "//base/startup/init/services/param/watcher/include",
     "//base/startup/init/services/param/include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/param/linux",
     "//base/startup/init/services/loopevent/include",
     "//base/startup/init/services/param/watcher/agent",
@@ -3069,7 +3070,7 @@ ohos_fuzztest("RefreshWatcherFuzzTest") {
     "//base/startup/init/services/param/watcher/proxy",
     "//base/startup/init/services/param/watcher/include",
     "//base/startup/init/services/param/include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/param/linux",
     "//base/startup/init/services/loopevent/include",
     "//base/startup/init/services/param/watcher/agent",

test/fuzztest/systemtraversalparameter_fuzzer/systemtraversalparameter_fuzzer.cpp

@@ -20,6 +20,7 @@
 #include "init.h"
 #include "securec.h"
 #include "init_param.h"
+#include "param_init.h"
 
 static void FakeShowParam(ParamHandle handle, void *cookie)
 {

test/moduletest/BUILD.gn

@@ -19,11 +19,10 @@ ohos_shared_library("libparamtestmodule") {
   sources = [ "param_test_module.c" ]
 
   include_dirs = [
-    "//base/startup/init/services/include/param",
-    "//base/startup/init/services/include",
+    "//base/startup/init/interfaces/innerkits/include/param",
+    "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/services/init/include",
     "//base/startup/init/services/log",
-    "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/services/loopevent/include",
     "//base/startup/init/services/param/include",
     "//base/startup/init/ueventd/include",
@@ -64,7 +63,7 @@ ohos_moduletest("InitModuleTest") {
     "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/interfaces/innerkits/include/syspara",
     "//base/startup/init/interfaces/innerkits/syspara",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/param/include",
     "//base/startup/init/device_info",
     ".",

test/moduletest/param_test_cmds.c

@@ -19,6 +19,7 @@
 
 #include "begetctl.h"
 #include "init_param.h"
+#include "param_init.h"
 #include "init_utils.h"
 #include "loop_event.h"
 #include "parameter.h"

test/unittest/BUILD.gn

@@ -225,9 +225,9 @@ ohos_unittest("init_unittest") {
     "//base/startup/init/interfaces/innerkits/control_fd",
     "//base/startup/init/services/begetctl",
     "//base/startup/init/services/begetctl/shell",
-    "//base/startup/init/services/include",
+    "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/services/init/include",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "//base/startup/init/services/log",
     "//base/startup/init/services/loopevent/include",
     "//base/startup/init/services/loopevent/loop",
@@ -268,7 +268,7 @@ ohos_unittest("init_unittest") {
     "//base/security/access_token/interfaces/innerkits/nativetoken/include",
     "//base/startup/init/services/sandbox/include",
     "//base/startup/init/interfaces/innerkits/hals",
-    "//base/startup/init/services/include/param",
+    "//base/startup/init/interfaces/innerkits/include/param",
     "${FSCRYPT_PATH}/include/libfscrypt",
   ]
 

test/unittest/lite/BUILD.gn

@@ -83,8 +83,8 @@ if (defined(ohos_lite)) {
     include_dirs = [
       "//base/startup/init/services/begetctl",
       "//base/startup/init/services/begetctl/shell",
-      "//base/startup/init/services/include",
-      "//base/startup/init/services/include/param",
+      "//base/startup/init/interfaces/innerkits/include",
+      "//base/startup/init/interfaces/innerkits/include/param",
       "//base/startup/init/services/init/include",
       "//base/startup/init/services/log",
       "//base/startup/init/services/loopevent/include",

test/unittest/param/client_unittest.cpp

@@ -17,6 +17,7 @@
 #include "init_param.h"
 #include "init_utils.h"
 #include "param_stub.h"
+#include "param_init.h"
 
 using namespace std;
 using namespace testing::ext;

test/unittest/param/param_shell_unittest.cpp

@@ -20,6 +20,7 @@
 #include "shell_utils.h"
 #include "shell_bas.h"
 #include "init_param.h"
+#include "param_init.h"
 
 using namespace std;
 using namespace testing::ext;

test/unittest/param/param_unittest.cpp

@@ -18,6 +18,7 @@
 #include "param_base.h"
 #include "param_message.h"
 #include "param_stub.h"
+#include "param_init.h"
 #include "trigger_manager.h"
 #include "param_utils.h"
 #include "param_osadp.h"

test/unittest/param/paramservice_unittest.cpp

@@ -17,6 +17,7 @@
 #include "init_param.h"
 #include "param_message.h"
 #include "param_stub.h"
+#include "param_init.h"
 #include "trigger_manager.h"
 #include "le_timer.h"
 

ueventd/BUILD.gn

@@ -38,8 +38,8 @@ if (defined(ohos_lite)) {
 
       include_dirs = [
         "//base/startup/init/services/log",
-        "//base/startup/init/services/include",
-        "//base/startup/init/services/include/param",
+        "//base/startup/init/interfaces/innerkits/include",
+        "//base/startup/init/interfaces/innerkits/include/param",
         "//base/startup/init/services/utils",
         "//base/startup/init/ueventd/include",
       ]
@@ -65,7 +65,7 @@ if (defined(ohos_lite)) {
   service_ueventd_include = [
     "//third_party/bounds_checking_function/include",
     "//base/startup/init/services/log",
-    "//base/startup/init/services/include",
+    "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/services/utils",
     "//base/startup/init/ueventd/include",
     "//third_party/selinux/libselinux/include/selinux",
@@ -110,7 +110,7 @@ if (defined(ohos_lite)) {
     ]
     include_dirs = service_ueventd_include
     include_dirs += [
-      "//base/startup/init/services/include/param",
+      "//base/startup/init/interfaces/innerkits/include/param",
       "//base/startup/init/interfaces/innerkits/include",
     ]
     deps = service_ueventd_deps