From 4e5e7ad0b1db77c310f34030f93fe3dc250d0774 Mon Sep 17 00:00:00 2001 From: dongqingran Date: Tue, 14 Nov 2023 18:54:51 +0800 Subject: [PATCH] change to week depend on hitrace Signed-off-by: dongqingran --- frameworks/ans/BUILD.gn | 8 ++++++- ...otification_local_live_view_subscriber.cpp | 2 +- .../ans/src/notification_subscriber.cpp | 2 +- .../core/include/hitrace_meter_adapter.h | 24 +++++++++++++++++++ frameworks/core/src/ans_notification.cpp | 2 +- notification.gni | 7 ++++++ services/ans/BUILD.gn | 6 ++++- .../ans/src/advanced_notification_service.cpp | 2 +- ...ion_local_live_view_subscriber_manager.cpp | 2 +- services/ans/src/notification_preferences.cpp | 2 +- .../src/notification_preferences_database.cpp | 2 +- .../src/notification_subscriber_manager.cpp | 2 +- services/distributed/BUILD.gn | 8 ++++++- .../src/distributed_notification_manager.cpp | 2 +- 14 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 frameworks/core/include/hitrace_meter_adapter.h diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn index 73c3b9447..d734961c1 100644 --- a/frameworks/ans/BUILD.gn +++ b/frameworks/ans/BUILD.gn @@ -109,6 +109,8 @@ ohos_shared_library("ans_innerkits") { public_configs = [ ":ans_innerkits_public_config" ] + defines = [] + external_deps = [ "ability_base:want", "ability_base:zuri", @@ -119,7 +121,6 @@ ohos_shared_library("ans_innerkits") { "eventhandler:libeventhandler", "hicollie:libhicollie", "hilog:libhilog", - "hitrace:hitrace_meter", "i18n:intl_util", "image_framework:image_native", "ipc:ipc_core", @@ -133,6 +134,11 @@ ohos_shared_library("ans_innerkits") { cflags = [ "-DCONFIG_DUAL_FRAMEWORK" ] } + if (ans_hitrace_usage) { + external_deps += [ "hitrace:hitrace_meter" ] + defines += [ "HITRACE_METER_ENABLE" ] + } + subsystem_name = "${subsystem_name}" part_name = "${component_name}" } diff --git a/frameworks/ans/src/notification_local_live_view_subscriber.cpp b/frameworks/ans/src/notification_local_live_view_subscriber.cpp index 545c5f200..2dd138134 100644 --- a/frameworks/ans/src/notification_local_live_view_subscriber.cpp +++ b/frameworks/ans/src/notification_local_live_view_subscriber.cpp @@ -15,7 +15,7 @@ #include "notification_local_live_view_subscriber.h" -#include "hitrace_meter.h" +#include "hitrace_meter_adapter.h" #include "iservice_registry.h" #include "system_ability_definition.h" diff --git a/frameworks/ans/src/notification_subscriber.cpp b/frameworks/ans/src/notification_subscriber.cpp index 8ec317e47..8fc4bd693 100644 --- a/frameworks/ans/src/notification_subscriber.cpp +++ b/frameworks/ans/src/notification_subscriber.cpp @@ -15,7 +15,7 @@ #include "notification_subscriber.h" -#include "hitrace_meter.h" +#include "hitrace_meter_adapter.h" #include "iservice_registry.h" #include "system_ability_definition.h" diff --git a/frameworks/core/include/hitrace_meter_adapter.h b/frameworks/core/include/hitrace_meter_adapter.h new file mode 100644 index 000000000..ae6cd0ccd --- /dev/null +++ b/frameworks/core/include/hitrace_meter_adapter.h @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef BASE_NOTIFICATION_DISTRIBUTED_NOTIFICATION_SERVICE_SERVICES_ANS_INCLUDE_HITRACE_METER_H +#define BASE_NOTIFICATION_DISTRIBUTED_NOTIFICATION_SERVICE_SERVICES_ANS_INCLUDE_HITRACE_METER_H + +#ifdef HITRACE_METER_ENABLE +#include "hitrace_meter.h" +#else +#define HITRACE_METER_NAME(TAG, str) ((void)0) +#endif + +#endif // BASE_NOTIFICATION_DISTRIBUTED_NOTIFICATION_SERVICE_SERVICES_ANS_INCLUDE_HITRACE_METER_H diff --git a/frameworks/core/src/ans_notification.cpp b/frameworks/core/src/ans_notification.cpp index 464345b55..383756662 100644 --- a/frameworks/core/src/ans_notification.cpp +++ b/frameworks/core/src/ans_notification.cpp @@ -17,7 +17,7 @@ #include "ans_const_define.h" #include "ans_inner_errors.h" #include "ans_log_wrapper.h" -#include "hitrace_meter.h" +#include "hitrace_meter_adapter.h" #include "iservice_registry.h" #include "notification_button_option.h" #include "notification_local_live_view_subscriber.h" diff --git a/notification.gni b/notification.gni index 2050243d6..f6991faa6 100644 --- a/notification.gni +++ b/notification.gni @@ -53,6 +53,7 @@ declare_args() { hisysevent_usage = true standby_enable = true player_framework = true + ans_hitrace_usage = true if (defined(global_parts_info) && !defined(global_parts_info.resourceschedule_device_usage_statistics)) { @@ -74,5 +75,11 @@ declare_args() { player_framework = false } + if (defined(global_parts_info) && + !defined(global_parts_info.hiviewdfx_hitrace)) { + ans_hitrace_usage = false + } + print("hisysevent_usage = " + "$hisysevent_usage") + print("ans_hitrace_usage = " + "$ans_hitrace_usage") } diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn index b52fcd3a2..a1a5c4fb5 100644 --- a/services/ans/BUILD.gn +++ b/services/ans/BUILD.gn @@ -101,7 +101,6 @@ ohos_shared_library("libans") { "data_share:datashare_consumer", "device_manager:devicemanagersdk", "ffrt:libffrt", - "hitrace:hitrace_meter", "i18n:intl_util", "image_framework:image_native", "kv_store:distributeddata_inner", @@ -132,6 +131,11 @@ ohos_shared_library("libans") { defines += [ "PLAYER_FRAMEWORK_ENABLE" ] } + if (ans_hitrace_usage) { + external_deps += [ "hitrace:hitrace_meter" ] + defines += [ "HITRACE_METER_ENABLE" ] + } + subsystem_name = "${subsystem_name}" part_name = "${component_name}" } diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp index c1f8f6486..df9244bd3 100644 --- a/services/ans/src/advanced_notification_service.cpp +++ b/services/ans/src/advanced_notification_service.cpp @@ -35,7 +35,7 @@ #include "common_event_manager.h" #include "common_event_support.h" #include "event_report.h" -#include "hitrace_meter.h" +#include "hitrace_meter_adapter.h" #include "ipc_skeleton.h" #include "nlohmann/json.hpp" #include "notification_constant.h" diff --git a/services/ans/src/notification_local_live_view_subscriber_manager.cpp b/services/ans/src/notification_local_live_view_subscriber_manager.cpp index 13e5cb00a..820c20041 100644 --- a/services/ans/src/notification_local_live_view_subscriber_manager.cpp +++ b/services/ans/src/notification_local_live_view_subscriber_manager.cpp @@ -23,7 +23,7 @@ #include "ans_inner_errors.h" #include "ans_log_wrapper.h" #include "ans_watchdog.h" -#include "hitrace_meter.h" +#include "hitrace_meter_adapter.h" #include "ipc_skeleton.h" #include "notification_bundle_option.h" #include "notification_button_option.h" diff --git a/services/ans/src/notification_preferences.cpp b/services/ans/src/notification_preferences.cpp index 60662adc6..e9b3fad21 100644 --- a/services/ans/src/notification_preferences.cpp +++ b/services/ans/src/notification_preferences.cpp @@ -21,7 +21,7 @@ #include "ans_inner_errors.h" #include "ans_log_wrapper.h" #include "bundle_manager_helper.h" -#include "hitrace_meter.h" +#include "hitrace_meter_adapter.h" #include "nlohmann/json.hpp" #include "os_account_manager.h" diff --git a/services/ans/src/notification_preferences_database.cpp b/services/ans/src/notification_preferences_database.cpp index 40dc39b95..fc77905c6 100644 --- a/services/ans/src/notification_preferences_database.cpp +++ b/services/ans/src/notification_preferences_database.cpp @@ -17,7 +17,7 @@ #include "ans_const_define.h" #include "ans_log_wrapper.h" -#include "hitrace_meter.h" +#include "hitrace_meter_adapter.h" #include "os_account_manager.h" #include "uri.h" diff --git a/services/ans/src/notification_subscriber_manager.cpp b/services/ans/src/notification_subscriber_manager.cpp index 389e787b4..01e2078ba 100644 --- a/services/ans/src/notification_subscriber_manager.cpp +++ b/services/ans/src/notification_subscriber_manager.cpp @@ -23,7 +23,7 @@ #include "ans_inner_errors.h" #include "ans_log_wrapper.h" #include "ans_watchdog.h" -#include "hitrace_meter.h" +#include "hitrace_meter_adapter.h" #include "ipc_skeleton.h" #include "os_account_manager.h" #include "remote_death_recipient.h" diff --git a/services/distributed/BUILD.gn b/services/distributed/BUILD.gn index 35a5002c4..07554f3a3 100644 --- a/services/distributed/BUILD.gn +++ b/services/distributed/BUILD.gn @@ -46,6 +46,8 @@ ohos_shared_library("libans_distributed") { include_dirs = [ "include" ] + defines = [] + configs = [ ":ans_distributed_config", "${frameworks_module_ans_path}:ans_innerkits_public_config", @@ -61,10 +63,14 @@ ohos_shared_library("libans_distributed") { "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", - "hitrace:hitrace_meter", "kv_store:distributeddata_inner", ] + if (ans_hitrace_usage) { + external_deps += [ "hitrace:hitrace_meter" ] + defines += [ "HITRACE_METER_ENABLE" ] + } + subsystem_name = "${subsystem_name}" part_name = "${component_name}" } diff --git a/services/distributed/src/distributed_notification_manager.cpp b/services/distributed/src/distributed_notification_manager.cpp index 0bfc91fa8..7e179d565 100644 --- a/services/distributed/src/distributed_notification_manager.cpp +++ b/services/distributed/src/distributed_notification_manager.cpp @@ -20,7 +20,7 @@ #include "ans_inner_errors.h" #include "ans_log_wrapper.h" #include "ans_watchdog.h" -#include "hitrace_meter.h" +#include "hitrace_meter_adapter.h" namespace OHOS { namespace Notification { -- Gitee