From aa954d8337212924094425e9d21714a32271f18d Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Sat, 23 Jul 2022 19:07:00 +0800 Subject: [PATCH 1/2] merger so Signed-off-by: hwzhangchuang --- README_zh.md | 3 +- bundle.json | 4 +- .../distributedhardwarefwkservice/BUILD.gn | 39 +++++++- .../componentloader/component_loader.h | 0 .../componentmanager/component_disable.h | 0 .../componentmanager/component_enable.h | 0 .../componentmanager/component_manager.h | 0 .../include/distributed_hardware_manager.h | 0 .../distributed_hardware_manager_factory.h | 6 +- .../include/distributed_hardware_proxy.h | 0 .../include/hidumphelper/enabled_comps_dump.h | 0 .../include/hidumphelper/hidump_helper.h | 0 .../local_hardware_manager.h | 0 .../plugin_listener_impl.h | 0 .../include/resourcemanager/capability_info.h | 0 .../resourcemanager/capability_info_event.h | 0 .../resourcemanager/capability_info_manager.h | 0 .../resourcemanager/capability_utils.h | 0 .../include/resourcemanager/db_adapter.h | 0 .../include/task/disable_task.h | 0 .../include/task/enable_task.h | 0 .../include/task/monitor_task_timer.h | 0 .../include/task/offline_task.h | 0 .../include/task/online_task.h | 0 .../include/task/task.h | 0 .../include/task/task_board.h | 0 .../include/task/task_executor.h | 0 .../include/task/task_factory.h | 0 .../include/utils/dh_context.h | 0 .../include/utils/impl_utils.h | 0 .../include/versionmanager/version_manager.h | 0 .../src/componentloader/component_loader.cpp | 0 .../componentmanager/component_disable.cpp | 0 .../src/componentmanager/component_enable.cpp | 0 .../componentmanager/component_manager.cpp | 0 .../src/distributed_hardware_manager.cpp | 0 .../distributed_hardware_manager_factory.cpp | 94 +++--------------- .../src/distributed_hardware_proxy.cpp | 0 .../src/hidumphelper/enabled_comps_dump.cpp | 0 .../src/hidumphelper/hidump_helper.cpp | 0 .../local_hardware_manager.cpp | 0 .../plugin_listener_impl.cpp | 0 .../src/resourcemanager/capability_info.cpp | 0 .../capability_info_manager.cpp | 0 .../src/resourcemanager/capability_utils.cpp | 0 .../src/resourcemanager/db_adapter.cpp | 0 .../src/task/disable_task.cpp | 0 .../src/task/enable_task.cpp | 0 .../src/task/monitor_task_timer.cpp | 0 .../src/task/offline_task.cpp | 0 .../src/task/online_task.cpp | 0 .../src/task/task.cpp | 0 .../src/task/task_board.cpp | 0 .../src/task/task_executor.cpp | 0 .../src/task/task_factory.cpp | 0 .../src/utils/dh_context.cpp | 0 .../src/versionmanager/version_manager.cpp | 0 .../test/fuzztest/BUILD.gn | 6 +- .../fuzztest/componentmanager_fuzzer/BUILD.gn | 10 +- .../componentmanager_fuzzer.cpp | 0 .../componentmanager_fuzzer.h | 0 .../componentmanager_fuzzer/corpus/init | 0 .../componentmanager_fuzzer/project.xml | 0 .../fuzztest/resourcemanager_fuzzer/BUILD.gn | 10 +- .../resourcemanager_fuzzer/corpus/init | 0 .../resourcemanager_fuzzer/project.xml | 0 .../resourcemanager_fuzzer.cpp | 0 .../resourcemanager_fuzzer.h | 0 .../test/unittest/BUILD.gn | 10 +- .../unittest/common/componentloader/BUILD.gn | 10 +- .../include/component_loader_test.h | 0 .../src/component_loader_test.cpp | 0 .../unittest/common/componentmanager/BUILD.gn | 0 .../include/component_manager_test.h | 0 .../include/mock_idistributed_hardware_sink.h | 0 .../mock_idistributed_hardware_source.h | 0 .../src/component_manager_test.cpp | 0 .../distributed_hardware_manager_test.cpp | 0 .../distributed_hardware_manager_test.h | 0 .../unittest/common/resourcemanager/BUILD.gn | 0 .../include/resource_manager_test.h | 0 .../src/resource_manager_test.cpp | 0 .../test/unittest/common/task/BUILD.gn | 0 .../common/task/include/mock_disable_task.h | 0 .../common/task/include/mock_enable_task.h | 0 .../common/task/include/mock_offline_task.h | 0 .../common/task/include/mock_online_task.h | 0 .../common/task/include/mock_task_factory.h | 0 .../common/task/include/mock_task_utils.h | 0 .../unittest/common/task/include/task_test.h | 0 .../common/task/src/mock_disable_task.cpp | 0 .../common/task/src/mock_enable_task.cpp | 0 .../common/task/src/mock_offline_task.cpp | 0 .../common/task/src/mock_online_task.cpp | 0 .../common/task/src/mock_task_factory.cpp | 0 .../unittest/common/task/src/task_test.cpp | 0 .../unittest/common/versionmanager/BUILD.gn | 0 .../include/version_manager_test.h | 0 .../src/version_manager_test.cpp | 0 .../BUILD.gn | 99 ------------------- .../test/fuzztest/BUILD.gn | 21 ---- .../test/unittest/BUILD.gn | 24 ----- .../test/unittest/common/BUILD.gn | 68 ------------- 103 files changed, 81 insertions(+), 323 deletions(-) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/componentloader/component_loader.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/componentmanager/component_disable.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/componentmanager/component_enable.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/componentmanager/component_manager.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/distributed_hardware_manager.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/distributed_hardware_proxy.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/hidumphelper/enabled_comps_dump.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/hidumphelper/hidump_helper.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/localhardwaremanager/local_hardware_manager.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/localhardwaremanager/plugin_listener_impl.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/resourcemanager/capability_info.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/resourcemanager/capability_info_event.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/resourcemanager/capability_info_manager.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/resourcemanager/capability_utils.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/resourcemanager/db_adapter.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/task/disable_task.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/task/enable_task.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/task/monitor_task_timer.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/task/offline_task.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/task/online_task.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/task/task.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/task/task_board.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/task/task_executor.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/task/task_factory.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/utils/dh_context.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/utils/impl_utils.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/include/versionmanager/version_manager.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/componentloader/component_loader.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/componentmanager/component_disable.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/componentmanager/component_enable.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/componentmanager/component_manager.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/distributed_hardware_manager.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/distributed_hardware_proxy.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/hidumphelper/enabled_comps_dump.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/hidumphelper/hidump_helper.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/localhardwaremanager/local_hardware_manager.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/localhardwaremanager/plugin_listener_impl.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/resourcemanager/capability_info.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/resourcemanager/capability_info_manager.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/resourcemanager/capability_utils.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/resourcemanager/db_adapter.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/task/disable_task.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/task/enable_task.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/task/monitor_task_timer.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/task/offline_task.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/task/online_task.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/task/task.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/task/task_board.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/task/task_executor.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/task/task_factory.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/utils/dh_context.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/src/versionmanager/version_manager.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/fuzztest/componentmanager_fuzzer/BUILD.gn (83%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/fuzztest/componentmanager_fuzzer/corpus/init (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/fuzztest/componentmanager_fuzzer/project.xml (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/fuzztest/resourcemanager_fuzzer/BUILD.gn (87%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/fuzztest/resourcemanager_fuzzer/corpus/init (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/fuzztest/resourcemanager_fuzzer/project.xml (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/componentloader/BUILD.gn (80%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/componentloader/include/component_loader_test.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/componentloader/src/component_loader_test.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/componentmanager/BUILD.gn (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/componentmanager/include/component_manager_test.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/componentmanager/include/mock_idistributed_hardware_sink.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/componentmanager/include/mock_idistributed_hardware_source.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/componentmanager/src/component_manager_test.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/distributed_hardware_manager_test.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/distributed_hardware_manager_test.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/resourcemanager/BUILD.gn (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/resourcemanager/include/resource_manager_test.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/resourcemanager/src/resource_manager_test.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/BUILD.gn (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/include/mock_disable_task.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/include/mock_enable_task.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/include/mock_offline_task.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/include/mock_online_task.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/include/mock_task_factory.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/include/mock_task_utils.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/include/task_test.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/src/mock_disable_task.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/src/mock_enable_task.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/src/mock_offline_task.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/src/mock_online_task.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/src/mock_task_factory.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/task/src/task_test.cpp (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/versionmanager/BUILD.gn (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/versionmanager/include/version_manager_test.h (100%) rename services/{distributedhardwarefwkserviceimpl => distributedhardwarefwkservice}/test/unittest/common/versionmanager/src/version_manager_test.cpp (100%) delete mode 100644 services/distributedhardwarefwkserviceimpl/BUILD.gn delete mode 100644 services/distributedhardwarefwkserviceimpl/test/fuzztest/BUILD.gn delete mode 100644 services/distributedhardwarefwkserviceimpl/test/unittest/BUILD.gn delete mode 100644 services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn diff --git a/README_zh.md b/README_zh.md index 1f95cbb2..59134180 100644 --- a/README_zh.md +++ b/README_zh.md @@ -28,8 +28,7 @@ ├── sa_profile # 分布式硬件管理框架的SA配置信息 ├── services # 分布式硬件管理框架的SA具体实现 │   └── distributedhardwarefwkservice # 分布式硬件管理框架的服务层 -│   └── accessmanager # 硬件接入管理 -│ └── distributedhardwarefwkserviceimpl # 分布式硬件管理框架的服务实现层 +│   ├── accessmanager # 硬件接入管理 │ ├── resourcemanager # 硬件资源管理 │ ├── componentmanager # 分布式硬件部件管理 │ ├── localhardwaremanager # 本地硬件信息管理 diff --git a/bundle.json b/bundle.json index 7cf5e4ad..1e6faf8c 100644 --- a/bundle.json +++ b/bundle.json @@ -53,16 +53,14 @@ "sub_component": [ "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", "//foundation/distributedhardware/distributed_hardware_fwk/sa_profile:dhfwk_sa_profile", "//foundation/distributedhardware/distributed_hardware_fwk/sa_profile:dhardware.cfg" ], "test": [ "//foundation/distributedhardware/distributed_hardware_fwk/utils/test/unittest:utils_test", - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl/test/unittest:svrimpl_test", "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/unittest:test", "//foundation/distributedhardware/distributed_hardware_fwk/utils/test/fuzztest:fuzztest", - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl/test/fuzztest:fuzztest", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/fuzztest:fuzztest", "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/fuzztest:fuzztest" ] } diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index 442f7a08..f0a83f95 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -28,7 +28,16 @@ ohos_shared_library("distributedhardwarefwksvr") { "${utils_path}/include", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", "//foundation/distributedhardware/device_manager/common/include", - "${services_path}/distributedhardwarefwkserviceimpl/include", + "//third_party/json/include", + "include/componentloader", + "include/versionmanager", + "include/componentmanager", + "include/task", + "include/utils", + "include/localhardwaremanager", + "include/resourcemanager", + "include/hidumphelper", + "${utils_path}/include/eventbus", ] sources = [ @@ -36,15 +45,40 @@ ohos_shared_library("distributedhardwarefwksvr") { "src/distributed_hardware_manager_factory.cpp", "src/distributed_hardware_service.cpp", "src/distributed_hardware_stub.cpp", + "src/componentloader/component_loader.cpp", + "src/componentmanager/component_disable.cpp", + "src/componentmanager/component_enable.cpp", + "src/componentmanager/component_manager.cpp", + "src/distributed_hardware_manager.cpp", + "src/distributed_hardware_proxy.cpp", + "src/hidumphelper/enabled_comps_dump.cpp", + "src/hidumphelper/hidump_helper.cpp", + "src/localhardwaremanager/local_hardware_manager.cpp", + "src/localhardwaremanager/plugin_listener_impl.cpp", + "src/resourcemanager/capability_info.cpp", + "src/resourcemanager/capability_info_manager.cpp", + "src/resourcemanager/capability_utils.cpp", + "src/resourcemanager/db_adapter.cpp", + "src/task/disable_task.cpp", + "src/task/enable_task.cpp", + "src/task/monitor_task_timer.cpp", + "src/task/offline_task.cpp", + "src/task/online_task.cpp", + "src/task/task.cpp", + "src/task/task_board.cpp", + "src/task/task_executor.cpp", + "src/task/task_factory.cpp", + "src/utils/dh_context.cpp", + "src/versionmanager/version_manager.cpp", ] deps = [ - "${services_path}/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", "${utils_path}:distributedhardwareutils", "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager:ability_manager", "//foundation/ability/ability_runtime/services/abilitymgr:abilityms", "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp:devicemanagersdk", "//utils/native/base:utils", + "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", ] defines = [ @@ -64,6 +98,7 @@ ohos_shared_library("distributedhardwarefwksvr") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "distributeddatamgr:distributeddata_inner", ] subsystem_name = "distributedhardware" diff --git a/services/distributedhardwarefwkserviceimpl/include/componentloader/component_loader.h b/services/distributedhardwarefwkservice/include/componentloader/component_loader.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/componentloader/component_loader.h rename to services/distributedhardwarefwkservice/include/componentloader/component_loader.h diff --git a/services/distributedhardwarefwkserviceimpl/include/componentmanager/component_disable.h b/services/distributedhardwarefwkservice/include/componentmanager/component_disable.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/componentmanager/component_disable.h rename to services/distributedhardwarefwkservice/include/componentmanager/component_disable.h diff --git a/services/distributedhardwarefwkserviceimpl/include/componentmanager/component_enable.h b/services/distributedhardwarefwkservice/include/componentmanager/component_enable.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/componentmanager/component_enable.h rename to services/distributedhardwarefwkservice/include/componentmanager/component_enable.h diff --git a/services/distributedhardwarefwkserviceimpl/include/componentmanager/component_manager.h b/services/distributedhardwarefwkservice/include/componentmanager/component_manager.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/componentmanager/component_manager.h rename to services/distributedhardwarefwkservice/include/componentmanager/component_manager.h diff --git a/services/distributedhardwarefwkserviceimpl/include/distributed_hardware_manager.h b/services/distributedhardwarefwkservice/include/distributed_hardware_manager.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/distributed_hardware_manager.h rename to services/distributedhardwarefwkservice/include/distributed_hardware_manager.h diff --git a/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h b/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h index 1082b962..0e9f2303 100644 --- a/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h +++ b/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h @@ -40,14 +40,10 @@ public: private: bool Init(); void UnInit(); - int32_t LoadLibrary(); - void CloseLibrary(); void CheckExitSAOrNot(); private: - void *handler_ { nullptr }; - IDistributedHardwareManager *distributedHardwareMgrPtr_ { nullptr }; - std::mutex mutex_; + std::atomic isInit = false; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/distributedhardwarefwkserviceimpl/include/distributed_hardware_proxy.h b/services/distributedhardwarefwkservice/include/distributed_hardware_proxy.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/distributed_hardware_proxy.h rename to services/distributedhardwarefwkservice/include/distributed_hardware_proxy.h diff --git a/services/distributedhardwarefwkserviceimpl/include/hidumphelper/enabled_comps_dump.h b/services/distributedhardwarefwkservice/include/hidumphelper/enabled_comps_dump.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/hidumphelper/enabled_comps_dump.h rename to services/distributedhardwarefwkservice/include/hidumphelper/enabled_comps_dump.h diff --git a/services/distributedhardwarefwkserviceimpl/include/hidumphelper/hidump_helper.h b/services/distributedhardwarefwkservice/include/hidumphelper/hidump_helper.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/hidumphelper/hidump_helper.h rename to services/distributedhardwarefwkservice/include/hidumphelper/hidump_helper.h diff --git a/services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/local_hardware_manager.h b/services/distributedhardwarefwkservice/include/localhardwaremanager/local_hardware_manager.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/local_hardware_manager.h rename to services/distributedhardwarefwkservice/include/localhardwaremanager/local_hardware_manager.h diff --git a/services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/plugin_listener_impl.h b/services/distributedhardwarefwkservice/include/localhardwaremanager/plugin_listener_impl.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/plugin_listener_impl.h rename to services/distributedhardwarefwkservice/include/localhardwaremanager/plugin_listener_impl.h diff --git a/services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_info.h b/services/distributedhardwarefwkservice/include/resourcemanager/capability_info.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_info.h rename to services/distributedhardwarefwkservice/include/resourcemanager/capability_info.h diff --git a/services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_info_event.h b/services/distributedhardwarefwkservice/include/resourcemanager/capability_info_event.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_info_event.h rename to services/distributedhardwarefwkservice/include/resourcemanager/capability_info_event.h diff --git a/services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_info_manager.h b/services/distributedhardwarefwkservice/include/resourcemanager/capability_info_manager.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_info_manager.h rename to services/distributedhardwarefwkservice/include/resourcemanager/capability_info_manager.h diff --git a/services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_utils.h b/services/distributedhardwarefwkservice/include/resourcemanager/capability_utils.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/resourcemanager/capability_utils.h rename to services/distributedhardwarefwkservice/include/resourcemanager/capability_utils.h diff --git a/services/distributedhardwarefwkserviceimpl/include/resourcemanager/db_adapter.h b/services/distributedhardwarefwkservice/include/resourcemanager/db_adapter.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/resourcemanager/db_adapter.h rename to services/distributedhardwarefwkservice/include/resourcemanager/db_adapter.h diff --git a/services/distributedhardwarefwkserviceimpl/include/task/disable_task.h b/services/distributedhardwarefwkservice/include/task/disable_task.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/task/disable_task.h rename to services/distributedhardwarefwkservice/include/task/disable_task.h diff --git a/services/distributedhardwarefwkserviceimpl/include/task/enable_task.h b/services/distributedhardwarefwkservice/include/task/enable_task.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/task/enable_task.h rename to services/distributedhardwarefwkservice/include/task/enable_task.h diff --git a/services/distributedhardwarefwkserviceimpl/include/task/monitor_task_timer.h b/services/distributedhardwarefwkservice/include/task/monitor_task_timer.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/task/monitor_task_timer.h rename to services/distributedhardwarefwkservice/include/task/monitor_task_timer.h diff --git a/services/distributedhardwarefwkserviceimpl/include/task/offline_task.h b/services/distributedhardwarefwkservice/include/task/offline_task.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/task/offline_task.h rename to services/distributedhardwarefwkservice/include/task/offline_task.h diff --git a/services/distributedhardwarefwkserviceimpl/include/task/online_task.h b/services/distributedhardwarefwkservice/include/task/online_task.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/task/online_task.h rename to services/distributedhardwarefwkservice/include/task/online_task.h diff --git a/services/distributedhardwarefwkserviceimpl/include/task/task.h b/services/distributedhardwarefwkservice/include/task/task.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/task/task.h rename to services/distributedhardwarefwkservice/include/task/task.h diff --git a/services/distributedhardwarefwkserviceimpl/include/task/task_board.h b/services/distributedhardwarefwkservice/include/task/task_board.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/task/task_board.h rename to services/distributedhardwarefwkservice/include/task/task_board.h diff --git a/services/distributedhardwarefwkserviceimpl/include/task/task_executor.h b/services/distributedhardwarefwkservice/include/task/task_executor.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/task/task_executor.h rename to services/distributedhardwarefwkservice/include/task/task_executor.h diff --git a/services/distributedhardwarefwkserviceimpl/include/task/task_factory.h b/services/distributedhardwarefwkservice/include/task/task_factory.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/task/task_factory.h rename to services/distributedhardwarefwkservice/include/task/task_factory.h diff --git a/services/distributedhardwarefwkserviceimpl/include/utils/dh_context.h b/services/distributedhardwarefwkservice/include/utils/dh_context.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/utils/dh_context.h rename to services/distributedhardwarefwkservice/include/utils/dh_context.h diff --git a/services/distributedhardwarefwkserviceimpl/include/utils/impl_utils.h b/services/distributedhardwarefwkservice/include/utils/impl_utils.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/utils/impl_utils.h rename to services/distributedhardwarefwkservice/include/utils/impl_utils.h diff --git a/services/distributedhardwarefwkserviceimpl/include/versionmanager/version_manager.h b/services/distributedhardwarefwkservice/include/versionmanager/version_manager.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/include/versionmanager/version_manager.h rename to services/distributedhardwarefwkservice/include/versionmanager/version_manager.h diff --git a/services/distributedhardwarefwkserviceimpl/src/componentloader/component_loader.cpp b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/componentloader/component_loader.cpp rename to services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_disable.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_disable.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/componentmanager/component_disable.cpp rename to services/distributedhardwarefwkservice/src/componentmanager/component_disable.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_enable.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_enable.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/componentmanager/component_enable.cpp rename to services/distributedhardwarefwkservice/src/componentmanager/component_enable.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_manager.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/componentmanager/component_manager.cpp rename to services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/distributed_hardware_manager.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/distributed_hardware_manager.cpp rename to services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp index c11e29b4..04f6e199 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp @@ -36,33 +36,20 @@ namespace OHOS { namespace DistributedHardware { -const char* LIB_NAME = "libdistributedhardwarefwksvr_impl.z.so"; -const std::string FUNC_GET_INSTANCE = "GetDistributedHardwareManagerInstance"; - #undef DH_LOG_TAG #define DH_LOG_TAG "DistributedHardwareManagerFactory" -using GetMgrFunc = IDistributedHardwareManager *(*)(); - IMPLEMENT_SINGLE_INSTANCE(DistributedHardwareManagerFactory); - bool DistributedHardwareManagerFactory::Init() { DHLOGI("start"); - - auto loadResult = LoadLibrary(); - if (loadResult != DH_FWK_SUCCESS) { - DHLOGE("LoadLibrary failed, errCode = %d", loadResult); - return false; - } - - auto initResult = distributedHardwareMgrPtr_->Initialize(); + auto initResult = DistributedHardwareManager::GetInstance().Initialize(); if (initResult != DH_FWK_SUCCESS) { DHLOGE("Initialize failed, errCode = %d", initResult); return false; } + isInit = true; DHLOGD("success"); - return true; } @@ -74,11 +61,9 @@ void DistributedHardwareManagerFactory::UnInit() "dhfwk sa exit begin."); // release all the resources synchronously - distributedHardwareMgrPtr_->Release(); - - CloseLibrary(); + DistributedHardwareManager::GetInstance().Release(); + isInit = false; DHTraceEnd(); - CheckExitSAOrNot(); } @@ -108,12 +93,7 @@ void DistributedHardwareManagerFactory::CheckExitSAOrNot() bool DistributedHardwareManagerFactory::IsInit() { - std::lock_guard lock(mutex_); - if (distributedHardwareMgrPtr_ == nullptr) { - DHLOGE("distributedHardwareMgr is not Initialize"); - return false; - } - return true; + return isInit.load(); } int32_t DistributedHardwareManagerFactory::SendOnLineEvent(const std::string &networkId, const std::string &uuid, @@ -129,13 +109,12 @@ int32_t DistributedHardwareManagerFactory::SendOnLineEvent(const std::string &ne return ERR_DH_FWK_REMOTE_DEVICE_ID_IS_EMPTY; } - std::lock_guard lock(mutex_); - if (distributedHardwareMgrPtr_ == nullptr && !Init()) { + if (!isInit && !Init()) { DHLOGE("distributedHardwareMgr is null"); return ERR_DH_FWK_HARDWARE_MANAGER_LOAD_IMPL_FAILED; } - auto onlineResult = distributedHardwareMgrPtr_->SendOnLineEvent(networkId, uuid, deviceType); + auto onlineResult = DistributedHardwareManager::GetInstance().SendOnLineEvent(networkId, uuid, deviceType); if (onlineResult != DH_FWK_SUCCESS) { DHLOGE("online failed, errCode = %d", onlineResult); return onlineResult; @@ -151,77 +130,28 @@ int32_t DistributedHardwareManagerFactory::SendOffLineEvent(const std::string &n return ERR_DH_FWK_REMOTE_NETWORK_ID_IS_EMPTY; } - std::lock_guard lock(mutex_); - if (distributedHardwareMgrPtr_ == nullptr && !Init()) { + if (!isInit && !Init()) { DHLOGE("distributedHardwareMgr is null"); return ERR_DH_FWK_HARDWARE_MANAGER_LOAD_IMPL_FAILED; } - auto offlineResult = distributedHardwareMgrPtr_->SendOffLineEvent(networkId, uuid, deviceType); + auto offlineResult = DistributedHardwareManager::GetInstance().SendOffLineEvent(networkId, uuid, deviceType); if (offlineResult != DH_FWK_SUCCESS) { DHLOGE("offline failed, errCode = %d", offlineResult); return offlineResult; } - if (distributedHardwareMgrPtr_->GetOnLineCount() == 0) { + if (DistributedHardwareManager::GetInstance().GetOnLineCount() == 0) { DHLOGI("all devices are offline, start to free the resource"); UnInit(); } return DH_FWK_SUCCESS; } -int32_t DistributedHardwareManagerFactory::LoadLibrary() -{ - DHLOGI("start."); - if (handler_ != nullptr && distributedHardwareMgrPtr_ != nullptr) { - DHLOGE("DistributedHardwareManager handler has loaded."); - return DH_FWK_SUCCESS; - } - - handler_ = dlopen(LIB_NAME, RTLD_NOW | RTLD_NODELETE); - if (handler_ == nullptr) { - DHLOGE("open %s failed, fail reason : %s", LIB_NAME, dlerror()); - return ERR_DH_FWK_HARDWARE_MANAGER_LIB_IMPL_OPEN_FAILED; - } - - auto getManager = reinterpret_cast(dlsym(handler_, FUNC_GET_INSTANCE.c_str())); - if (getManager == nullptr) { - DHLOGE("can not find %s, failed reason : %s", FUNC_GET_INSTANCE.c_str(), dlerror()); - CloseLibrary(); - return ERR_DH_FWK_HARDWARE_MANAGER_LIB_IMPL_GET_INSTANCE_FAILED; - } - - distributedHardwareMgrPtr_ = getManager(); - if (distributedHardwareMgrPtr_ == nullptr) { - DHLOGE("distributedHardwareMgrPtr is null."); - CloseLibrary(); - return ERR_DH_FWK_HARDWARE_MANAGER_LIB_IMPL_IS_NULL; - } - DHLOGI("load %s success.", LIB_NAME); - return DH_FWK_SUCCESS; -} - -void DistributedHardwareManagerFactory::CloseLibrary() -{ - if (handler_ == nullptr) { - DHLOGI("%s is already closed.", LIB_NAME); - return; - } - distributedHardwareMgrPtr_ = nullptr; - dlclose(handler_); - handler_ = nullptr; - DHLOGI("%s is closed.", LIB_NAME); -} - int32_t DistributedHardwareManagerFactory::GetComponentVersion(std::unordered_map &versionMap) { DHLOGI("start"); - std::lock_guard lock(mutex_); - if (distributedHardwareMgrPtr_ == nullptr) { - DHLOGE("distributedHardwareMgr is null"); - return ERR_DH_FWK_HARDWARE_MANAGER_LIB_IMPL_IS_NULL; - } - return distributedHardwareMgrPtr_->GetComponentVersion(versionMap); + return DistributedHardwareManager::GetInstance().GetComponentVersion(versionMap); } int32_t DistributedHardwareManagerFactory::Dump(const std::vector &argsStr, std::string &result) @@ -230,7 +160,7 @@ int32_t DistributedHardwareManagerFactory::Dump(const std::vector & DHLOGE("distributedHardwareMgr is null"); return ERR_DH_FWK_HIDUMP_ERROR; } - return distributedHardwareMgrPtr_->Dump(argsStr, result); + return DistributedHardwareManager::GetInstance().Dump(argsStr, result); } } // namespace DistributedHardware } // namespace OHOS diff --git a/services/distributedhardwarefwkserviceimpl/src/distributed_hardware_proxy.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_proxy.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/distributed_hardware_proxy.cpp rename to services/distributedhardwarefwkservice/src/distributed_hardware_proxy.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/hidumphelper/enabled_comps_dump.cpp b/services/distributedhardwarefwkservice/src/hidumphelper/enabled_comps_dump.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/hidumphelper/enabled_comps_dump.cpp rename to services/distributedhardwarefwkservice/src/hidumphelper/enabled_comps_dump.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/hidumphelper/hidump_helper.cpp b/services/distributedhardwarefwkservice/src/hidumphelper/hidump_helper.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/hidumphelper/hidump_helper.cpp rename to services/distributedhardwarefwkservice/src/hidumphelper/hidump_helper.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/local_hardware_manager.cpp b/services/distributedhardwarefwkservice/src/localhardwaremanager/local_hardware_manager.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/local_hardware_manager.cpp rename to services/distributedhardwarefwkservice/src/localhardwaremanager/local_hardware_manager.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/plugin_listener_impl.cpp b/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/plugin_listener_impl.cpp rename to services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info.cpp rename to services/distributedhardwarefwkservice/src/resourcemanager/capability_info.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info_manager.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info_manager.cpp rename to services/distributedhardwarefwkservice/src/resourcemanager/capability_info_manager.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_utils.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_utils.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_utils.cpp rename to services/distributedhardwarefwkservice/src/resourcemanager/capability_utils.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/db_adapter.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/resourcemanager/db_adapter.cpp rename to services/distributedhardwarefwkservice/src/resourcemanager/db_adapter.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/task/disable_task.cpp b/services/distributedhardwarefwkservice/src/task/disable_task.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/task/disable_task.cpp rename to services/distributedhardwarefwkservice/src/task/disable_task.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/task/enable_task.cpp b/services/distributedhardwarefwkservice/src/task/enable_task.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/task/enable_task.cpp rename to services/distributedhardwarefwkservice/src/task/enable_task.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/task/monitor_task_timer.cpp b/services/distributedhardwarefwkservice/src/task/monitor_task_timer.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/task/monitor_task_timer.cpp rename to services/distributedhardwarefwkservice/src/task/monitor_task_timer.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/task/offline_task.cpp b/services/distributedhardwarefwkservice/src/task/offline_task.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/task/offline_task.cpp rename to services/distributedhardwarefwkservice/src/task/offline_task.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/task/online_task.cpp b/services/distributedhardwarefwkservice/src/task/online_task.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/task/online_task.cpp rename to services/distributedhardwarefwkservice/src/task/online_task.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/task/task.cpp b/services/distributedhardwarefwkservice/src/task/task.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/task/task.cpp rename to services/distributedhardwarefwkservice/src/task/task.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/task/task_board.cpp b/services/distributedhardwarefwkservice/src/task/task_board.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/task/task_board.cpp rename to services/distributedhardwarefwkservice/src/task/task_board.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/task/task_executor.cpp b/services/distributedhardwarefwkservice/src/task/task_executor.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/task/task_executor.cpp rename to services/distributedhardwarefwkservice/src/task/task_executor.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/task/task_factory.cpp b/services/distributedhardwarefwkservice/src/task/task_factory.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/task/task_factory.cpp rename to services/distributedhardwarefwkservice/src/task/task_factory.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/utils/dh_context.cpp b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/utils/dh_context.cpp rename to services/distributedhardwarefwkservice/src/utils/dh_context.cpp diff --git a/services/distributedhardwarefwkserviceimpl/src/versionmanager/version_manager.cpp b/services/distributedhardwarefwkservice/src/versionmanager/version_manager.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/src/versionmanager/version_manager.cpp rename to services/distributedhardwarefwkservice/src/versionmanager/version_manager.cpp diff --git a/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn index 43174dfb..8a29f0b3 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn @@ -14,5 +14,9 @@ group("fuzztest") { testonly = true - deps = [ "accessmanager_fuzzer:fuzztest" ] + deps = [ + "accessmanager_fuzzer:fuzztest", + "componentmanager_fuzzer:fuzztest", + "resourcemanager_fuzzer:fuzztest", + ] } diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn similarity index 83% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn rename to services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn index 9955a866..68d690a7 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn @@ -20,14 +20,14 @@ import( ##############################fuzztest########################################## ohos_fuzztest("ComponentmanagerFuzzTest") { module_out_path = "distributed_hardware_fwk/componentmanager" - fuzz_config_file = "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer" + fuzz_config_file = "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer" include_dirs = [ "${utils_path}/include", "${utils_path}/include/log", - "${services_path}/distributedhardwarefwkserviceimpl/include", - "${services_path}/distributedhardwarefwkserviceimpl/include/componentmanager", - "${services_path}/distributedhardwarefwkserviceimpl/include/utils", + "${services_path}/distributedhardwarefwkservice/include", + "${services_path}/distributedhardwarefwkservice/include/componentmanager", + "${services_path}/distributedhardwarefwkservice/include/utils", "${common_path}/utils/include", "${common_path}/log/include", "//utils/native/base/include", @@ -41,7 +41,7 @@ ohos_fuzztest("ComponentmanagerFuzzTest") { sources = [ "componentmanager_fuzzer.cpp" ] deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", ] diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp rename to services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.h b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.h rename to services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.h diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/corpus/init b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/corpus/init similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/corpus/init rename to services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/corpus/init diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/project.xml b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/project.xml similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/project.xml rename to services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/project.xml diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn similarity index 87% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn rename to services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index bda4171b..d8e72fe5 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -20,15 +20,15 @@ import( ##############################fuzztest########################################## ohos_fuzztest("ResourcemanagerFuzzTest") { module_out_path = "distributed_hardware_fwk/resourcemanager" - fuzz_config_file = "${services_path}/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer" + fuzz_config_file = "${services_path}/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer" include_dirs = [ "${utils_path}/include", "${utils_path}/include/log", "${utils_path}/include/eventbus", - "${services_path}/distributedhardwarefwkserviceimpl/include", - "${services_path}/distributedhardwarefwkserviceimpl/include/resourcemanager", - "${services_path}/distributedhardwarefwkserviceimpl/include/utils", + "${services_path}/distributedhardwarefwkservice/include", + "${services_path}/distributedhardwarefwkservice/include/resourcemanager", + "${services_path}/distributedhardwarefwkservice/include/utils", "${common_path}/utils/include", "${common_path}/log/include", "//utils/native/base/include", @@ -45,7 +45,7 @@ ohos_fuzztest("ResourcemanagerFuzzTest") { sources = [ "resourcemanager_fuzzer.cpp" ] deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//utils/native/base:utils", ] diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/corpus/init b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/corpus/init similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/corpus/init rename to services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/corpus/init diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/project.xml b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/project.xml similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/project.xml rename to services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/project.xml diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp rename to services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.h b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.h rename to services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.h diff --git a/services/distributedhardwarefwkservice/test/unittest/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/BUILD.gn index def0e61e..eec3907d 100644 --- a/services/distributedhardwarefwkservice/test/unittest/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/BUILD.gn @@ -14,5 +14,13 @@ group("test") { testonly = true - deps = [ "common/accessmanager:AccessManagerTest" ] + deps = [ + "common/accessmanager:AccessManagerTest", + "common:distributed_hardware_manager_test", + "common/componentloader:component_loader_test", + "common/componentmanager:component_manager_test", + "common/resourcemanager:resource_manager_test", + "common/task:dh_task_test", + "common/versionmanager:version_manager_test", + ] } diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn similarity index 80% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn rename to services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn index e83d680c..7643bf3a 100644 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn @@ -23,10 +23,10 @@ config("module_private_config") { "include", "${utils_path}/include", "${utils_path}/include/log", - "${services_path}/distributedhardwarefwkserviceimpl/include", - "${services_path}/distributedhardwarefwkserviceimpl/include/versionmanager", - "${services_path}/distributedhardwarefwkserviceimpl/include/componentloader", - "${services_path}/distributedhardwarefwkserviceimpl/include/utils", + "${services_path}/distributedhardwarefwkservice/include", + "${services_path}/distributedhardwarefwkservice/include/versionmanager", + "${services_path}/distributedhardwarefwkservice/include/componentloader", + "${services_path}/distributedhardwarefwkservice/include/utils", "${common_path}/utils/include", "${common_path}/log/include", ] @@ -40,7 +40,7 @@ ohos_unittest("ComponentLoaderTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//third_party/googletest:gtest_main", ] diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/include/component_loader_test.h b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/include/component_loader_test.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/include/component_loader_test.h rename to services/distributedhardwarefwkservice/test/unittest/common/componentloader/include/component_loader_test.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/src/component_loader_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/src/component_loader_test.cpp rename to services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn rename to services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/include/component_manager_test.h b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/include/component_manager_test.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/include/component_manager_test.h rename to services/distributedhardwarefwkservice/test/unittest/common/componentmanager/include/component_manager_test.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/include/mock_idistributed_hardware_sink.h b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/include/mock_idistributed_hardware_sink.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/include/mock_idistributed_hardware_sink.h rename to services/distributedhardwarefwkservice/test/unittest/common/componentmanager/include/mock_idistributed_hardware_sink.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/include/mock_idistributed_hardware_source.h b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/include/mock_idistributed_hardware_source.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/include/mock_idistributed_hardware_source.h rename to services/distributedhardwarefwkservice/test/unittest/common/componentmanager/include/mock_idistributed_hardware_source.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/src/component_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/src/component_manager_test.cpp rename to services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/distributed_hardware_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributed_hardware_manager_test.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/distributed_hardware_manager_test.cpp rename to services/distributedhardwarefwkservice/test/unittest/common/distributed_hardware_manager_test.cpp diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/distributed_hardware_manager_test.h b/services/distributedhardwarefwkservice/test/unittest/common/distributed_hardware_manager_test.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/distributed_hardware_manager_test.h rename to services/distributedhardwarefwkservice/test/unittest/common/distributed_hardware_manager_test.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn rename to services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/include/resource_manager_test.h b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/include/resource_manager_test.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/include/resource_manager_test.h rename to services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/include/resource_manager_test.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/src/resource_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/src/resource_manager_test.cpp rename to services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn rename to services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_disable_task.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_disable_task.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_disable_task.h rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_disable_task.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_enable_task.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_enable_task.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_enable_task.h rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_enable_task.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_offline_task.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_offline_task.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_offline_task.h rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_offline_task.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_online_task.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_online_task.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_online_task.h rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_online_task.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_factory.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_task_factory.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_factory.h rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_task_factory.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_utils.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_task_utils.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_utils.h rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/mock_task_utils.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/task_test.h b/services/distributedhardwarefwkservice/test/unittest/common/task/include/task_test.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/task_test.h rename to services/distributedhardwarefwkservice/test/unittest/common/task/include/task_test.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_disable_task.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_disable_task.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_disable_task.cpp rename to services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_disable_task.cpp diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_enable_task.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_enable_task.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_enable_task.cpp rename to services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_enable_task.cpp diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_offline_task.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_offline_task.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_offline_task.cpp rename to services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_offline_task.cpp diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_online_task.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_online_task.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_online_task.cpp rename to services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_online_task.cpp diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_task_factory.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_task_factory.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_task_factory.cpp rename to services/distributedhardwarefwkservice/test/unittest/common/task/src/mock_task_factory.cpp diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/task_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/task_test.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/task_test.cpp rename to services/distributedhardwarefwkservice/test/unittest/common/task/src/task_test.cpp diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn rename to services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/include/version_manager_test.h b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/include/version_manager_test.h similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/include/version_manager_test.h rename to services/distributedhardwarefwkservice/test/unittest/common/versionmanager/include/version_manager_test.h diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/src/version_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/src/version_manager_test.cpp rename to services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp diff --git a/services/distributedhardwarefwkserviceimpl/BUILD.gn b/services/distributedhardwarefwkserviceimpl/BUILD.gn deleted file mode 100644 index 83328024..00000000 --- a/services/distributedhardwarefwkserviceimpl/BUILD.gn +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright (c) 2021-2022 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. - -import("//build/ohos.gni") -import("//build/ohos_var.gni") -import( - "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") - -ohos_shared_library("distributedhardwarefwksvr_impl") { - include_dirs = [ - "//utils/native/base/include", - "//utils/system/safwk/native/include", - "//third_party/json/include", - "include", - "include/componentloader", - "include/versionmanager", - "include/componentmanager", - "include/task", - "include/utils", - "include/localhardwaremanager", - "include/resourcemanager", - "include/hidumphelper", - "${common_path}/log/include", - "${common_path}/utils/include", - "${utils_path}/include", - "${utils_path}/include/log", - "${utils_path}/include/eventbus", - ] - - sources = [ - "src/componentloader/component_loader.cpp", - "src/componentmanager/component_disable.cpp", - "src/componentmanager/component_enable.cpp", - "src/componentmanager/component_manager.cpp", - "src/distributed_hardware_manager.cpp", - "src/distributed_hardware_proxy.cpp", - "src/hidumphelper/enabled_comps_dump.cpp", - "src/hidumphelper/hidump_helper.cpp", - "src/localhardwaremanager/local_hardware_manager.cpp", - "src/localhardwaremanager/plugin_listener_impl.cpp", - "src/resourcemanager/capability_info.cpp", - "src/resourcemanager/capability_info_manager.cpp", - "src/resourcemanager/capability_utils.cpp", - "src/resourcemanager/db_adapter.cpp", - "src/task/disable_task.cpp", - "src/task/enable_task.cpp", - "src/task/monitor_task_timer.cpp", - "src/task/offline_task.cpp", - "src/task/online_task.cpp", - "src/task/task.cpp", - "src/task/task_board.cpp", - "src/task/task_executor.cpp", - "src/task/task_factory.cpp", - "src/utils/dh_context.cpp", - "src/versionmanager/version_manager.cpp", - ] - - deps = [ - "${utils_path}:distributedhardwareutils", - "//foundation/ability/ability_runtime/interfaces/inner_api/ability_manager:ability_manager", - "//foundation/ability/ability_runtime/services/abilitymgr:abilityms", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//utils/native/base:utils", - ] - - defines = [ - "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dhfwksvr\"", - "LOG_DOMAIN=0xD004100", - ] - - external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - "distributeddatamgr:distributeddata_inner", - "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", - "hitrace_native:hitrace_meter", - "hiviewdfx_hilog_native:libhilog", - "init:libbegetutil", - "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr_standard:samgr_proxy", - ] - - subsystem_name = "distributedhardware" - - part_name = "distributed_hardware_fwk" -} diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/fuzztest/BUILD.gn deleted file mode 100644 index 9def5f89..00000000 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2021 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. - -group("fuzztest") { - testonly = true - - deps = [ - "componentmanager_fuzzer:fuzztest", - "resourcemanager_fuzzer:fuzztest", - ] -} diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/BUILD.gn deleted file mode 100644 index 81f9d266..00000000 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2021 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. - -group("svrimpl_test") { - testonly = true - deps = [ - "common:distributed_hardware_manager_test", - "common/componentloader:component_loader_test", - "common/componentmanager:component_manager_test", - "common/resourcemanager:resource_manager_test", - "common/task:dh_task_test", - "common/versionmanager:version_manager_test", - ] -} diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn deleted file mode 100644 index 035bc692..00000000 --- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright (c) 2021 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. - -import("//build/test.gni") -import( - "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") - -module_out_path = "distributed_hardware_fwk/dh_manager_test" - -config("module_private_config") { - visibility = [ ":*" ] - include_dirs = [ - "include", - "${utils_path}/include", - "${utils_path}/include/log", - "${utils_path}/include/eventbus", - "${common_path}/log/include", - "${common_path}/utils/include", - "${services_path}/distributedhardwarefwkserviceimpl/include", - "${services_path}/distributedhardwarefwkserviceimpl/include/task", - "${services_path}/distributedhardwarefwkserviceimpl/include/utils", - "//utils/native/base/include", - ] -} - -ohos_unittest("DistributedHardwareManagerTest") { - module_out_path = module_out_path - - sources = [ "distributed_hardware_manager_test.cpp" ] - - configs = [ ":module_private_config" ] - - deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", - "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] - - defines = [ - "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DistributedHardwareManagerTest\"", - "LOG_DOMAIN=0xD004100", - ] - - external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - "dsoftbus:softbus_client", - "eventhandler:libeventhandler", - "hiviewdfx_hilog_native:libhilog", - ] -} - -group("distributed_hardware_manager_test") { - testonly = true - deps = [ ":DistributedHardwareManagerTest" ] -} -- Gitee From 491a94df85f18b62319a0e17cb844d295c48ceda Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Mon, 25 Jul 2022 19:39:35 +0800 Subject: [PATCH 2/2] merger Signed-off-by: hwzhangchuang --- .../distributed_hardware_manager_factory.h | 1 - .../distributed_hardware_manager_factory.cpp | 6 +- .../test/unittest/BUILD.gn | 2 +- .../unittest/common/componentmanager/BUILD.gn | 8 +-- .../distributedhardwaremanager/BUILD.gn | 68 +++++++++++++++++++ .../distributed_hardware_manager_test.h | 0 .../distributed_hardware_manager_test.cpp | 0 .../unittest/common/resourcemanager/BUILD.gn | 8 +-- .../test/unittest/common/task/BUILD.gn | 8 +-- .../unittest/common/versionmanager/BUILD.gn | 10 +-- 10 files changed, 87 insertions(+), 24 deletions(-) create mode 100644 services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn rename services/distributedhardwarefwkservice/test/unittest/common/{ => distributedhardwaremanager/include}/distributed_hardware_manager_test.h (100%) rename services/distributedhardwarefwkservice/test/unittest/common/{ => distributedhardwaremanager/src}/distributed_hardware_manager_test.cpp (100%) diff --git a/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h b/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h index 0e9f2303..31a41f55 100644 --- a/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h +++ b/services/distributedhardwarefwkservice/include/distributed_hardware_manager_factory.h @@ -21,7 +21,6 @@ #include #include "device_type.h" -#include "idistributed_hardware_manager.h" #include "single_instance.h" namespace OHOS { diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp index 04f6e199..d8d2b0d0 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp @@ -32,7 +32,7 @@ #include "dh_utils_tool.h" #include "distributed_hardware_errno.h" #include "distributed_hardware_log.h" -#include "idistributed_hardware_manager.h" +#include "distributed_hardware_manager.h" namespace OHOS { namespace DistributedHardware { @@ -156,10 +156,6 @@ int32_t DistributedHardwareManagerFactory::GetComponentVersion(std::unordered_ma int32_t DistributedHardwareManagerFactory::Dump(const std::vector &argsStr, std::string &result) { - if (distributedHardwareMgrPtr_ == nullptr) { - DHLOGE("distributedHardwareMgr is null"); - return ERR_DH_FWK_HIDUMP_ERROR; - } return DistributedHardwareManager::GetInstance().Dump(argsStr, result); } } // namespace DistributedHardware diff --git a/services/distributedhardwarefwkservice/test/unittest/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/BUILD.gn index eec3907d..a41d5794 100644 --- a/services/distributedhardwarefwkservice/test/unittest/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/BUILD.gn @@ -16,7 +16,7 @@ group("test") { deps = [ "common/accessmanager:AccessManagerTest", - "common:distributed_hardware_manager_test", + "common/distributedhardwaremanager:distributed_hardware_manager_test", "common/componentloader:component_loader_test", "common/componentmanager:component_manager_test", "common/resourcemanager:resource_manager_test", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn index f37e19bd..399f6080 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/BUILD.gn @@ -23,9 +23,9 @@ config("module_private_config") { "include", "${utils_path}/include", "${utils_path}/include/log", - "${services_path}/distributedhardwarefwkserviceimpl/include", - "${services_path}/distributedhardwarefwkserviceimpl/include/componentmanager", - "${services_path}/distributedhardwarefwkserviceimpl/include/utils", + "${services_path}/distributedhardwarefwkservice/include", + "${services_path}/distributedhardwarefwkservice/include/componentmanager", + "${services_path}/distributedhardwarefwkservice/include/utils", "${common_path}/utils/include", "${common_path}/log/include", "//utils/native/base/include", @@ -40,7 +40,7 @@ ohos_unittest("ComponentManagerTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn new file mode 100644 index 00000000..851229f0 --- /dev/null +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn @@ -0,0 +1,68 @@ +# Copyright (c) 2021 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. + +import("//build/test.gni") +import( + "//foundation/distributedhardware/distributed_hardware_fwk/distributedhardwarefwk.gni") + +module_out_path = "distributed_hardware_fwk/dh_manager_test" + +config("module_private_config") { + visibility = [ ":*" ] + include_dirs = [ + "include", + "${utils_path}/include", + "${utils_path}/include/log", + "${utils_path}/include/eventbus", + "${common_path}/log/include", + "${common_path}/utils/include", + "${services_path}/distributedhardwarefwkservice/include", + "${services_path}/distributedhardwarefwkservice/include/task", + "${services_path}/distributedhardwarefwkservice/include/utils", + "//utils/native/base/include", + ] +} + +ohos_unittest("DistributedHardwareManagerTest") { + module_out_path = module_out_path + + sources = [ "src/distributed_hardware_manager_test.cpp" ] + + configs = [ ":module_private_config" ] + + deps = [ + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", + "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", + "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"DistributedHardwareManagerTest\"", + "LOG_DOMAIN=0xD004100", + ] + + external_deps = [ + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "hiviewdfx_hilog_native:libhilog", + ] +} + +group("distributed_hardware_manager_test") { + testonly = true + deps = [ ":DistributedHardwareManagerTest" ] +} diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributed_hardware_manager_test.h b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/include/distributed_hardware_manager_test.h similarity index 100% rename from services/distributedhardwarefwkservice/test/unittest/common/distributed_hardware_manager_test.h rename to services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/include/distributed_hardware_manager_test.h diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributed_hardware_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/src/distributed_hardware_manager_test.cpp similarity index 100% rename from services/distributedhardwarefwkservice/test/unittest/common/distributed_hardware_manager_test.cpp rename to services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/src/distributed_hardware_manager_test.cpp diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn index 14d15c23..2bac3db2 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn @@ -24,9 +24,9 @@ config("module_private_config") { "${utils_path}/include", "${utils_path}/include/log", "${utils_path}/include/eventbus", - "${services_path}/distributedhardwarefwkserviceimpl/include", - "${services_path}/distributedhardwarefwkserviceimpl/include/resourcemanager", - "${services_path}/distributedhardwarefwkserviceimpl/include/utils", + "${services_path}/distributedhardwarefwkservice/include", + "${services_path}/distributedhardwarefwkservice/include/resourcemanager", + "${services_path}/distributedhardwarefwkservice/include/utils", "${common_path}/utils/include", "${common_path}/log/include", "//utils/native/base/include", @@ -45,7 +45,7 @@ ohos_unittest("ResourceManagerTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn index bbddc9ad..d77da12d 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn @@ -23,9 +23,9 @@ config("module_private_config") { "include", "${utils_path}/include", "${utils_path}/include/log", - "${services_path}/distributedhardwarefwkserviceimpl/include", - "${services_path}/distributedhardwarefwkserviceimpl/include/task", - "${services_path}/distributedhardwarefwkserviceimpl/include/utils", + "${services_path}/distributedhardwarefwkservice/include", + "${services_path}/distributedhardwarefwkservice/include/task", + "${services_path}/distributedhardwarefwkservice/include/utils", "${common_path}/utils/include", "${common_path}/log/include", "//utils/native/base/include", @@ -48,7 +48,7 @@ ohos_unittest("DHTaskTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//foundation/distributedhardware/distributed_hardware_fwk/utils:distributedhardwareutils", "//third_party/googletest:gtest_main", ] diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn index 60f92bc8..27fffc29 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn @@ -23,10 +23,10 @@ config("module_private_config") { "include", "${utils_path}/include", "${utils_path}/include/log", - "${services_path}/distributedhardwarefwkserviceimpl/include", - "${services_path}/distributedhardwarefwkserviceimpl/include/componentloader", - "${services_path}/distributedhardwarefwkserviceimpl/include/versionmanager", - "${services_path}/distributedhardwarefwkserviceimpl/include/utils", + "${services_path}/distributedhardwarefwkservice/include", + "${services_path}/distributedhardwarefwkservice/include/componentloader", + "${services_path}/distributedhardwarefwkservice/include/versionmanager", + "${services_path}/distributedhardwarefwkservice/include/utils", "${common_path}/utils/include", "${common_path}/log/include", "//utils/native/base/include", @@ -41,7 +41,7 @@ ohos_unittest("VersionManagerTest") { configs = [ ":module_private_config" ] deps = [ - "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", + "//foundation/distributedhardware/distributed_hardware_fwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr", "//third_party/googletest:gtest_main", ] -- Gitee