diff --git a/common/include/dscreen_hitrace.h b/common/include/dscreen_hitrace.h index 5809117..171c6d0 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 4809563..66472e7 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 e6743cc..a4c528d 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 232deda..4e8ec8a 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 98038e8..b5ffe1a 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 053e0c9..7fe8301 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 15d2082..427faeb 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;