From c0909210c6e10c81809ffe9436189af466fa3a7d Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Wed, 21 Aug 2024 14:41:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=BF=E7=A8=8B=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E4=B8=BAffrt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- bundle.json | 3 ++- services/distributedhardwarefwkservice/BUILD.gn | 1 + .../src/componentmanager/component_manager.cpp | 3 ++- .../src/distributed_hardware_manager_factory.cpp | 5 +++-- .../src/task/disable_task.cpp | 4 +++- .../distributedhardwarefwkservice/src/task/enable_task.cpp | 4 +++- .../src/task/offline_task.cpp | 4 +++- .../src/task/task_executor.cpp | 4 +++- .../test/unittest/common/accessmanager/BUILD.gn | 7 +------ utils/src/histreamer_query_tool.cpp | 2 +- 10 files changed, 22 insertions(+), 15 deletions(-) diff --git a/bundle.json b/bundle.json index 555edf47..7633d195 100644 --- a/bundle.json +++ b/bundle.json @@ -57,7 +57,8 @@ "power_manager", "openssl", "ffmpeg", - "zlib" + "zlib", + "ffrt" ] }, "build": { diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index a3d7134e..45aca478 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -137,6 +137,7 @@ ohos_shared_library("distributedhardwarefwksvr") { "device_manager:devicemanagersdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "ffrt:libffrt", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp index e40358f8..a3c25b8f 100644 --- a/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp +++ b/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp @@ -21,6 +21,7 @@ #include #include +#include "ffrt.h" #include "ipc_object_stub.h" #include "iservice_registry.h" #include "system_ability_definition.h" @@ -903,7 +904,7 @@ void ComponentManager::DumpLoadedComps(std::set &compSourceType, std::se void ComponentManager::Recover(DHType dhType) { - std::thread([this, dhType]() { this->DoRecover(dhType); }).detach(); + ffrt::submit([this, dhType]() { this->DoRecover(dhType); }); } void ComponentManager::DoRecover(DHType dhType) diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp index 45f651f1..61ff97db 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp @@ -22,6 +22,7 @@ #include #include +#include "ffrt.h" #include "iservice_registry.h" #include "system_ability_definition.h" @@ -138,9 +139,9 @@ void DistributedHardwareManagerFactory::CheckExitSAOrNot() GetAnonyString(networkId).c_str(), GetAnonyString(uuid).c_str()); uint16_t deviceType = deviceInfo.deviceTypeId; - std::thread([this, networkId, uuid, udid, deviceType]() { + ffrt::submit([this, networkId, uuid, udid, deviceType]() { this->SendOnLineEvent(networkId, uuid, udid, deviceType); - }).detach(); + }); } } diff --git a/services/distributedhardwarefwkservice/src/task/disable_task.cpp b/services/distributedhardwarefwkservice/src/task/disable_task.cpp index 6fbff36e..80d1e135 100644 --- a/services/distributedhardwarefwkservice/src/task/disable_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/disable_task.cpp @@ -17,6 +17,8 @@ #include +#include "ffrt.h" + #include "anonymous_string.h" #include "capability_utils.h" #include "component_manager.h" @@ -49,7 +51,7 @@ DisableTask::~DisableTask() void DisableTask::DoTask() { - std::thread([this]() { this->DoTaskInner(); }).detach(); + ffrt::submit([this]() { this->DoTaskInner(); }); } void DisableTask::DoTaskInner() diff --git a/services/distributedhardwarefwkservice/src/task/enable_task.cpp b/services/distributedhardwarefwkservice/src/task/enable_task.cpp index daf0a9bf..1287e69f 100644 --- a/services/distributedhardwarefwkservice/src/task/enable_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/enable_task.cpp @@ -17,6 +17,8 @@ #include +#include "ffrt.h" + #include "anonymous_string.h" #include "capability_utils.h" #include "component_manager.h" @@ -48,7 +50,7 @@ EnableTask::~EnableTask() void EnableTask::DoTask() { - std::thread([this]() { this->DoTaskInner(); }).detach(); + ffrt::submit([this]() { this->DoTaskInner(); }); } void EnableTask::DoTaskInner() diff --git a/services/distributedhardwarefwkservice/src/task/offline_task.cpp b/services/distributedhardwarefwkservice/src/task/offline_task.cpp index a352acb1..d77b14d1 100644 --- a/services/distributedhardwarefwkservice/src/task/offline_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/offline_task.cpp @@ -18,6 +18,8 @@ #include #include +#include "ffrt.h" + #include "anonymous_string.h" #include "capability_info_manager.h" #include "constants.h" @@ -54,7 +56,7 @@ OffLineTask::~OffLineTask() void OffLineTask::DoTask() { - std::thread([this]() { this->DoTaskInner(); }).detach(); + ffrt::submit([this]() { this->DoTaskInner(); }); } void OffLineTask::DoTaskInner() diff --git a/services/distributedhardwarefwkservice/src/task/task_executor.cpp b/services/distributedhardwarefwkservice/src/task/task_executor.cpp index 262cab78..37b6b898 100644 --- a/services/distributedhardwarefwkservice/src/task/task_executor.cpp +++ b/services/distributedhardwarefwkservice/src/task/task_executor.cpp @@ -18,6 +18,8 @@ #include #include +#include "ffrt.h" + #include "constants.h" #include "dh_context.h" #include "distributed_hardware_errno.h" @@ -32,7 +34,7 @@ IMPLEMENT_SINGLE_INSTANCE(TaskExecutor); TaskExecutor::TaskExecutor() : taskThreadFlag_(true) { DHLOGI("Ctor TaskExecutor"); - std::thread([this]() { this->TriggerTask(); }).detach(); + ffrt::submit([this]() { this->TriggerTask(); }); } TaskExecutor::~TaskExecutor() diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index 4935935f..e7de7bb0 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -34,12 +34,7 @@ config("module_private_config") { ohos_unittest("AccessManagerTest") { module_out_path = module_out_path - sources = [ - "${services_path}/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp", - "${services_path}/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp", - ] - - sources += [ "access_manager_test.cpp" ] + sources = [ "access_manager_test.cpp" ] configs = [ ":module_private_config" ] diff --git a/utils/src/histreamer_query_tool.cpp b/utils/src/histreamer_query_tool.cpp index 86a6ff5d..1815edf6 100644 --- a/utils/src/histreamer_query_tool.cpp +++ b/utils/src/histreamer_query_tool.cpp @@ -16,7 +16,7 @@ #include "histreamer_query_tool.h" #include -#include +#include #include "distributed_hardware_log.h" -- Gitee