From 0b388210fefb14b505586836ba923679d6db15db Mon Sep 17 00:00:00 2001 From: chen0088 Date: Wed, 15 Jun 2022 15:00:55 +0800 Subject: [PATCH] add label value Signed-off-by: chen0088 --- common/include/utils/dcamera_hitrace_adapter.h | 9 ++++++++- .../distributed_camera_source_service.cpp | 2 +- .../src/distributedcameramgr/dcamera_source_dev.cpp | 4 ++-- .../data_process/src/pipeline/dcamera_pipeline_sink.cpp | 4 ++-- .../src/pipeline/dcamera_pipeline_source.cpp | 4 ++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/common/include/utils/dcamera_hitrace_adapter.h b/common/include/utils/dcamera_hitrace_adapter.h index b0c9b615..59597b02 100644 --- a/common/include/utils/dcamera_hitrace_adapter.h +++ b/common/include/utils/dcamera_hitrace_adapter.h @@ -20,11 +20,18 @@ #include "hitrace_meter.h" -#define DCAMERA_SYNC_TRACE HITRACE_METER(DCAMERA_HITRACE_LABEL) +#define DCAMERA_SYNC_TRACE(value) HITRACE_METER_NAME(DCAMERA_HITRACE_LABEL, value) namespace OHOS { namespace DistributedHardware { constexpr uint64_t DCAMERA_HITRACE_LABEL = HITRACE_TAG_DISTRIBUTED_CAMERA; +const std::string DCAMERA_LOAD_HDF = "DCAMERA_LOAD_HDF"; +const std::string DCAMERA_REGISTER_CAMERA = "DCAMERA_REGISTER_CAMERA"; +const std::string DCAMERA_UNREGISTER_CAMERA = "DCAMERA_UNREGISTER_CAMERA"; +const std::string DCAMERA_SOURCE_CREATE_PIPELINE = "DCAMERA_SOURCE_CREATE_PIPELINE"; +const std::string DCAMERA_SOURCE_DESTORY_PIPELINE = "DCAMERA_SOURCE_DESTORY_PIPELINE"; +const std::string DCAMERA_SINK_CREATE_PIPELINE = "DCAMERA_SINK_CREATE_PIPELINE"; +const std::string DCAMERA_SINK_DESTORY_PIPELINE = "DCAMERA_SINK_DESTORY_PIPELINE"; const std::string DCAMERA_OPEN_CHANNEL_CONTROL = "DCAMERA_OPEN_CHANNEL_CONTROL"; const std::string DCAMERA_OPEN_DATA_CONTINUE = "DCAMERA_OPEN_DATA_CONTINUE"; const std::string DCAMERA_OPEN_DATA_SNAPSHOT = "DCAMERA_OPEN_DATA_SNAPSHOT"; diff --git a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp index d02ccdb8..4055ff43 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -195,7 +195,7 @@ int32_t DistributedCameraSourceService::DCameraNotify(const std::string& devId, int32_t DistributedCameraSourceService::LoadDCameraHDF() { - DCAMERA_SYNC_TRACE; + DCAMERA_SYNC_TRACE(DCAMERA_LOAD_HDF); DHLOGI("load hdf driver start"); int32_t ret = DCameraHdfOperate::GetInstance().LoadDcameraHDFImpl(); if (ret != DCAMERA_OK) { diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index b3168a8f..821f5fad 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -215,7 +215,7 @@ void DCameraSourceDev::OnEvent(DCameraSourceEvent& event) int32_t DCameraSourceDev::ExecuteRegister(std::shared_ptr& param) { - DCAMERA_SYNC_TRACE; + DCAMERA_SYNC_TRACE(DCAMERA_REGISTER_CAMERA); DHLOGI("DCameraSourceDev Execute Register devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); ReportRegisterCameraEvent(REGIST_CAMERA_EVENT, GetAnonyString(devId_), dhId_, @@ -261,7 +261,7 @@ int32_t DCameraSourceDev::ExecuteRegister(std::shared_ptr& p int32_t DCameraSourceDev::ExecuteUnRegister(std::shared_ptr& param) { - DCAMERA_SYNC_TRACE; + DCAMERA_SYNC_TRACE(DCAMERA_UNREGISTER_CAMERA); DHLOGI("DCameraSourceDev Execute UnRegister devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); ReportRegisterCameraEvent(UNREGIST_CAMERA_EVENT, GetAnonyString(devId_), dhId_, diff --git a/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp b/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp index 2a885387..af38f4db 100644 --- a/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp +++ b/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp @@ -36,7 +36,7 @@ int32_t DCameraPipelineSink::CreateDataProcessPipeline(PipelineType piplineType, const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig, const std::shared_ptr& listener) { - DCAMERA_SYNC_TRACE; + DCAMERA_SYNC_TRACE(DCAMERA_SINK_CREATE_PIPELINE); DHLOGD("Create sink data process pipeline."); switch (piplineType) { case PipelineType::VIDEO: @@ -148,7 +148,7 @@ int32_t DCameraPipelineSink::ProcessData(std::vector void DCameraPipelineSink::DestroyDataProcessPipeline() { - DCAMERA_SYNC_TRACE; + DCAMERA_SYNC_TRACE(DCAMERA_SINK_DESTORY_PIPELINE); DHLOGD("Destroy sink data process pipeline start."); isProcess_ = false; if (pipelineHead_ != nullptr) { diff --git a/services/data_process/src/pipeline/dcamera_pipeline_source.cpp b/services/data_process/src/pipeline/dcamera_pipeline_source.cpp index 455a2221..11abb907 100644 --- a/services/data_process/src/pipeline/dcamera_pipeline_source.cpp +++ b/services/data_process/src/pipeline/dcamera_pipeline_source.cpp @@ -38,7 +38,7 @@ int32_t DCameraPipelineSource::CreateDataProcessPipeline(PipelineType piplineTyp const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig, const std::shared_ptr& listener) { - DCAMERA_SYNC_TRACE; + DCAMERA_SYNC_TRACE(DCAMERA_SOURCE_CREATE_PIPELINE); DHLOGD("Create source data process pipeline."); switch (piplineType) { case PipelineType::VIDEO: @@ -170,7 +170,7 @@ int32_t DCameraPipelineSource::ProcessData(std::vector