From 3ec85fe4c36862727c25ec37cfa498a973322633 Mon Sep 17 00:00:00 2001 From: panzhi Date: Mon, 9 Oct 2023 16:33:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A1=A5=E5=85=85trace=E6=89=93=E7=82=B9la?= =?UTF-8?q?bel=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: panzhi --- services/screenservice/sinkservice/BUILD.gn | 1 + .../sinkservice/screenregionmgr/2.0/src/screenregion.cpp | 5 +++++ services/screenservice/sourceservice/BUILD.gn | 1 + .../dscreenmgr/2.0/src/av_sender_engine_adapter.cpp | 7 +++++++ .../sourceservice/dscreenmgr/2.0/src/dscreen.cpp | 4 ++++ 5 files changed, 18 insertions(+) diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index ffb215f5..dfcae38a 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -80,6 +80,7 @@ ohos_shared_library("distributed_screen_sink") { "graphic_2d:libgraphic_utils", "graphic_2d:surface", "hisysevent:libhisysevent", + "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp index 394b39da..b2dfacc7 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp @@ -29,6 +29,8 @@ #include "screen_client.h" #include "screen_client_common.h" #include "2.0/include/screenregionmgr.h" +#include "hitrace_meter.h" +#include "dscreen_hitrace.h" namespace OHOS { namespace DistributedHardware { @@ -82,7 +84,10 @@ int32_t ScreenRegion::Release() DHLOGE("sink trans stop failed."); } + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SINK_CLOSE_SESSION_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SINK_RELEASE_SESSION_START); ret = receiverAdapter_->Release(); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGE("release av receiver adapter failed."); } diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn index c34fa2d6..591c741d 100644 --- a/services/screenservice/sourceservice/BUILD.gn +++ b/services/screenservice/sourceservice/BUILD.gn @@ -87,6 +87,7 @@ ohos_shared_library("distributed_screen_source") { "graphic_2d:libcomposer", "graphic_2d:surface", "hisysevent:libhisysevent", + "hitrace:hitrace_meter", "ipc:ipc_core", "player_framework:media_client", "safwk:system_ability_fwk", diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp index c356863f..2cad5941 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp @@ -19,6 +19,8 @@ #include "dscreen_log.h" #include "dscreen_util.h" #include "dscreen_hidumper.h" +#include "hitrace_meter.h" +#include "dscreen_hitrace.h" namespace OHOS { namespace DistributedHardware { @@ -46,7 +48,10 @@ int32_t AVTransSenderAdapter::Release() { DHLOGI("Release enter"); if (senderEngine_ != nullptr) { + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_CLOSE_SESSION_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_RELEASE_SESSION_START); int32_t ret = senderEngine_->Release(); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_AVT_SUCCESS) { DHLOGE("release av transport sender engine failed"); } @@ -166,7 +171,9 @@ int32_t AVTransSenderAdapter::PushData(const VideoData &video) DscreenHidumper::GetInstance().SetTransReDumpFlagFalse(); } #endif + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_START_ENCODER_START); int32_t ret = senderEngine_->PushData(transBuffer); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_AVT_SUCCESS) { DHLOGE("feed data to av transport sender failed, ret:%" PRId32, ret); return ERR_DH_AV_TRANS_FEED_DATA_FAILED; diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp index b760bb47..a73314ca 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp @@ -20,6 +20,7 @@ #include "2.0/include/av_sender_engine_adapter.h" #include "distributed_hardware_fwk_kit.h" #include "histreamer_query_tool.h" +#include "hitrace_meter.h" #include "dscreen_constants.h" #include "dscreen_errcode.h" @@ -29,6 +30,7 @@ #include "dscreen_log.h" #include "dscreen_hidumper.h" #include "dscreen_util.h" +#include "dscreen_hitrace.h" #include "common/include/screen_manager_adapter.h" namespace OHOS { @@ -355,7 +357,9 @@ int32_t DScreen::StartSenderEngine() DHLOGE("av transport sender adapter is null."); return ERR_DH_AV_TRANS_NULL_VALUE; } + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_OPEN_SESSION_START); int32_t ret = senderAdapter_->CreateControlChannel(devId_); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGE("create av sender control channel failed."); return ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED; -- Gitee From 16a99ab24a59aea55daef92a044f33b10ffa2fff Mon Sep 17 00:00:00 2001 From: panzhi Date: Tue, 10 Oct 2023 19:16:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A1=A5=E5=85=85trace=E6=89=93=E7=82=B9la?= =?UTF-8?q?bel=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: panzhi --- .../screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp | 3 +++ .../sinkservice/screenregionmgr/2.0/src/screenregion.cpp | 3 --- .../dscreenmgr/2.0/src/av_sender_engine_adapter.cpp | 2 ++ .../screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp | 2 -- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp index 97ff7bf5..12d0b52d 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp @@ -61,7 +61,10 @@ int32_t AVTransReceiverAdapter::Release() { DHLOGI("Release enter"); if (receiverEngine_ != nullptr) { + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SINK_CLOSE_SESSION_START); + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SINK_RELEASE_SESSION_START); int32_t ret = receiverEngine_->Release(); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_AVT_SUCCESS) { DHLOGE("Release av transport receiver engine failed"); } diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp index b2dfacc7..f6417fde 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp @@ -84,10 +84,7 @@ int32_t ScreenRegion::Release() DHLOGE("sink trans stop failed."); } - StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SINK_CLOSE_SESSION_START); - StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SINK_RELEASE_SESSION_START); ret = receiverAdapter_->Release(); - FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGE("release av receiver adapter failed."); } diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp index 2cad5941..9176ad13 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp @@ -117,7 +117,9 @@ int32_t AVTransSenderAdapter::CreateControlChannel(const std::string& peerDevId) return ERR_DH_AV_TRANS_NULL_VALUE; } std::vector dstDevIds = {peerDevId}; + StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_OPEN_SESSION_START); int32_t ret = senderEngine_->CreateControlChannel(dstDevIds, ChannelAttribute{TransStrategy::LOW_LATANCY_STRATEGY}); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_AVT_SUCCESS) { DHLOGE("create av transport sender channel failed, ret:%" PRId32, ret); return ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED; diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp index a73314ca..b379c240 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp @@ -357,9 +357,7 @@ int32_t DScreen::StartSenderEngine() DHLOGE("av transport sender adapter is null."); return ERR_DH_AV_TRANS_NULL_VALUE; } - StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_OPEN_SESSION_START); int32_t ret = senderAdapter_->CreateControlChannel(devId_); - FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_SUCCESS) { DHLOGE("create av sender control channel failed."); return ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED; -- Gitee From 9372f8d2939e0f86816eeeaea269d6b0061ef2c5 Mon Sep 17 00:00:00 2001 From: panzhi Date: Tue, 10 Oct 2023 19:19:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A1=A5=E5=85=85trace=E6=89=93=E7=82=B9la?= =?UTF-8?q?bel=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: panzhi --- .../screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp | 2 ++ .../sinkservice/screenregionmgr/2.0/src/screenregion.cpp | 2 -- .../screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp index 12d0b52d..92bdcc60 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp @@ -23,6 +23,8 @@ #include "dscreen_log.h" #include "dscreen_util.h" #include "dscreen_hidumper.h" +#include "hitrace_meter.h" +#include "dscreen_hitrace.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp index f6417fde..394b39da 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp @@ -29,8 +29,6 @@ #include "screen_client.h" #include "screen_client_common.h" #include "2.0/include/screenregionmgr.h" -#include "hitrace_meter.h" -#include "dscreen_hitrace.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp index b379c240..b760bb47 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp @@ -20,7 +20,6 @@ #include "2.0/include/av_sender_engine_adapter.h" #include "distributed_hardware_fwk_kit.h" #include "histreamer_query_tool.h" -#include "hitrace_meter.h" #include "dscreen_constants.h" #include "dscreen_errcode.h" @@ -30,7 +29,6 @@ #include "dscreen_log.h" #include "dscreen_hidumper.h" #include "dscreen_util.h" -#include "dscreen_hitrace.h" #include "common/include/screen_manager_adapter.h" namespace OHOS { -- Gitee From a52f3867d51acc9ec385a57df233d2c8e28a90a4 Mon Sep 17 00:00:00 2001 From: panzhi Date: Wed, 11 Oct 2023 12:07:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A1=A5=E5=85=85trace=E6=89=93=E7=82=B9la?= =?UTF-8?q?bel=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: panzhi --- .../screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp | 1 + .../dscreenmgr/2.0/src/av_sender_engine_adapter.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp index 92bdcc60..cc3b02b0 100644 --- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp +++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp @@ -67,6 +67,7 @@ int32_t AVTransReceiverAdapter::Release() StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SINK_RELEASE_SESSION_START); int32_t ret = receiverEngine_->Release(); FinishTrace(DSCREEN_HITRACE_LABEL); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_AVT_SUCCESS) { DHLOGE("Release av transport receiver engine failed"); } diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp index 9176ad13..a30fc723 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp @@ -52,6 +52,7 @@ int32_t AVTransSenderAdapter::Release() StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_RELEASE_SESSION_START); int32_t ret = senderEngine_->Release(); FinishTrace(DSCREEN_HITRACE_LABEL); + FinishTrace(DSCREEN_HITRACE_LABEL); if (ret != DH_AVT_SUCCESS) { DHLOGE("release av transport sender engine failed"); } -- Gitee