From e6cbb00547221445aaaa299d69dc03927a558a9d Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Fri, 13 May 2022 20:49:24 +0800 Subject: [PATCH 1/6] dfx add hitrace for distributed_screen Signed-off-by: qinlong0101 --- common/BUILD.gn | 61 ++++++++++--------- common/include/dscreen_hitrace.h | 60 ++++++++++++++++++ .../innerkits/native_cpp/screen_sink/BUILD.gn | 2 + .../screen_sink/src/dscreen_sink_handler.cpp | 3 + .../native_cpp/screen_source/BUILD.gn | 2 + .../src/dscreen_source_handler.cpp | 3 + .../src/image_sink_processor.cpp | 7 +++ .../screentransport/screensinktrans/BUILD.gn | 2 + .../screensinktrans/src/screen_sink_trans.cpp | 5 ++ .../src/image_source_processor.cpp | 7 +++ .../screensourcetrans/BUILD.gn | 2 + .../src/screen_source_trans.cpp | 7 +++ 12 files changed, 132 insertions(+), 29 deletions(-) create mode 100644 common/include/dscreen_hitrace.h diff --git a/common/BUILD.gn b/common/BUILD.gn index 48c87145..21ecd01f 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -13,34 +13,37 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import( - "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") ohos_shared_library("distributed_screen_utils") { - include_dirs = [ - "//utils/native/base/include", - "include", - ] - - sources = [ - "src/dscreen_log.cpp", - "src/dscreen_util.cpp", - ] - - deps = [ "//utils/native/base:utils" ] - - external_deps = [ - "dsoftbus_standard:softbus_client", - "hiviewdfx_hilog_native:libhilog", - ] - - defines = [ - "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dscreenutil\"", - "LOG_DOMAIN=0xD004100", - ] - - subsystem_name = "distributedhardware" - - part_name = "distributed_screen" -} + include_dirs = [ + "//utils/native/base/include", + "include", + "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", + ] + + sources = [ + "src/dscreen_util.cpp", + "src/dscreen_log.cpp", + ] + + deps = [ + "//utils/native/base:utils", + ] + + external_deps = [ + "dsoftbus_standard:softbus_client", + "hiviewdfx_hilog_native:libhilog", + "hitrace_native:hitrace_meter", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"dscreenutil\"", + "LOG_DOMAIN=0xD004100", + ] + + subsystem_name = "distributedhardware" + + part_name = "distributed_screen" +} \ No newline at end of file diff --git a/common/include/dscreen_hitrace.h b/common/include/dscreen_hitrace.h new file mode 100644 index 00000000..9bff45bc --- /dev/null +++ b/common/include/dscreen_hitrace.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 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. + */ + +#ifndef OHOS_DSCREEN_HITRACE_H +#define OHOS_DSCREEN_HITRACE_H + +#include + +// #include "bytrace.h" +#include "hitrace_meter.h" + +namespace OHOS { +namespace DistributedHardware { +//SourceHandler_samgr +constexpr uint64_t DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START"; +//SinkHandler_samgr +constexpr uint64_t DSCREEN_SINK_LOAD_SYSTEM_ABILITY_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START"; +//SourceTrans_opensession/CloseSession/ReleaseSession +constexpr uint64_t DSCREEN_SOURCE_OPEN_SESSION_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_SOURCE_OPEN_SESSION_START = "DSCREEN_SOURCE_OPEN_SESSION_START"; +constexpr uint64_t DSCREEN_SOURCE_CLOSE_SESSION_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_SOURCE_CLOSE_SESSION_START = "DSCREEN_SOURCE_CLOSE_SESSION_START"; +constexpr uint64_t DSCREEN_SOURCE_RELEASE_SESSION_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_SOURCE_RELEASE_SESSION_START = "DSCREEN_SOURCE_RELEASE_SESSION_START"; +//SinkTrans_CloseSession/ReleaseSession +constexpr uint64_t DSCREEN_SINK_CLOSE_SESSION_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_SINK_CLOSE_SESSION_START = "DSCREEN_SINK_CLOSE_SESSION_START"; +constexpr uint64_t DSCREEN_SINK_RELEASE_SESSION_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_SINK_RELEASE_SESSION_START = "DSCREEN_SINK_RELEASE_SESSION_START"; +//StartEncoder/StopEncoder/ReleaseEncoder +constexpr uint64_t DSCREEN_START_ENCODER_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_START_ENCODER_START = "DSCREEN_START_ENCODER_START"; +constexpr uint64_t DSCREEN_STOP_ENCODER_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_STOP_ENCODER_START = "DSCREEN_STOP_ENCODER_START"; +constexpr uint64_t DSCREEN_RELESSE_ENCODER_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_RELESSE_ENCODER_START = "DSCREEN_RELESSE_ENCODER_START"; +//StartDecoder/StopDecoder/ReleaseDecoder +constexpr uint64_t DSCREEN_START_DECODER_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_START_DECODER_START = "DSCREEN_START_DECODER_START"; +constexpr uint64_t DSCREEN_STOP_DECODER_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_STOP_DECODER_START = "DSCREEN_STOP_DECODER_START"; +constexpr uint64_t DSCREEN_RELEASE_DECODER_LABEL = BYTRACE_TAG_SCREEN; +const std::string DSCREEN_RELEASE_DECODER_START = "DSCREEN_RELEASE_DECODER_START"; +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file diff --git a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn index 4e469f9a..192e8f4b 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn @@ -20,6 +20,7 @@ ohos_shared_library("distributed_screen_sink_sdk") { include_dirs = [ "//utils/system/safwk/native/include", "${fwk_common_path}/utils/include", + "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", ] include_dirs += [ @@ -51,6 +52,7 @@ ohos_shared_library("distributed_screen_sink_sdk") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "hitrace_native:hitrace_meter", ] subsystem_name = "distributedhardware" diff --git a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp index dd0446b0..48095634 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp @@ -21,6 +21,7 @@ #include "dscreen_constants.h" #include "dscreen_errcode.h" +#include "dscreen_hitrace.h" #include "dscreen_log.h" #include "dscreen_sink_load_callback.h" @@ -53,7 +54,9 @@ int32_t DScreenSinkHandler::InitSink(const std::string ¶ms) return ERR_DH_SCREEN_SA_GET_SAMGR_FAIL; } sptr loadCallback = new DScreenSinkLoadCallback(params); + StartTrace(DSCREEN_SINK_LOAD_SYSTEM_ABILITY_LABEL, DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START); int32_t ret = samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, loadCallback); + FinishTrace(DSCREEN_SINK_LOAD_SYSTEM_ABILITY_LABEL); if (ret != ERR_OK) { DHLOGE("Failed to Load systemAbility, systemAbilityId:%d, ret code:%d", DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, ret); diff --git a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn index 8ca358db..9a642134 100644 --- a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn @@ -20,6 +20,7 @@ ohos_shared_library("distributed_screen_source_sdk") { include_dirs = [ "//utils/system/safwk/native/include", "${fwk_common_path}/utils/include", + "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", ] include_dirs += [ @@ -53,6 +54,7 @@ ohos_shared_library("distributed_screen_source_sdk") { "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "hitrace_native:hitrace_meter", ] subsystem_name = "distributedhardware" diff --git a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp index dded9556..e6743cc8 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp @@ -21,6 +21,7 @@ #include "dscreen_constants.h" #include "dscreen_errcode.h" +#include "dscreen_hitrace.h" #include "dscreen_log.h" #include "dscreen_source_load_callback.h" #include "dscreen_util.h" @@ -58,7 +59,9 @@ int32_t DScreenSourceHandler::InitSource(const std::string ¶ms) return ERR_DH_SCREEN_SA_GET_SAMGR_FAIL; } sptr loadCallback = new DScreenSourceLoadCallback(params); + StartTrace(DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_LABEL, DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START); int32_t ret = samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, loadCallback); + FinishTrace(DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_LABEL); if (ret != ERR_OK) { DHLOGE("Failed to Load systemAbility, systemAbilityId:%d, ret code:%d", DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, ret); diff --git a/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp b/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp index 8f9af8fd..232dedaa 100644 --- a/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp +++ b/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp @@ -16,6 +16,7 @@ #include "image_sink_processor.h" #include "dscreen_errcode.h" +#include "dscreen_hitrace.h" #include "dscreen_log.h" namespace OHOS { @@ -51,7 +52,9 @@ int32_t ImageSinkProcessor::ReleaseImageProcessor() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } + StartTrace(DSCREEN_RELEASE_DECODER_LABEL, DSCREEN_RELEASE_DECODER_START); int32_t ret = imageDecoder_->ReleaseDecoder(); + FinishTrace(DSCREEN_RELEASE_DECODER_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: ReleaseDecoder failed.", LOG_TAG); return ret; @@ -68,7 +71,9 @@ int32_t ImageSinkProcessor::StartImageProcessor() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } + StartTrace(DSCREEN_START_DECODER_LABEL, DSCREEN_START_DECODER_START); int32_t ret = imageDecoder_->StartDecoder(); + FinishTrace(DSCREEN_START_DECODER_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: StartDecoder failed ret:%d.", LOG_TAG, ret); return ret; @@ -85,7 +90,9 @@ int32_t ImageSinkProcessor::StopImageProcessor() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } + StartTrace(DSCREEN_STOP_DECODER_LABEL, DSCREEN_STOP_DECODER_START); int32_t ret = imageDecoder_->StopDecoder(); + FinishTrace(DSCREEN_STOP_DECODER_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: StopDecoder failed ret:%d.", LOG_TAG, ret); return ret; diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 4afcdbc6..04d564e2 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -21,6 +21,7 @@ ohos_shared_library("distributed_screen_sinktrans") { "//third_party/json/include", "//foundation/graphic/graphic/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", + "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", ] include_dirs += [ @@ -64,6 +65,7 @@ ohos_shared_library("distributed_screen_sinktrans") { "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "multimedia_media_standard:media_client", + "hitrace_native:hitrace_meter", ] subsystem_name = "distributedhardware" diff --git a/services/screentransport/screensinktrans/src/screen_sink_trans.cpp b/services/screentransport/screensinktrans/src/screen_sink_trans.cpp index 6de90dc2..98038e86 100644 --- a/services/screentransport/screensinktrans/src/screen_sink_trans.cpp +++ b/services/screentransport/screensinktrans/src/screen_sink_trans.cpp @@ -16,6 +16,7 @@ #include "screen_sink_trans.h" #include "dscreen_errcode.h" +#include "dscreen_hitrace.h" #include "dscreen_log.h" #include "image_sink_processor.h" #include "screen_data_channel_impl.h" @@ -56,7 +57,9 @@ int32_t ScreenSinkTrans::Release() } imageProcessor_ = nullptr; + StartTrace(DSCREEN_SINK_RELEASE_SESSION_LABEL, DSCREEN_SINK_RELEASE_SESSION_START); ret = screenChannel_->ReleaseSession(); + FinishTrace(DSCREEN_SINK_RELEASE_SESSION_LABEL); if (ret != DH_SUCCESS) { DHLOGD("%s: Release channel session failed ret: %d.", LOG_TAG, ret); } @@ -99,7 +102,9 @@ int32_t ScreenSinkTrans::Stop() stopStatus = false; } + StartTrace(DSCREEN_SINK_CLOSE_SESSION_LABEL, DSCREEN_SINK_CLOSE_SESSION_START); ret = screenChannel_->CloseSession(); + FinishTrace(DSCREEN_SINK_CLOSE_SESSION_LABEL); if (ret != DH_SUCCESS && ret != ERR_DH_SCREEN_TRANS_SESSION_NOT_OPEN) { DHLOGD("%s: Close Session failed ret: %d.", LOG_TAG, ret); stopStatus = false; diff --git a/services/screentransport/screensourceprocessor/src/image_source_processor.cpp b/services/screentransport/screensourceprocessor/src/image_source_processor.cpp index 68e74783..053e0c9f 100644 --- a/services/screentransport/screensourceprocessor/src/image_source_processor.cpp +++ b/services/screentransport/screensourceprocessor/src/image_source_processor.cpp @@ -16,6 +16,7 @@ #include "image_source_processor.h" #include "dscreen_errcode.h" +#include "dscreen_hitrace.h" #include "dscreen_log.h" namespace OHOS { @@ -49,7 +50,9 @@ int32_t ImageSourceProcessor::ReleaseImageProcessor() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } + StartTrace(DSCREEN_RELESSE_ENCODER_LABEL, DSCREEN_RELESSE_ENCODER_START); int32_t ret = imageEncoder_->ReleaseEncoder(); + FinishTrace(DSCREEN_RELESSE_ENCODER_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: Release screen encoder failed ret: %d.", LOG_TAG, ret); return ret; @@ -66,7 +69,9 @@ int32_t ImageSourceProcessor::StartImageProcessor() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } + StartTrace(DSCREEN_START_ENCODER_LABEL, DSCREEN_START_ENCODER_START); int32_t ret = imageEncoder_->StartEncoder(); + FinishTrace(DSCREEN_START_ENCODER_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: Start screen encoder failed ret: %d.", LOG_TAG, ret); return ret; @@ -83,7 +88,9 @@ int32_t ImageSourceProcessor::StopImageProcessor() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } + StartTrace(DSCREEN_STOP_ENCODER_LABEL, DSCREEN_STOP_ENCODER_START); int32_t ret = imageEncoder_->StopEncoder(); + FinishTrace(DSCREEN_STOP_ENCODER_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: Stop screen encoder failed ret: %d.", LOG_TAG, ret); return ret; diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index b5860b99..09469d82 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -21,6 +21,7 @@ ohos_shared_library("distributed_screen_sourcetrans") { "//third_party/json/include", "//foundation/graphic/graphic/interfaces/innerkits/surface", "${fwk_common_path}/utils/include", + "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", ] include_dirs += [ @@ -63,6 +64,7 @@ ohos_shared_library("distributed_screen_sourcetrans") { "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "multimedia_media_standard:media_client", + "hitrace_native:hitrace_meter", ] subsystem_name = "distributedhardware" diff --git a/services/screentransport/screensourcetrans/src/screen_source_trans.cpp b/services/screentransport/screensourcetrans/src/screen_source_trans.cpp index 0d0133e9..15d20826 100644 --- a/services/screentransport/screensourcetrans/src/screen_source_trans.cpp +++ b/services/screentransport/screensourcetrans/src/screen_source_trans.cpp @@ -18,6 +18,7 @@ #include #include "dscreen_errcode.h" +#include "dscreen_hitrace.h" #include "dscreen_log.h" #include "image_source_processor.h" #include "screen_data_channel_impl.h" @@ -58,7 +59,9 @@ int32_t ScreenSourceTrans::Release() } imageProcessor_ = nullptr; + StartTrace(DSCREEN_SOURCE_RELEASE_SESSION_LABEL, DSCREEN_SOURCE_RELEASE_SESSION_START); ret = screenChannel_->ReleaseSession(); + FinishTrace(DSCREEN_SOURCE_RELEASE_SESSION_LABEL); if (ret != DH_SUCCESS) { DHLOGD("%s: Release channel session failed ret: %d.", LOG_TAG, ret); } @@ -81,7 +84,9 @@ int32_t ScreenSourceTrans::Start() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } + StartTrace(DSCREEN_SOURCE_OPEN_SESSION_LABEL, DSCREEN_SOURCE_OPEN_SESSION_START); int32_t ret = screenChannel_->OpenSession(); + FinishTrace(DSCREEN_SOURCE_OPEN_SESSION_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: Open channel session failed ret: %d.", LOG_TAG, ret); return ret; @@ -115,7 +120,9 @@ int32_t ScreenSourceTrans::Stop() stopStatus = false; } + StartTrace(DSCREEN_SOURCE_CLOSE_SESSION_LABEL, DSCREEN_SOURCE_CLOSE_SESSION_START); ret = screenChannel_->CloseSession(); + FinishTrace(DSCREEN_SOURCE_CLOSE_SESSION_LABEL); if (ret != DH_SUCCESS) { DHLOGD("%s: Close Session failed ret: %d.", LOG_TAG, ret); stopStatus = false; -- Gitee From ca6cb1be74d4a632544103f4119d704c451c3990 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Fri, 13 May 2022 20:52:00 +0800 Subject: [PATCH 2/6] dfx add hitrace for distributed_screen Signed-off-by: qinlong0101 --- common/BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/BUILD.gn b/common/BUILD.gn index 21ecd01f..206ca344 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -13,7 +13,8 @@ import("//build/ohos.gni") import("//build/ohos_var.gni") -import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import( + "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") ohos_shared_library("distributed_screen_utils") { include_dirs = [ -- Gitee From bbb0cafb5143febdd036fc1a967cfa710cdf5283 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Mon, 16 May 2022 10:23:18 +0800 Subject: [PATCH 3/6] dfx add hitrace for distributed_screen Signed-off-by: qinlong0101 --- common/BUILD.gn | 60 +++++++++---------- common/include/dscreen_hitrace.h | 32 ++++------ .../innerkits/native_cpp/screen_sink/BUILD.gn | 2 +- .../native_cpp/screen_source/BUILD.gn | 2 +- .../screentransport/screensinktrans/BUILD.gn | 2 +- .../screensourcetrans/BUILD.gn | 2 +- 6 files changed, 46 insertions(+), 54 deletions(-) diff --git a/common/BUILD.gn b/common/BUILD.gn index 206ca344..9843f64e 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -17,34 +17,32 @@ import( "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") ohos_shared_library("distributed_screen_utils") { - include_dirs = [ - "//utils/native/base/include", - "include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", - ] - - sources = [ - "src/dscreen_util.cpp", - "src/dscreen_log.cpp", - ] - - deps = [ - "//utils/native/base:utils", - ] - - external_deps = [ - "dsoftbus_standard:softbus_client", - "hiviewdfx_hilog_native:libhilog", - "hitrace_native:hitrace_meter", - ] - - defines = [ - "HI_LOG_ENABLE", - "DH_LOG_TAG=\"dscreenutil\"", - "LOG_DOMAIN=0xD004100", - ] - - subsystem_name = "distributedhardware" - - part_name = "distributed_screen" -} \ No newline at end of file + include_dirs = [ + "//utils/native/base/include", + "include", + "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter", + ] + + sources = [ + "src/dscreen_log.cpp", + "src/dscreen_util.cpp", + ] + + deps = [ "//utils/native/base:utils" ] + + external_deps = [ + "dsoftbus_standard:softbus_client", + "hitrace_native:hitrace_meter", + "hiviewdfx_hilog_native:libhilog", + ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"dscreenutil\"", + "LOG_DOMAIN=0xD004100", + ] + + subsystem_name = "distributedhardware" + + part_name = "distributed_screen" +} diff --git a/common/include/dscreen_hitrace.h b/common/include/dscreen_hitrace.h index 9bff45bc..58091177 100644 --- a/common/include/dscreen_hitrace.h +++ b/common/include/dscreen_hitrace.h @@ -18,42 +18,36 @@ #include -// #include "bytrace.h" #include "hitrace_meter.h" namespace OHOS { namespace DistributedHardware { -//SourceHandler_samgr constexpr uint64_t DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_LABEL = BYTRACE_TAG_SCREEN; -const std::string DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START"; -//SinkHandler_samgr constexpr uint64_t DSCREEN_SINK_LOAD_SYSTEM_ABILITY_LABEL = BYTRACE_TAG_SCREEN; -const std::string DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START"; -//SourceTrans_opensession/CloseSession/ReleaseSession constexpr uint64_t DSCREEN_SOURCE_OPEN_SESSION_LABEL = BYTRACE_TAG_SCREEN; -const std::string DSCREEN_SOURCE_OPEN_SESSION_START = "DSCREEN_SOURCE_OPEN_SESSION_START"; constexpr uint64_t DSCREEN_SOURCE_CLOSE_SESSION_LABEL = BYTRACE_TAG_SCREEN; -const std::string DSCREEN_SOURCE_CLOSE_SESSION_START = "DSCREEN_SOURCE_CLOSE_SESSION_START"; constexpr uint64_t DSCREEN_SOURCE_RELEASE_SESSION_LABEL = BYTRACE_TAG_SCREEN; -const std::string DSCREEN_SOURCE_RELEASE_SESSION_START = "DSCREEN_SOURCE_RELEASE_SESSION_START"; -//SinkTrans_CloseSession/ReleaseSession constexpr uint64_t DSCREEN_SINK_CLOSE_SESSION_LABEL = BYTRACE_TAG_SCREEN; -const std::string DSCREEN_SINK_CLOSE_SESSION_START = "DSCREEN_SINK_CLOSE_SESSION_START"; constexpr uint64_t DSCREEN_SINK_RELEASE_SESSION_LABEL = BYTRACE_TAG_SCREEN; -const std::string DSCREEN_SINK_RELEASE_SESSION_START = "DSCREEN_SINK_RELEASE_SESSION_START"; -//StartEncoder/StopEncoder/ReleaseEncoder constexpr uint64_t DSCREEN_START_ENCODER_LABEL = BYTRACE_TAG_SCREEN; -const std::string DSCREEN_START_ENCODER_START = "DSCREEN_START_ENCODER_START"; constexpr uint64_t DSCREEN_STOP_ENCODER_LABEL = BYTRACE_TAG_SCREEN; -const std::string DSCREEN_STOP_ENCODER_START = "DSCREEN_STOP_ENCODER_START"; constexpr uint64_t DSCREEN_RELESSE_ENCODER_LABEL = BYTRACE_TAG_SCREEN; -const std::string DSCREEN_RELESSE_ENCODER_START = "DSCREEN_RELESSE_ENCODER_START"; -//StartDecoder/StopDecoder/ReleaseDecoder constexpr uint64_t DSCREEN_START_DECODER_LABEL = BYTRACE_TAG_SCREEN; -const std::string DSCREEN_START_DECODER_START = "DSCREEN_START_DECODER_START"; constexpr uint64_t DSCREEN_STOP_DECODER_LABEL = BYTRACE_TAG_SCREEN; -const std::string DSCREEN_STOP_DECODER_START = "DSCREEN_STOP_DECODER_START"; constexpr uint64_t DSCREEN_RELEASE_DECODER_LABEL = BYTRACE_TAG_SCREEN; + +const std::string DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START"; +const std::string DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START"; +const std::string DSCREEN_SOURCE_OPEN_SESSION_START = "DSCREEN_SOURCE_OPEN_SESSION_START"; +const std::string DSCREEN_SOURCE_CLOSE_SESSION_START = "DSCREEN_SOURCE_CLOSE_SESSION_START"; +const std::string DSCREEN_SOURCE_RELEASE_SESSION_START = "DSCREEN_SOURCE_RELEASE_SESSION_START"; +const std::string DSCREEN_SINK_CLOSE_SESSION_START = "DSCREEN_SINK_CLOSE_SESSION_START"; +const std::string DSCREEN_SINK_RELEASE_SESSION_START = "DSCREEN_SINK_RELEASE_SESSION_START"; +const std::string DSCREEN_START_ENCODER_START = "DSCREEN_START_ENCODER_START"; +const std::string DSCREEN_STOP_ENCODER_START = "DSCREEN_STOP_ENCODER_START"; +const std::string DSCREEN_RELESSE_ENCODER_START = "DSCREEN_RELESSE_ENCODER_START"; +const std::string DSCREEN_START_DECODER_START = "DSCREEN_START_DECODER_START"; +const std::string DSCREEN_STOP_DECODER_START = "DSCREEN_STOP_DECODER_START"; const std::string DSCREEN_RELEASE_DECODER_START = "DSCREEN_RELEASE_DECODER_START"; } // namespace DistributedHardware } // namespace OHOS diff --git a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn index 192e8f4b..4d1380c1 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_sink/BUILD.gn @@ -48,11 +48,11 @@ ohos_shared_library("distributed_screen_sink_sdk") { external_deps = [ "hisysevent_native:libhisysevent", + "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "hitrace_native:hitrace_meter", ] subsystem_name = "distributedhardware" diff --git a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn index 9a642134..5b4a08e5 100644 --- a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn @@ -50,11 +50,11 @@ ohos_shared_library("distributed_screen_source_sdk") { external_deps = [ "hisysevent_native:libhisysevent", + "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", - "hitrace_native:hitrace_meter", ] subsystem_name = "distributedhardware" diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 04d564e2..c5d4c467 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -63,9 +63,9 @@ ohos_shared_library("distributed_screen_sinktrans") { external_deps = [ "dsoftbus_standard:softbus_client", "hisysevent_native:libhisysevent", + "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "multimedia_media_standard:media_client", - "hitrace_native:hitrace_meter", ] subsystem_name = "distributedhardware" diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index 09469d82..e4a78d39 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -62,9 +62,9 @@ ohos_shared_library("distributed_screen_sourcetrans") { external_deps = [ "dsoftbus_standard:softbus_client", "hisysevent_native:libhisysevent", + "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "multimedia_media_standard:media_client", - "hitrace_native:hitrace_meter", ] subsystem_name = "distributedhardware" -- Gitee From e3e7969ff06dfd50d06a9fc819eeed233a3420f2 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Mon, 16 May 2022 12:55:31 +0800 Subject: [PATCH 4/6] dfx add hitrace for distributed_screen Signed-off-by: qinlong0101 --- common/include/dscreen_hitrace.h | 14 +------------- .../screen_sink/src/dscreen_sink_handler.cpp | 4 ++-- .../screen_source/src/dscreen_source_handler.cpp | 4 ++-- .../src/image_sink_processor.cpp | 12 ++++++------ .../screensinktrans/src/screen_sink_trans.cpp | 8 ++++---- .../src/image_source_processor.cpp | 12 ++++++------ .../screensourcetrans/src/screen_source_trans.cpp | 13 +++++++------ 7 files changed, 28 insertions(+), 39 deletions(-) diff --git a/common/include/dscreen_hitrace.h b/common/include/dscreen_hitrace.h index 58091177..171c6d09 100644 --- a/common/include/dscreen_hitrace.h +++ b/common/include/dscreen_hitrace.h @@ -22,19 +22,7 @@ namespace OHOS { namespace DistributedHardware { -constexpr uint64_t DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_LABEL = BYTRACE_TAG_SCREEN; -constexpr uint64_t DSCREEN_SINK_LOAD_SYSTEM_ABILITY_LABEL = BYTRACE_TAG_SCREEN; -constexpr uint64_t DSCREEN_SOURCE_OPEN_SESSION_LABEL = BYTRACE_TAG_SCREEN; -constexpr uint64_t DSCREEN_SOURCE_CLOSE_SESSION_LABEL = BYTRACE_TAG_SCREEN; -constexpr uint64_t DSCREEN_SOURCE_RELEASE_SESSION_LABEL = BYTRACE_TAG_SCREEN; -constexpr uint64_t DSCREEN_SINK_CLOSE_SESSION_LABEL = BYTRACE_TAG_SCREEN; -constexpr uint64_t DSCREEN_SINK_RELEASE_SESSION_LABEL = BYTRACE_TAG_SCREEN; -constexpr uint64_t DSCREEN_START_ENCODER_LABEL = BYTRACE_TAG_SCREEN; -constexpr uint64_t DSCREEN_STOP_ENCODER_LABEL = BYTRACE_TAG_SCREEN; -constexpr uint64_t DSCREEN_RELESSE_ENCODER_LABEL = BYTRACE_TAG_SCREEN; -constexpr uint64_t DSCREEN_START_DECODER_LABEL = BYTRACE_TAG_SCREEN; -constexpr uint64_t DSCREEN_STOP_DECODER_LABEL = BYTRACE_TAG_SCREEN; -constexpr uint64_t DSCREEN_RELEASE_DECODER_LABEL = BYTRACE_TAG_SCREEN; +constexpr uint64_t DSCREEN_HITRACE_LABEL = HITRACE_TAG_SCREEN; const std::string DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START"; const std::string DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START"; diff --git a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp index 48095634..66472e7b 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp @@ -54,9 +54,8 @@ int32_t DScreenSinkHandler::InitSink(const std::string ¶ms) return ERR_DH_SCREEN_SA_GET_SAMGR_FAIL; } sptr loadCallback = new DScreenSinkLoadCallback(params); - StartTrace(DSCREEN_SINK_LOAD_SYSTEM_ABILITY_LABEL, DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START); int32_t ret = samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, loadCallback); - FinishTrace(DSCREEN_SINK_LOAD_SYSTEM_ABILITY_LABEL); if (ret != ERR_OK) { DHLOGE("Failed to Load systemAbility, systemAbilityId:%d, ret code:%d", DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, ret); @@ -91,6 +90,7 @@ int32_t DScreenSinkHandler::InitSink(const std::string ¶ms) return ERR_DH_SCREEN_SA_LOAD_TIMEOUT; } + FinishTrace(DSCREEN_HITRACE_LABEL); return DH_SUCCESS; } diff --git a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp index e6743cc8..a4c528d9 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp @@ -59,9 +59,8 @@ int32_t DScreenSourceHandler::InitSource(const std::string ¶ms) return ERR_DH_SCREEN_SA_GET_SAMGR_FAIL; } sptr loadCallback = new DScreenSourceLoadCallback(params); - StartTrace(DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_LABEL, DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START); int32_t ret = samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, loadCallback); - FinishTrace(DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_LABEL); if (ret != ERR_OK) { DHLOGE("Failed to Load systemAbility, systemAbilityId:%d, ret code:%d", DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, ret); @@ -96,6 +95,7 @@ int32_t DScreenSourceHandler::InitSource(const std::string ¶ms) return ERR_DH_SCREEN_SA_LOAD_TIMEOUT; } + FinishTrace(DSCREEN_HITRACE_LABEL); return DH_SUCCESS; } diff --git a/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp b/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp index 232dedaa..4e8ec8a4 100644 --- a/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp +++ b/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp @@ -52,9 +52,9 @@ int32_t ImageSinkProcessor::ReleaseImageProcessor() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } - StartTrace(DSCREEN_RELEASE_DECODER_LABEL, DSCREEN_RELEASE_DECODER_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_RELEASE_DECODER_START); int32_t ret = imageDecoder_->ReleaseDecoder(); - FinishTrace(DSCREEN_RELEASE_DECODER_LABEL); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: ReleaseDecoder failed.", LOG_TAG); return ret; @@ -71,9 +71,9 @@ int32_t ImageSinkProcessor::StartImageProcessor() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } - StartTrace(DSCREEN_START_DECODER_LABEL, DSCREEN_START_DECODER_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_START_DECODER_START); int32_t ret = imageDecoder_->StartDecoder(); - FinishTrace(DSCREEN_START_DECODER_LABEL); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: StartDecoder failed ret:%d.", LOG_TAG, ret); return ret; @@ -90,9 +90,9 @@ int32_t ImageSinkProcessor::StopImageProcessor() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } - StartTrace(DSCREEN_STOP_DECODER_LABEL, DSCREEN_STOP_DECODER_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_STOP_DECODER_START); int32_t ret = imageDecoder_->StopDecoder(); - FinishTrace(DSCREEN_STOP_DECODER_LABEL); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: StopDecoder failed ret:%d.", LOG_TAG, ret); return ret; diff --git a/services/screentransport/screensinktrans/src/screen_sink_trans.cpp b/services/screentransport/screensinktrans/src/screen_sink_trans.cpp index 98038e86..b5ffe1a6 100644 --- a/services/screentransport/screensinktrans/src/screen_sink_trans.cpp +++ b/services/screentransport/screensinktrans/src/screen_sink_trans.cpp @@ -57,9 +57,9 @@ int32_t ScreenSinkTrans::Release() } imageProcessor_ = nullptr; - StartTrace(DSCREEN_SINK_RELEASE_SESSION_LABEL, DSCREEN_SINK_RELEASE_SESSION_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SINK_RELEASE_SESSION_START); ret = screenChannel_->ReleaseSession(); - FinishTrace(DSCREEN_SINK_RELEASE_SESSION_LABEL); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGD("%s: Release channel session failed ret: %d.", LOG_TAG, ret); } @@ -102,9 +102,9 @@ int32_t ScreenSinkTrans::Stop() stopStatus = false; } - StartTrace(DSCREEN_SINK_CLOSE_SESSION_LABEL, DSCREEN_SINK_CLOSE_SESSION_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SINK_CLOSE_SESSION_START); ret = screenChannel_->CloseSession(); - FinishTrace(DSCREEN_SINK_CLOSE_SESSION_LABEL); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS && ret != ERR_DH_SCREEN_TRANS_SESSION_NOT_OPEN) { DHLOGD("%s: Close Session failed ret: %d.", LOG_TAG, ret); stopStatus = false; diff --git a/services/screentransport/screensourceprocessor/src/image_source_processor.cpp b/services/screentransport/screensourceprocessor/src/image_source_processor.cpp index 053e0c9f..7fe83010 100644 --- a/services/screentransport/screensourceprocessor/src/image_source_processor.cpp +++ b/services/screentransport/screensourceprocessor/src/image_source_processor.cpp @@ -50,9 +50,9 @@ int32_t ImageSourceProcessor::ReleaseImageProcessor() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } - StartTrace(DSCREEN_RELESSE_ENCODER_LABEL, DSCREEN_RELESSE_ENCODER_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_RELESSE_ENCODER_START); int32_t ret = imageEncoder_->ReleaseEncoder(); - FinishTrace(DSCREEN_RELESSE_ENCODER_LABEL); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: Release screen encoder failed ret: %d.", LOG_TAG, ret); return ret; @@ -69,9 +69,9 @@ int32_t ImageSourceProcessor::StartImageProcessor() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } - StartTrace(DSCREEN_START_ENCODER_LABEL, DSCREEN_START_ENCODER_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_START_ENCODER_START); int32_t ret = imageEncoder_->StartEncoder(); - FinishTrace(DSCREEN_START_ENCODER_LABEL); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: Start screen encoder failed ret: %d.", LOG_TAG, ret); return ret; @@ -88,9 +88,9 @@ int32_t ImageSourceProcessor::StopImageProcessor() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } - StartTrace(DSCREEN_STOP_ENCODER_LABEL, DSCREEN_STOP_ENCODER_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_STOP_ENCODER_START); int32_t ret = imageEncoder_->StopEncoder(); - FinishTrace(DSCREEN_STOP_ENCODER_LABEL); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGE("%s: Stop screen encoder failed ret: %d.", LOG_TAG, ret); return ret; diff --git a/services/screentransport/screensourcetrans/src/screen_source_trans.cpp b/services/screentransport/screensourcetrans/src/screen_source_trans.cpp index 15d20826..427faeb8 100644 --- a/services/screentransport/screensourcetrans/src/screen_source_trans.cpp +++ b/services/screentransport/screensourcetrans/src/screen_source_trans.cpp @@ -59,9 +59,9 @@ int32_t ScreenSourceTrans::Release() } imageProcessor_ = nullptr; - StartTrace(DSCREEN_SOURCE_RELEASE_SESSION_LABEL, DSCREEN_SOURCE_RELEASE_SESSION_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_RELEASE_SESSION_START); ret = screenChannel_->ReleaseSession(); - FinishTrace(DSCREEN_SOURCE_RELEASE_SESSION_LABEL); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGD("%s: Release channel session failed ret: %d.", LOG_TAG, ret); } @@ -84,9 +84,9 @@ int32_t ScreenSourceTrans::Start() return ERR_DH_SCREEN_TRANS_NULL_VALUE; } - StartTrace(DSCREEN_SOURCE_OPEN_SESSION_LABEL, DSCREEN_SOURCE_OPEN_SESSION_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_OPEN_SESSION_START); int32_t ret = screenChannel_->OpenSession(); - FinishTrace(DSCREEN_SOURCE_OPEN_SESSION_LABEL); + if (ret != DH_SUCCESS) { DHLOGE("%s: Open channel session failed ret: %d.", LOG_TAG, ret); return ret; @@ -102,6 +102,7 @@ int32_t ScreenSourceTrans::Start() } DHLOGI("%s: Start success.", LOG_TAG); + FinishTrace(DSCREEN_HITRACE_LABEL); return DH_SUCCESS; } @@ -120,9 +121,9 @@ int32_t ScreenSourceTrans::Stop() stopStatus = false; } - StartTrace(DSCREEN_SOURCE_CLOSE_SESSION_LABEL, DSCREEN_SOURCE_CLOSE_SESSION_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_CLOSE_SESSION_START); ret = screenChannel_->CloseSession(); - FinishTrace(DSCREEN_SOURCE_CLOSE_SESSION_LABEL); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGD("%s: Close Session failed ret: %d.", LOG_TAG, ret); stopStatus = false; -- Gitee From b3e7b4399b15d8302941a11e09883fcb88e76d79 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Mon, 16 May 2022 13:03:08 +0800 Subject: [PATCH 5/6] dfx add hitrace for distributed_screen Signed-off-by: qinlong0101 --- .../screensourcetrans/src/screen_source_trans.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/screentransport/screensourcetrans/src/screen_source_trans.cpp b/services/screentransport/screensourcetrans/src/screen_source_trans.cpp index 427faeb8..0bb3996d 100644 --- a/services/screentransport/screensourcetrans/src/screen_source_trans.cpp +++ b/services/screentransport/screensourcetrans/src/screen_source_trans.cpp @@ -86,7 +86,6 @@ int32_t ScreenSourceTrans::Start() StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_OPEN_SESSION_START); int32_t ret = screenChannel_->OpenSession(); - if (ret != DH_SUCCESS) { DHLOGE("%s: Open channel session failed ret: %d.", LOG_TAG, ret); return ret; -- Gitee From ad632f7bdfc93750fe1bac4c0f8aeae33927b694 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Tue, 17 May 2022 14:10:47 +0800 Subject: [PATCH 6/6] dfx add hitrace for distributed_screen Signed-off-by: qinlong0101 --- common/include/dscreen_hitrace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/include/dscreen_hitrace.h b/common/include/dscreen_hitrace.h index 171c6d09..492e76f0 100644 --- a/common/include/dscreen_hitrace.h +++ b/common/include/dscreen_hitrace.h @@ -22,7 +22,7 @@ namespace OHOS { namespace DistributedHardware { -constexpr uint64_t DSCREEN_HITRACE_LABEL = HITRACE_TAG_SCREEN; +constexpr uint64_t DSCREEN_HITRACE_LABEL = HITRACE_TAG_DISTRIBUTED_SCREEN; const std::string DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START"; const std::string DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START = "DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START"; -- Gitee