From 1ea810ecfbf1b31b56e1c574304a0fc03623e44e Mon Sep 17 00:00:00 2001 From: chen0088 Date: Fri, 20 May 2022 11:27:38 +0800 Subject: [PATCH 01/11] add log test Signed-off-by: chen0088 --- .../src/distributedcameramgr/dcamera_sink_controller.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp index ee990d6e..d45921a8 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp @@ -75,6 +75,9 @@ int32_t DCameraSinkController::StopCapture() { DHLOGI("DCameraSinkController::StopCapture dhId: %s", GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(captureLock_); + if (operator_ == nullptr) { + DHLOGI("DCameraSinkController::StopCapture *** operator_ is null"); + } int32_t ret = operator_->StopCapture(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSinkController::StopCapture client stop capture failed, dhId: %s, ret: %d", -- Gitee From 51388b873b74d80e1d37699e6f2a6038a228cb0b Mon Sep 17 00:00:00 2001 From: chen0088 Date: Tue, 24 May 2022 15:43:11 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0hisysevent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen0088 --- bundle.json | 3 + hisysevent.yaml | 165 ++++++++++++++++++ .../native_cpp/camera_sink/BUILD.gn | 1 + .../camera_sink/src/dcamera_sink_handler.cpp | 24 +++ .../src/dcamera_sink_load_callback.cpp | 16 ++ .../native_cpp/camera_source/BUILD.gn | 1 + .../src/dcamera_source_handler.cpp | 23 +++ .../src/dcamera_source_load_callback.cpp | 16 ++ services/cameraservice/sinkservice/BUILD.gn | 1 + .../distributed_camera_sink_service.cpp | 13 ++ services/cameraservice/sourceservice/BUILD.gn | 1 + .../distributed_camera_source_service.cpp | 53 ++++++ .../dcamera_source_dev.cpp | 83 +++++++++ services/channel/BUILD.gn | 1 + .../channel/src/dcamera_softbus_adapter.cpp | 27 +++ services/data_process/BUILD.gn | 1 + .../decoder/decode_data_process.cpp | 23 +++ .../decoder/decode_data_process_common.cpp | 23 +++ .../encoder/encode_data_process.cpp | 24 ++- .../encoder/encode_data_process_common.cpp | 24 ++- 20 files changed, 521 insertions(+), 2 deletions(-) create mode 100644 hisysevent.yaml diff --git a/bundle.json b/bundle.json index 88b29c98..32f245fc 100644 --- a/bundle.json +++ b/bundle.json @@ -23,6 +23,9 @@ ], "rom":"2000k", "ram":"6M", + "hisysevent_config": [ + "//foundation/distributedhardware/distributedcamera/hisysevent.yaml" + ], "deps":{ "components":[ "appexecfwk_standard", diff --git a/hisysevent.yaml b/hisysevent.yaml new file mode 100644 index 00000000..50b9577b --- /dev/null +++ b/hisysevent.yaml @@ -0,0 +1,165 @@ +# 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. + +##################################################### +# below is the format of defining event # +##################################################### +#domain: domain name. [Only one domain name can be defined at the top] +# +#author: the author name who defined this event. +#date: the date when this event was defined, format is YYYY-MM-DD. +#logged: source file which refer to this event. +#usage: the usage of this event. +#//Define event name and event properties. +#@EVENT_NAME: the event definition part begin. +# // __BASE is used for defining the basic info of the event. +# // "type" optional values are: FAULT, STATISTICS, SECURITY, BEHAVIOR. +# // "level" optional values are: CRITICAL, MINOR. +# // "tag" set tags with may used by subscriber of this event, multiple tags devided by space. +# // "desc" full description of this event. +# @PARAMETER: {type: parameter type, arrsize: array length(optional), desc: parameter description}. +# // follow the __BASE block, each line defines a parameter of this event. +# // "type" optional values are: INT8, UINT8, INT16, UINT16, INT32, UINT32, INT64, UINT64, FLOAT, DOUBLE, STRING. +# // "arrsize" of the parameter is an array, set a non-zero value. +# // "desc" full description of this parameter. + +##################################################### +# Example of some hiviewdfx events definition # +##################################################### + +domain: DISTCAMERA + +SA_ERROR: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera sa error occured} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera sa error info} + +HDF_ERROR: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera hdf error occured} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera hdf error info} + +REGISTER_ERROR: + __BASE: {type: FAULT, level: CRITICAL, desc: register dcamera error occured} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: register dcamera error info} + +SOFTBUS_SESSIONSERVER_ERROR: + __BASE: {type: FAULT, level: CRITICAL, desc: softbus sessionserver error occured} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + PKGNAME: {type: STRING, desc: softbus package name} + SESSIONNAME: {type: STRING, desc: softbus session name} + MSG: {type: STRING, desc: dcamera softbus sessionserver error info} + +SOFTBUS_SESSION_ERROR: + __BASE: {type: FAULT, level: CRITICAL, desc: softbus session error occured} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MYSESSIONNAME: {type: STRING, desc: softbus my session name} + PEERSESSIONNAME: {type: STRING, desc: softbus peer session name} + PEERDEVID: {type: STRING, desc: peer network id} + MSG: {type: STRING, desc: dcamera softbus session error info} + +CAMERA_OPERATER_ERROR: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera operater error occured} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera operater error info} + +VIDEO_ENCODER_ERROR: + __BASE: {type: FAULT, level: CRITICAL, desc: video encoder error occured} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera video encoder error info} + +VIDEO_DECODER_ERROR: + __BASE: {type: FAULT, level: CRITICAL, desc: video decoder error occured} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera video decoder error info} + +INIT_SA_EVENT: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera init sa event} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera init sa event} + +RELEASE_SA_EVENT: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera release sa event} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera release sa event} + +LOAD_HDF_EVENT: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera load hdf event} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera load hdf event} + +UNLOAD_HDF_EVENT: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera unload hdf event} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera unload hdf event} + +REGIST_CAMERA_EVENT: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera register event} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera register event} + +UNREGIST_CAMERA_EVENT: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera unregister event} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera unregister event} + +OPEN_CAMERA_EVENT: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera open event} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera open event} + +CLOSE_CAMERA_EVENT: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera close event} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera close event} + +CONFIG_STREAMS_EVENT: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera config streams event} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera config streams event} + +RELEASE_STREAMS_EVENT: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera release streams event} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera release streams event} + +START_CAPTURE_EVENT: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera start capture event} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera start capture event} + +STOP_CAPTURE_EVENT: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera stop capture event} + PID: {type: INT32, desc: dcamera pid} + UID: {type: INT32, desc: dcamera uid} + MSG: {type: STRING, desc: dcamera stop capture event} diff --git a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn index 4d2e5571..c750d3ba 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn @@ -49,6 +49,7 @@ ohos_shared_library("distributed_camera_sink_sdk") { ] external_deps = [ + "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "samgr_standard:samgr_proxy", diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp index a97e75d5..acad6105 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp @@ -15,7 +15,10 @@ #include "dcamera_sink_handler.h" +#include + #include "anonymous_string.h" +#include "hisysevent.h" #include "dcamera_sink_handler_ipc.h" #include "dcamera_sink_load_callback.h" #include "distributed_camera_constants.h" @@ -41,6 +44,16 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "INIT_SA_EVENT", + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, + "PID", getpid(), + "UID", getuid(), + "MSG", "init sink sa event."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } sptr loadCallback = new DCameraSinkLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, loadCallback); if (ret != DCAMERA_OK) { @@ -91,6 +104,17 @@ int32_t DCameraSinkHandler::ReleaseSink() return DCAMERA_BAD_VALUE; } + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "RELEASE_SA_EVENT", + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, + "PID", getpid(), + "UID", getuid(), + "MSG", "release sink sa event."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } + int32_t ret = dCameraSinkSrv->ReleaseSink(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSinkHandler::ReleaseSink sink service release failed, ret: %d", ret); diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp index 139241ab..25e1937c 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp @@ -12,10 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "dcamera_sink_load_callback.h" + +#include + +#include "hisysevent.h" #include "dcamera_sink_handler.h" #include "distributed_hardware_log.h" #include "distributed_camera_constants.h" +#include "distributed_camera_errno.h" namespace OHOS { namespace DistributedHardware { @@ -41,6 +47,16 @@ void DCameraSinkLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID) { DHLOGE("start aystemabilityId is not sinkSAId!"); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "SA_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "dcamera sink OnLoadSystemAbilityFail."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } return; } DCameraSinkHandler::GetInstance().FinishStartSAFailed(systemAbilityId); diff --git a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn index fdca314a..10a86c20 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn @@ -52,6 +52,7 @@ ohos_shared_library("distributed_camera_source_sdk") { ] external_deps = [ + "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "samgr_standard:samgr_proxy", diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp index abb851cf..28198625 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp @@ -15,7 +15,10 @@ #include "dcamera_source_handler.h" +#include + #include "anonymous_string.h" +#include "hisysevent.h" #include "dcamera_source_callback.h" #include "dcamera_source_handler_ipc.h" #include "dcamera_source_load_callback.h" @@ -43,6 +46,16 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "INIT_SA_EVENT", + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, + "PID", getpid(), + "UID", getuid(), + "MSG", "init source sa event."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } sptr loadCallback = new DCameraSourceLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, loadCallback); if (ret != DCAMERA_OK) { @@ -98,6 +111,16 @@ int32_t DCameraSourceHandler::ReleaseSource() DHLOGE("DCameraSourceHandler ReleaseSource get Service failed"); return DCAMERA_INIT_ERR; } + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "RELEASE_SA_EVENT", + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, + "PID", getpid(), + "UID", getuid(), + "MSG", "release source sa event."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } dCameraSourceSrv->ReleaseSource(); DCameraSourceHandlerIpc::GetInstance().UnInit(); std::unique_lock lock(producerMutex_); diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp index 73a7cf79..b27bf314 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp @@ -12,10 +12,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "dcamera_source_load_callback.h" + +#include + +#include "hisysevent.h" #include "dcamera_source_handler.h" #include "distributed_hardware_log.h" #include "distributed_camera_constants.h" +#include "distributed_camera_errno.h" namespace OHOS { namespace DistributedHardware { @@ -41,6 +47,16 @@ void DCameraSourceLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID) { DHLOGE("start systemabilityId is not sourceSAId!"); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "SA_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "dcamera source OnLoadSystemAbilityFail."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } return; } DCameraSourceHandler::GetInstance().FinishStartSAFailed(systemAbilityId); diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index c3a5fb7a..b07351ca 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -118,6 +118,7 @@ ohos_shared_library("distributed_camera_sink") { ] external_deps = [ + "hisysevent_native:libhisysevent", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp index 158bb04a..8568795d 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp @@ -15,6 +15,9 @@ #include "distributed_camera_sink_service.h" +#include + +#include "hisysevent.h" #include "if_system_ability_manager.h" #include "ipc_skeleton.h" #include "ipc_types.h" @@ -235,6 +238,16 @@ int32_t DistributedCameraSinkService::OpenChannel(const std::string& dhId, std:: int32_t ret = sinkDevice->OpenChannel(openInfo); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSinkService::OpenChannel failed, ret: %d", ret); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "CAMERA_OPERATER_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "sink service open channel failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } return ret; } DHLOGI("DistributedCameraSinkService::OpenChannel success"); diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn index ad111a6f..29fd5066 100644 --- a/services/cameraservice/sourceservice/BUILD.gn +++ b/services/cameraservice/sourceservice/BUILD.gn @@ -104,6 +104,7 @@ ohos_shared_library("distributed_camera_source") { ] external_deps = [ + "hisysevent_native:libhisysevent", "device_driver_framework:libhdf_utils", "device_driver_framework:libhdi", "eventhandler:libeventhandler", 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 5e28cb4b..525446fb 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -15,6 +15,9 @@ #include "distributed_camera_source_service.h" +#include + +#include "hisysevent.h" #include "if_system_ability_manager.h" #include "ipc_skeleton.h" #include "ipc_types.h" @@ -87,6 +90,16 @@ int32_t DistributedCameraSourceService::InitSource(const std::string& params, const sptr& callback) { DHLOGI("DistributedCameraSourceService InitSource param: %s", params.c_str()); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "LOAD_HDF_EVENT", + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, + "PID", getpid(), + "UID", getuid(), + "MSG", "load dcamera hdf event."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } int32_t ret = LoadDCameraHDF(); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService InitSource LoadHDF failed, ret: %d", ret); @@ -100,6 +113,16 @@ int32_t DistributedCameraSourceService::InitSource(const std::string& params, int32_t DistributedCameraSourceService::ReleaseSource() { DHLOGI("DistributedCameraSourceService ReleaseSource"); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "UNLOAD_HDF_EVENT", + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, + "PID", getpid(), + "UID", getuid(), + "MSG", "unload dcamera hdf event."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } int32_t ret = UnLoadCameraHDF(); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService ReleaseSource UnLoadHDF failed, ret: %d", ret); @@ -143,6 +166,16 @@ int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::s if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService RegisterDistributedHardware failed, ret: %d", ret); camerasMap_.erase(camIndex); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "REGISTER_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "dcamera source RegisterDistributedHardware fail."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } } DHLOGI("DistributedCameraSourceService RegisterDistributedHardware end devId: %s, dhId: %s, version: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.version.c_str()); @@ -195,6 +228,16 @@ int32_t DistributedCameraSourceService::LoadDCameraHDF() int32_t ret = DCameraHdfOperate::GetInstance().LoadDcameraHDFImpl(); if (ret != DCAMERA_OK) { DHLOGE("load hdf driver failed, ret %d", ret); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "HDF_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "dcamera load hdf driver fail."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } return ret; } DHLOGI("load hdf driver end"); @@ -207,6 +250,16 @@ int32_t DistributedCameraSourceService::UnLoadCameraHDF() int32_t ret = DCameraHdfOperate::GetInstance().UnLoadDcameraHDFImpl(); if (ret != DCAMERA_OK) { DHLOGE("unload hdf driver failed, ret %d", ret); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "HDF_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "dcamera unload hdf driver fail."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } return ret; } DHLOGI("unload hdf driver end"); diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index 8dcbb4cd..19062253 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -15,7 +15,10 @@ #include "dcamera_source_dev.h" +#include + #include "anonymous_string.h" +#include "hisysevent.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" #include "distributed_hardware_log.h" @@ -215,6 +218,16 @@ int32_t DCameraSourceDev::ExecuteRegister(std::shared_ptr& p { DHLOGI("DCameraSourceDev Execute Register devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "REGIST_CAMERA_EVENT", + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, + "PID", getpid(), + "UID", getuid(), + "MSG", "execute register event."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } std::vector actualDevInfo; actualDevInfo.assign(actualDevInfo_.begin(), actualDevInfo_.end()); int32_t ret = controller_->Init(actualDevInfo); @@ -258,6 +271,16 @@ int32_t DCameraSourceDev::ExecuteUnRegister(std::shared_ptr& { DHLOGI("DCameraSourceDev Execute UnRegister devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "UNREGIST_CAMERA_EVENT", + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, + "PID", getpid(), + "UID", getuid(), + "MSG", "execute unregister event."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } int32_t ret = controller_->UnInit(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute UnRegister controller uninit failed, ret: %d, devId: %s dhId: %s", ret, @@ -293,6 +316,16 @@ int32_t DCameraSourceDev::ExecuteOpenCamera() { DHLOGI("DCameraSourceDev Execute OpenCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "OPEN_CAMERA_EVENT", + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, + "PID", getpid(), + "UID", getuid(), + "MSG", "execute open camera event."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } std::shared_ptr openInfo = std::make_shared(); int32_t ret = GetLocalDeviceNetworkId(openInfo->sourceDevId_); if (ret != DCAMERA_OK) { @@ -314,6 +347,16 @@ int32_t DCameraSourceDev::ExecuteCloseCamera() { DHLOGI("DCameraSourceDev Execute CloseCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "CLOSE_CAMERA_EVENT", + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, + "PID", getpid(), + "UID", getuid(), + "MSG", "execute close camera event."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } int32_t ret = input_->CloseChannel(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute CloseCamera input CloseChannel failed, ret: %d, devId: %s dhId: %s", ret, @@ -331,6 +374,16 @@ int32_t DCameraSourceDev::ExecuteConfigStreams(std::vectorConfigStreams(streamInfos); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute ConfigStreams ConfigStreams failed, ret: %d, devId: %s dhId: %s", ret, @@ -372,6 +425,16 @@ int32_t DCameraSourceDev::ExecuteReleaseStreams(std::vector& streamIds, boo { DHLOGI("DCameraSourceDev Execute ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "RELEASE_STREAMS_EVENT", + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, + "PID", getpid(), + "UID", getuid(), + "MSG", "execute release streams event."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } int32_t ret = input_->ReleaseStreams(streamIds, isAllRelease); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute ReleaseStreams failed ret: %d, devId: %s, dhId: %s", ret, @@ -398,6 +461,16 @@ int32_t DCameraSourceDev::ExecuteStartCapture(std::vectorStartCapture(captureInfos); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev input StartCapture failed ret: %d, devId: %s, dhId: %s", ret, @@ -440,6 +513,16 @@ int32_t DCameraSourceDev::ExecuteStopCapture(std::vector& streamIds, bool& { DHLOGI("DCameraSourceDev Execute StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "STOP_CAPTURE_EVENT", + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, + "PID", getpid(), + "UID", getuid(), + "MSG", "execute stop capture event."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } int32_t ret = input_->StopCapture(streamIds, isAllStop); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute StopCapture input StopCapture failed, ret: %d, devId: %s dhId: %s", ret, diff --git a/services/channel/BUILD.gn b/services/channel/BUILD.gn index 3e263e04..b2deb138 100644 --- a/services/channel/BUILD.gn +++ b/services/channel/BUILD.gn @@ -52,6 +52,7 @@ ohos_shared_library("distributed_camera_channel") { ] external_deps = [ + "hisysevent_native:libhisysevent", "dsoftbus_standard:softbus_client", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index d147fdd8..5d3eeeaf 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -15,8 +15,10 @@ #include "dcamera_softbus_adapter.h" +#include #include +#include "hisysevent.h" #include "softbus_bus_center.h" #include "softbus_common.h" @@ -125,6 +127,18 @@ int32_t DCameraSoftbusAdapter::CreateSoftbusSessionServer(std::string sessionNam int32_t ret = CreateSessionServer(PKG_NAME.c_str(), sessionName.c_str(), &sessListeners_[role]); if (ret != DCAMERA_OK) { DHLOGE("DCameraSoftbusAdapter CreateSessionServer failed, ret: %d", ret); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "SOFTBUS_SESSIONSERVER_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "PKGNAME", PKG_NAME.c_str(), + "SESSIONNAME", sessionName.c_str(), + "MSG", "create session server failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } return ret; } sessionTotal_[sessionName]++; @@ -197,6 +211,19 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s int32_t sessionId = OpenSession(mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str(), "0", &attr); if (sessionId < 0) { DHLOGE("DCameraSoftbusAdapter OpenSoftbusSession failed %d", sessionId); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "SOFTBUS_SESSION_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MYSESSIONNAME", mySessName.c_str(), + "PEERSESSIONNAME", peerSessName.c_str(), + "PEERDEVID", peerDevId.c_str(), + "MSG", "open softbus session failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } return DCAMERA_BAD_OPERATE; } return DCAMERA_OK; diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn index 9197293b..1d4ec0ab 100644 --- a/services/data_process/BUILD.gn +++ b/services/data_process/BUILD.gn @@ -83,6 +83,7 @@ ohos_shared_library("distributed_camera_data_process") { ] external_deps = [ + "hisysevent_native:libhisysevent", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "multimedia_media_standard:media_client", diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp index 9286455e..1fcf9a5c 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp @@ -15,6 +15,9 @@ #include "decode_data_process.h" +#include + +#include "hisysevent.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" @@ -232,6 +235,16 @@ int32_t DecodeDataProcess::StartVideoDecoder() ret = videoDecoder_->Start(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("Video decoder start failed. Error code %d.", ret); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "VIDEO_DECODER_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "video decoder start failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -253,6 +266,16 @@ int32_t DecodeDataProcess::StopVideoDecoder() ret = videoDecoder_->Stop(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("VideoDecoder stop failed. Error type: %d.", ret); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "VIDEO_DECODER_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "video decoder stop failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } isSuccess = isSuccess && false; } if (!isSuccess) { diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp index e5815ec6..d9a7103d 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp @@ -15,6 +15,9 @@ #include "decode_data_process.h" +#include + +#include "hisysevent.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" @@ -220,6 +223,16 @@ int32_t DecodeDataProcess::StartVideoDecoder() ret = videoDecoder_->Start(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("Video decoder start failed. Error code %d.", ret); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "VIDEO_DECODER_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "video decoder start failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -242,6 +255,16 @@ int32_t DecodeDataProcess::StopVideoDecoder() ret = videoDecoder_->Stop(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("VideoDecoder stop failed. Error type: %d.", ret); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "VIDEO_DECODER_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "video decoder stop failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } isSuccess = isSuccess && false; } if (!isSuccess) { diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp index abfc0e6e..8a97cf68 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp @@ -15,8 +15,10 @@ #include "encode_data_process.h" -#include +#include +#include +#include "hisysevent.h" #include "display_type.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" @@ -255,6 +257,16 @@ int32_t EncodeDataProcess::StartVideoEncoder() ret = videoEncoder_->Start(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("Video encoder start failed. Error code %d.", ret); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "VIDEO_ENCODER_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "video encoder start failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -276,6 +288,16 @@ int32_t EncodeDataProcess::StopVideoEncoder() ret = videoEncoder_->Stop(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("VideoEncoder stop failed. Error type: %d.", ret); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "VIDEO_ENCODER_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "video encoder stop failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } isSuccess = isSuccess && false; } diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp index 193cf2c4..ea82476f 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp @@ -15,11 +15,13 @@ #include "encode_data_process.h" -#include +#include +#include #include "display_type.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" +#include "hisysevent.h" #include "dcamera_utils_tools.h" #include "encode_video_callback.h" @@ -227,6 +229,16 @@ int32_t EncodeDataProcess::StartVideoEncoder() ret = videoEncoder_->Start(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("Video encoder start failed. Error code %d.", ret); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "VIDEO_ENCODER_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "video encoder start failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -248,6 +260,16 @@ int32_t EncodeDataProcess::StopVideoEncoder() ret = videoEncoder_->Stop(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("VideoEncoder stop failed. Error type: %d.", ret); + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "VIDEO_ENCODER_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MSG", "video encoder stop failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } isSuccess = isSuccess && false; } -- Gitee From 63ca03b0cb7eced6844bdbb11e6f4e13ea2ff2db Mon Sep 17 00:00:00 2001 From: chen0088 Date: Tue, 24 May 2022 17:13:02 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0hisysevent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen0088 --- .../src/dcamera_sink_load_callback.cpp | 2 -- .../src/dcamera_source_load_callback.cpp | 2 -- .../dcamera_source_dev.cpp | 2 -- .../channel/src/dcamera_softbus_adapter.cpp | 32 +++++++++++-------- .../decoder/decode_data_process.cpp | 2 -- .../decoder/decode_data_process_common.cpp | 2 -- 6 files changed, 19 insertions(+), 23 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp index 25e1937c..b31ec307 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp @@ -15,8 +15,6 @@ #include "dcamera_sink_load_callback.h" -#include - #include "hisysevent.h" #include "dcamera_sink_handler.h" #include "distributed_hardware_log.h" diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp index b27bf314..26649781 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp @@ -15,8 +15,6 @@ #include "dcamera_source_load_callback.h" -#include - #include "hisysevent.h" #include "dcamera_source_handler.h" #include "distributed_hardware_log.h" diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index 19062253..d3863732 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -15,8 +15,6 @@ #include "dcamera_source_dev.h" -#include - #include "anonymous_string.h" #include "hisysevent.h" #include "distributed_camera_constants.h" diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 5d3eeeaf..be63b93e 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -211,24 +211,30 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s int32_t sessionId = OpenSession(mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str(), "0", &attr); if (sessionId < 0) { DHLOGE("DCameraSoftbusAdapter OpenSoftbusSession failed %d", sessionId); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "SOFTBUS_SESSION_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MYSESSIONNAME", mySessName.c_str(), - "PEERSESSIONNAME", peerSessName.c_str(), - "PEERDEVID", peerDevId.c_str(), - "MSG", "open softbus session failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportSoftbusSessionFail(mySessName, peerSessName, peerDevId); return DCAMERA_BAD_OPERATE; } return DCAMERA_OK; } +void DCameraSoftbusAdapter::ReportSoftbusSessionFail(std::string mySessName, + std::string peerSessName, std::string peerDevId) +{ + int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( + OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, + "SOFTBUS_SESSION_ERROR", + OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, + "PID", getpid(), + "UID", getuid(), + "MYSESSIONNAME", mySessName.c_str(), + "PEERSESSIONNAME", peerSessName.c_str(), + "PEERDEVID", peerDevId.c_str(), + "MSG", "open softbus session failed."); + if (retVal != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + } +} + int32_t DCameraSoftbusAdapter::CloseSoftbusSession(int32_t sessionId) { DHLOGI("close softbus sessionId: %d", sessionId); diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp index 1fcf9a5c..118f83b5 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp @@ -15,8 +15,6 @@ #include "decode_data_process.h" -#include - #include "hisysevent.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp index d9a7103d..dacc7236 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp @@ -15,8 +15,6 @@ #include "decode_data_process.h" -#include - #include "hisysevent.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" -- Gitee From 04f2e5ee9cc8c8b1df00da45b7c341a76f944827 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Tue, 24 May 2022 17:26:02 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0hisysevent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen0088 --- services/cameraservice/sinkservice/BUILD.gn | 2 +- services/channel/include/dcamera_softbus_adapter.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index b07351ca..a1d5d1a6 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -118,8 +118,8 @@ ohos_shared_library("distributed_camera_sink") { ] external_deps = [ - "hisysevent_native:libhisysevent", "eventhandler:libeventhandler", + "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/channel/include/dcamera_softbus_adapter.h b/services/channel/include/dcamera_softbus_adapter.h index 999838f2..9a4191ba 100644 --- a/services/channel/include/dcamera_softbus_adapter.h +++ b/services/channel/include/dcamera_softbus_adapter.h @@ -70,6 +70,7 @@ private: int32_t DCameraSoftbusSourceGetSession(int32_t sessionId, std::shared_ptr& session); int32_t DCameraSoftbusSinkGetSession(int32_t sessionId, std::shared_ptr& session); int32_t DCameraSoftbusGetSessionById(int32_t sessionId, std::shared_ptr& session); + void ReportSoftbusSessionFail(std::string mySessName, std::string peerSessName, std::string peerDevId); private: std::mutex optLock_; -- Gitee From f80f634db98bb912f4f0e5c174e1a681fa8d4323 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Tue, 24 May 2022 17:40:26 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0hisysevent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen0088 --- services/cameraservice/sourceservice/BUILD.gn | 2 +- services/channel/BUILD.gn | 2 +- services/data_process/BUILD.gn | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn index 29fd5066..4d328d04 100644 --- a/services/cameraservice/sourceservice/BUILD.gn +++ b/services/cameraservice/sourceservice/BUILD.gn @@ -104,10 +104,10 @@ ohos_shared_library("distributed_camera_source") { ] external_deps = [ - "hisysevent_native:libhisysevent", "device_driver_framework:libhdf_utils", "device_driver_framework:libhdi", "eventhandler:libeventhandler", + "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/channel/BUILD.gn b/services/channel/BUILD.gn index b2deb138..963cd150 100644 --- a/services/channel/BUILD.gn +++ b/services/channel/BUILD.gn @@ -52,9 +52,9 @@ ohos_shared_library("distributed_camera_channel") { ] external_deps = [ - "hisysevent_native:libhisysevent", "dsoftbus_standard:softbus_client", "eventhandler:libeventhandler", + "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", ] diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn index 1d4ec0ab..3dfa78ae 100644 --- a/services/data_process/BUILD.gn +++ b/services/data_process/BUILD.gn @@ -83,8 +83,8 @@ ohos_shared_library("distributed_camera_data_process") { ] external_deps = [ - "hisysevent_native:libhisysevent", "eventhandler:libeventhandler", + "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "multimedia_media_standard:media_client", ] -- Gitee From c08b9ae47de7f9c1ccef9af6a7fe14ca262890c1 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Thu, 26 May 2022 15:52:15 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0hisysevent=E6=89=93?= =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen0088 --- .../src/distributedcameramgr/dcamera_sink_controller.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp index d45921a8..ee990d6e 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp @@ -75,9 +75,6 @@ int32_t DCameraSinkController::StopCapture() { DHLOGI("DCameraSinkController::StopCapture dhId: %s", GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(captureLock_); - if (operator_ == nullptr) { - DHLOGI("DCameraSinkController::StopCapture *** operator_ is null"); - } int32_t ret = operator_->StopCapture(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSinkController::StopCapture client stop capture failed, dhId: %s, ret: %d", -- Gitee From 2bc1373dbff878d66052fe90b39da93ffb60106d Mon Sep 17 00:00:00 2001 From: chen0088 Date: Sat, 28 May 2022 18:03:52 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0hisysevent=E6=89=93?= =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen0088 --- common/BUILD.gn | 2 + .../utils/dcamera_hisysevent_adapter.h | 52 +++ .../src/utils/dcamera_hisysevent_adapter.cpp | 317 ++++++++++++++++++ hisysevent.yaml | 89 ++--- .../native_cpp/camera_sink/BUILD.gn | 3 +- .../camera_sink/src/dcamera_sink_handler.cpp | 27 +- .../src/dcamera_sink_load_callback.cpp | 14 +- .../native_cpp/camera_source/BUILD.gn | 3 +- .../src/dcamera_source_handler.cpp | 26 +- .../src/dcamera_source_load_callback.cpp | 14 +- services/cameraservice/sinkservice/BUILD.gn | 1 - .../distributed_camera_sink_service.cpp | 15 +- services/cameraservice/sourceservice/BUILD.gn | 1 - .../distributed_camera_source_service.cpp | 60 +--- .../dcamera_source_dev.cpp | 102 ++---- services/channel/BUILD.gn | 1 - .../channel/include/dcamera_softbus_adapter.h | 1 - .../channel/src/dcamera_softbus_adapter.cpp | 36 +- services/data_process/BUILD.gn | 1 - .../decoder/decode_data_process.cpp | 30 +- .../decoder/decode_data_process_common.cpp | 30 +- .../encoder/encode_data_process.cpp | 30 +- .../encoder/encode_data_process_common.cpp | 30 +- 23 files changed, 501 insertions(+), 384 deletions(-) create mode 100644 common/include/utils/dcamera_hisysevent_adapter.h create mode 100644 common/src/utils/dcamera_hisysevent_adapter.cpp diff --git a/common/BUILD.gn b/common/BUILD.gn index 880aafd0..9d8df6c0 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -32,6 +32,7 @@ ohos_shared_library("distributed_camera_utils") { sources = [ "src/utils/data_buffer.cpp", + "src/utils/dcamera_hisysevent_adapter.cpp", "src/utils/dcamera_sa_process_state.cpp", "src/utils/dcamera_utils_tools.cpp", ] @@ -49,6 +50,7 @@ ohos_shared_library("distributed_camera_utils") { external_deps = [ "dsoftbus_standard:softbus_client", + "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", ] diff --git a/common/include/utils/dcamera_hisysevent_adapter.h b/common/include/utils/dcamera_hisysevent_adapter.h new file mode 100644 index 00000000..2a92a846 --- /dev/null +++ b/common/include/utils/dcamera_hisysevent_adapter.h @@ -0,0 +1,52 @@ +/* + * 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_DCAMERA_HISYSEVENT_ADAPTER_H +#define OHOS_DCAMERA_HISYSEVENT_ADAPTER_H + +#include + +namespace OHOS { +namespace DistributedHardware { +void ReportLoadSaFail(int32_t saId, const std::string& errMsg); +void ReportHDFFail(const std::string& errMsg); +void ReportRegisterHardwareFail(const std::string& devId, const std::string& dhId, + std::string version, const std::string& errMsg); +void ReportSoftbusSessionServerFail(const std::string pkgName, std::string sessionName, const std::string& errMsg); +void ReportSoftbusSessionFail(std::string mySessName, std::string peerSessName, std::string peerDevId, + const std::string& errMsg); +void ReportCameraOperaterFail(const std::string& dhId, const std::string& errMsg); +void ReportStartVideoEncoderFail(int32_t width, int32_t height, std::string format, const std::string& errMsg); +void ReportStopVideoEncoderFail(const std::string& errMsg); +void ReportStartVideoDecoderFail(int32_t width, int32_t height, std::string format, const std::string& errMsg); +void ReportStopVideoDecoderFail(const std::string& errMsg); +void ReportInitSaEvent(int32_t saId, const std::string& errMsg); +void ReportReleaseSaEvent(const std::string& errMsg); +void ReportLoadHDFEvent(const std::string& errMsg); +void ReportUnLoadHDFEvent(const std::string& errMsg); +void ReportRegisterCameraEvent(const std::string& devId, const std::string& dhId, + std::string version, const std::string& errMsg); +void ReportUnRegisterCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg); +void ReportOpenCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg); +void ReportCloseCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg); +void ReportConfigStreamsEvent(int32_t streamId, int32_t width, int32_t height, int32_t format, + std::string encodeType, std::string streamType, const std::string& errMsg); +void ReportReleaseStreamsEvent(int32_t streamId, const std::string& errMsg); +void ReportStartCaptureEvent(int32_t width, int32_t height, int32_t format, std::string isCapture, + std::string encodeType, std::string streamType, const std::string& errMsg); +void ReportStopCaptureEvent(int32_t streamId, const std::string& errMsg); +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DCAMERA_HISYSEVENT_ADAPTER_H \ No newline at end of file diff --git a/common/src/utils/dcamera_hisysevent_adapter.cpp b/common/src/utils/dcamera_hisysevent_adapter.cpp new file mode 100644 index 00000000..01618c91 --- /dev/null +++ b/common/src/utils/dcamera_hisysevent_adapter.cpp @@ -0,0 +1,317 @@ +/* + * 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. + */ + +#include "dcamera_hisysevent_adapter.h" + +#include "hisysevent.h" +#include "distributed_camera_errno.h" +#include "distributed_hardware_log.h" + +namespace OHOS { +namespace DistributedHardware { +namespace { +using HiSysEventNameSpace = OHOS::HiviewDFX::HiSysEvent; +const std::string DOMAIN_STR = std::string(HiSysEventNameSpace::Domain::DISTRIBUTED_CAMERA); +} + +void ReportLoadSaFail(int32_t saId, const std::string& errMsg) +{ + int ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "SA_ERROR", + HiSysEventNameSpace::EventType::FAULT, + "SAID", saId, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error ret %d, saId %d, errMsg %s.", ret, saId, errMsg.c_str()); + } +} + +void ReportHDFFail(const std::string& errMsg) +{ + int ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "HDF_ERROR", + HiSysEventNameSpace::EventType::FAULT, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error ret %d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportRegisterHardwareFail(const std::string& devId, const std::string& dhId, + std::string version, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "REGISTER_HARDWARE_ERROR", + HiSysEventNameSpace::EventType::FAULT, + "DEVID", devId, + "DHID", dhId, + "VERSION", version, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error ret %d, devId %s, dhId %s, errMsg %s.", ret, devId.c_str(), + dhId.c_str(), errMsg.c_str()); + } +} + +void ReportSoftbusSessionServerFail(const std::string pkgName, std::string sessionName, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "SOFTBUS_SESSIONSERVER_ERROR", + HiSysEventNameSpace::EventType::FAULT, + "PKGNAME", pkgName, + "SESSIONNAME", sessionName, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportSoftbusSessionFail(std::string mySessName, std::string peerSessName, std::string peerDevId, + const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "SOFTBUS_SESSION_ERROR", + HiSysEventNameSpace::EventType::FAULT, + "MYSESSIONNAME", mySessName, + "PEERSESSIONNAME", peerSessName, + "PEERDEVID", peerDevId, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportCameraOperaterFail(const std::string& dhId, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "CAMERA_OPERATER_ERROR", + HiSysEventNameSpace::EventType::FAULT, + "DHID", dhId, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, dhId %s, errMsg %s.", ret, dhId.c_str(), errMsg.c_str()); + } +} + +void ReportStartVideoEncoderFail(int32_t width, int32_t height, std::string format, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "START_VIDEO_ENCODER_ERROR", + HiSysEventNameSpace::EventType::FAULT, + "WIDTH", width, + "HEIGHT", height, + "FORMAT", format, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportStopVideoEncoderFail(const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "STOP_VIDEO_ENCODER_ERROR", + HiSysEventNameSpace::EventType::FAULT, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportStartVideoDecoderFail(int32_t width, int32_t height, std::string format, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "START_VIDEO_DECODER_ERROR", + HiSysEventNameSpace::EventType::FAULT, + "WIDTH", width, + "HEIGHT", height, + "FORMAT", format, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportStopVideoDecoderFail(const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "STOP_VIDEO_DECODER_ERROR", + HiSysEventNameSpace::EventType::FAULT, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportInitSaEvent(int32_t saId, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "INIT_SA_EVENT", + HiSysEventNameSpace::EventType::BEHAVIOR, + "SAID", saId, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportReleaseSaEvent(const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "RELEASE_SA_EVENT", + HiSysEventNameSpace::EventType::BEHAVIOR, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportLoadHDFEvent(const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "LOAD_HDF_EVENT", + HiSysEventNameSpace::EventType::BEHAVIOR, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportUnLoadHDFEvent(const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "UNLOAD_HDF_EVENT", + HiSysEventNameSpace::EventType::BEHAVIOR, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportRegisterCameraEvent(const std::string& devId, const std::string& dhId, + std::string version, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "REGIST_CAMERA_EVENT", + HiSysEventNameSpace::EventType::BEHAVIOR, + "DEVID", devId, + "DHID", dhId, + "VERSION", version, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportUnRegisterCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "UNREGIST_CAMERA_EVENT", + HiSysEventNameSpace::EventType::BEHAVIOR, + "DEVID", devId, + "DHID", dhId, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportOpenCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "OPEN_CAMERA_EVENT", + HiSysEventNameSpace::EventType::BEHAVIOR, + "DEVID", devId, + "DHID", dhId, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportCloseCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "CLOSE_CAMERA_EVENT", + HiSysEventNameSpace::EventType::BEHAVIOR, + "DEVID", devId, + "DHID", dhId, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportConfigStreamsEvent(int32_t streamId, int32_t width, int32_t height, int32_t format, + std::string encodeType, std::string streamType, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "CONFIG_STREAMS_EVENT", + HiSysEventNameSpace::EventType::BEHAVIOR, + "STREAMID", streamId, + "WIDTH", width, + "HEIGHT", height, + "FORMAT", format, + "ENCODETYPE", encodeType, + "STREAMTYPE", streamType, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportReleaseStreamsEvent(int32_t streamId, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "RELEASE_STREAMS_EVENT", + HiSysEventNameSpace::EventType::BEHAVIOR, + "STREAMID", streamId, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportStartCaptureEvent(int32_t width, int32_t height, int32_t format, std::string isCapture, + std::string encodeType, std::string streamType, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "START_CAPTURE_EVENT", + HiSysEventNameSpace::EventType::BEHAVIOR, + "WIDTH", width, + "HEIGHT", height, + "FORMAT", format, + "ISCAPTURE", isCapture, + "ENCODETYPE", encodeType, + "STREAMTYPE", streamType, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} + +void ReportStopCaptureEvent(int32_t streamId, const std::string& errMsg) +{ + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, + "STOP_CAPTURE_EVENT", + HiSysEventNameSpace::EventType::BEHAVIOR, + "STREAMID", streamId, + "MSG", errMsg); + if (ret != DCAMERA_OK) { + DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + } +} +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/hisysevent.yaml b/hisysevent.yaml index 50b9577b..825137aa 100644 --- a/hisysevent.yaml +++ b/hisysevent.yaml @@ -41,34 +41,28 @@ domain: DISTCAMERA SA_ERROR: __BASE: {type: FAULT, level: CRITICAL, desc: dcamera sa error occured} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + SAID: {type: INT32, desc: dcamera SAID} MSG: {type: STRING, desc: dcamera sa error info} HDF_ERROR: __BASE: {type: FAULT, level: CRITICAL, desc: dcamera hdf error occured} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} MSG: {type: STRING, desc: dcamera hdf error info} -REGISTER_ERROR: +REGISTER_HARDWARE_ERROR: __BASE: {type: FAULT, level: CRITICAL, desc: register dcamera error occured} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + DEVID: {type: STRING, desc: dcamera devId} + DHID: {type: STRING, desc: dcamera dhId} + VERSION: {type: STRING, desc: dcamera version} MSG: {type: STRING, desc: register dcamera error info} SOFTBUS_SESSIONSERVER_ERROR: __BASE: {type: FAULT, level: CRITICAL, desc: softbus sessionserver error occured} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} PKGNAME: {type: STRING, desc: softbus package name} SESSIONNAME: {type: STRING, desc: softbus session name} MSG: {type: STRING, desc: dcamera softbus sessionserver error info} SOFTBUS_SESSION_ERROR: __BASE: {type: FAULT, level: CRITICAL, desc: softbus session error occured} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} MYSESSIONNAME: {type: STRING, desc: softbus my session name} PEERSESSIONNAME: {type: STRING, desc: softbus peer session name} PEERDEVID: {type: STRING, desc: peer network id} @@ -76,90 +70,99 @@ SOFTBUS_SESSION_ERROR: CAMERA_OPERATER_ERROR: __BASE: {type: FAULT, level: CRITICAL, desc: dcamera operater error occured} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + DHID: {type: STRING, desc: dcamera dhId} MSG: {type: STRING, desc: dcamera operater error info} -VIDEO_ENCODER_ERROR: +START_VIDEO_ENCODER_ERROR: __BASE: {type: FAULT, level: CRITICAL, desc: video encoder error occured} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + WIDTH: {type: INT32, desc: dcamera width} + HEIGHT: {type: INT32, desc: dcamera height} + FORMAT: {type: STRING, desc: dcamera FORMAT} MSG: {type: STRING, desc: dcamera video encoder error info} -VIDEO_DECODER_ERROR: +STOP_VIDEO_ENCODER_ERROR: + __BASE: {type: FAULT, level: CRITICAL, desc: video encoder error occured} + MSG: {type: STRING, desc: dcamera video encoder error info} + +START_VIDEO_DECODER_ERROR: __BASE: {type: FAULT, level: CRITICAL, desc: video decoder error occured} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + WIDTH: {type: INT32, desc: dcamera width} + HEIGHT: {type: INT32, desc: dcamera height} + FORMAT: {type: STRING, desc: dcamera format} MSG: {type: STRING, desc: dcamera video decoder error info} +STOP_VIDEO_DECODER_ERROR: + __BASE: {type: FAULT, level: CRITICAL, desc: video decoder error occured} + MSG: {type: STRING, desc: dcamera video encoder error info} + INIT_SA_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera init sa event} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + SAID: {type: INT32, desc: dcamera SAID} MSG: {type: STRING, desc: dcamera init sa event} RELEASE_SA_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera release sa event} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} MSG: {type: STRING, desc: dcamera release sa event} LOAD_HDF_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera load hdf event} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} MSG: {type: STRING, desc: dcamera load hdf event} UNLOAD_HDF_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera unload hdf event} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} MSG: {type: STRING, desc: dcamera unload hdf event} REGIST_CAMERA_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera register event} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + DEVID: {type: STRING, desc: dcamera devId} + DHID: {type: STRING, desc: dcamera dhId} + VERSION: {type: STRING, desc: dcamera version} MSG: {type: STRING, desc: dcamera register event} UNREGIST_CAMERA_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera unregister event} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + DEVID: {type: STRING, desc: dcamera devId} + DHID: {type: STRING, desc: dcamera dhId} MSG: {type: STRING, desc: dcamera unregister event} OPEN_CAMERA_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera open event} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + DEVID: {type: STRING, desc: dcamera devId} + DHID: {type: STRING, desc: dcamera dhId} MSG: {type: STRING, desc: dcamera open event} CLOSE_CAMERA_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera close event} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + DEVID: {type: STRING, desc: dcamera devId} + DHID: {type: STRING, desc: dcamera dhId} MSG: {type: STRING, desc: dcamera close event} CONFIG_STREAMS_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera config streams event} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + STREAMID: {type: INT32, desc: dcamera streamId} + WIDTH: {type: INT32, desc: dcamera width} + HEIGHT: {type: INT32, desc: dcamera height} + FORMAT: {type: INT32, desc: dcamera format} + ENCODETYPE: {type: STRING, desc: dcamera encodeType} + STREAMTYPE: {type: STRING, desc: dcamera streamType} MSG: {type: STRING, desc: dcamera config streams event} RELEASE_STREAMS_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera release streams event} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + STREAMID: {type: INT32, desc: dcamera streamId} MSG: {type: STRING, desc: dcamera release streams event} START_CAPTURE_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera start capture event} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + WIDTH: {type: INT32, desc: dcamera width} + HEIGHT: {type: INT32, desc: dcamera height} + FORMAT: {type: INT32, desc: dcamera format} + ISCAPTURE: {type: STRING, desc: dcamera isCapture} + ENCODETYPE: {type: STRING, desc: dcamera encodeType} + STREAMTYPE: {type: STRING, desc: dcamera streamType} MSG: {type: STRING, desc: dcamera start capture event} STOP_CAPTURE_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera stop capture event} - PID: {type: INT32, desc: dcamera pid} - UID: {type: INT32, desc: dcamera uid} + STREAMID: {type: INT32, desc: dcamera streamId} MSG: {type: STRING, desc: dcamera stop capture event} diff --git a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn index c750d3ba..2dddd282 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn @@ -28,6 +28,7 @@ ohos_shared_library("distributed_camera_sink_sdk") { include_dirs += [ "include", "${common_path}/include/constants", + "${common_path}/include/utils", ] sources = [ @@ -38,6 +39,7 @@ ohos_shared_library("distributed_camera_sink_sdk") { ] deps = [ + "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", "//utils/native/base:utils", ] @@ -49,7 +51,6 @@ ohos_shared_library("distributed_camera_sink_sdk") { ] external_deps = [ - "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "samgr_standard:samgr_proxy", diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp index acad6105..5fca8cde 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp @@ -15,10 +15,8 @@ #include "dcamera_sink_handler.h" -#include - #include "anonymous_string.h" -#include "hisysevent.h" +#include "dcamera_hisysevent_adapter.h" #include "dcamera_sink_handler_ipc.h" #include "dcamera_sink_load_callback.h" #include "distributed_camera_constants.h" @@ -44,16 +42,7 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "INIT_SA_EVENT", - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PID", getpid(), - "UID", getuid(), - "MSG", "init sink sa event."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportInitSaEvent(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "init sink sa event."); sptr loadCallback = new DCameraSinkLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, loadCallback); if (ret != DCAMERA_OK) { @@ -104,17 +93,7 @@ int32_t DCameraSinkHandler::ReleaseSink() return DCAMERA_BAD_VALUE; } - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "RELEASE_SA_EVENT", - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PID", getpid(), - "UID", getuid(), - "MSG", "release sink sa event."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } - + ReportReleaseSaEvent("release sink sa event."); int32_t ret = dCameraSinkSrv->ReleaseSink(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSinkHandler::ReleaseSink sink service release failed, ret: %d", ret); diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp index b31ec307..a3a8de72 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp @@ -15,11 +15,10 @@ #include "dcamera_sink_load_callback.h" -#include "hisysevent.h" +#include "dcamera_hisysevent_adapter.h" #include "dcamera_sink_handler.h" #include "distributed_hardware_log.h" #include "distributed_camera_constants.h" -#include "distributed_camera_errno.h" namespace OHOS { namespace DistributedHardware { @@ -45,16 +44,7 @@ void DCameraSinkLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID) { DHLOGE("start aystemabilityId is not sinkSAId!"); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "SA_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "dcamera sink OnLoadSystemAbilityFail."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportLoadSaFail(systemAbilityId, "dcamera sink OnLoadSystemAbilityFail."); return; } DCameraSinkHandler::GetInstance().FinishStartSAFailed(systemAbilityId); diff --git a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn index 10a86c20..93660d65 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn @@ -29,6 +29,7 @@ ohos_shared_library("distributed_camera_source_sdk") { "include", "include/callback", "${common_path}/include/constants", + "${common_path}/include/utils", ] sources = [ @@ -41,6 +42,7 @@ ohos_shared_library("distributed_camera_source_sdk") { ] deps = [ + "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", "//utils/native/base:utils", ] @@ -52,7 +54,6 @@ ohos_shared_library("distributed_camera_source_sdk") { ] external_deps = [ - "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "samgr_standard:samgr_proxy", diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp index 28198625..2b29c89d 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp @@ -15,10 +15,8 @@ #include "dcamera_source_handler.h" -#include - #include "anonymous_string.h" -#include "hisysevent.h" +#include "dcamera_hisysevent_adapter.h" #include "dcamera_source_callback.h" #include "dcamera_source_handler_ipc.h" #include "dcamera_source_load_callback.h" @@ -46,16 +44,7 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "INIT_SA_EVENT", - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PID", getpid(), - "UID", getuid(), - "MSG", "init source sa event."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportInitSaEvent(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "init source sa event."); sptr loadCallback = new DCameraSourceLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, loadCallback); if (ret != DCAMERA_OK) { @@ -111,16 +100,7 @@ int32_t DCameraSourceHandler::ReleaseSource() DHLOGE("DCameraSourceHandler ReleaseSource get Service failed"); return DCAMERA_INIT_ERR; } - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "RELEASE_SA_EVENT", - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PID", getpid(), - "UID", getuid(), - "MSG", "release source sa event."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportReleaseSaEvent("release source sa event."); dCameraSourceSrv->ReleaseSource(); DCameraSourceHandlerIpc::GetInstance().UnInit(); std::unique_lock lock(producerMutex_); diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp index 26649781..b5275581 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp @@ -15,11 +15,10 @@ #include "dcamera_source_load_callback.h" -#include "hisysevent.h" +#include "dcamera_hisysevent_adapter.h" #include "dcamera_source_handler.h" #include "distributed_hardware_log.h" #include "distributed_camera_constants.h" -#include "distributed_camera_errno.h" namespace OHOS { namespace DistributedHardware { @@ -45,16 +44,7 @@ void DCameraSourceLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID) { DHLOGE("start systemabilityId is not sourceSAId!"); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "SA_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "dcamera source OnLoadSystemAbilityFail."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportLoadSaFail(systemAbilityId, "dcamera source OnLoadSystemAbilityFail."); return; } DCameraSourceHandler::GetInstance().FinishStartSAFailed(systemAbilityId); diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index a1d5d1a6..c3a5fb7a 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -119,7 +119,6 @@ ohos_shared_library("distributed_camera_sink") { external_deps = [ "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp index 8568795d..3065aa99 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp @@ -15,9 +15,6 @@ #include "distributed_camera_sink_service.h" -#include - -#include "hisysevent.h" #include "if_system_ability_manager.h" #include "ipc_skeleton.h" #include "ipc_types.h" @@ -27,6 +24,7 @@ #include "anonymous_string.h" #include "dcamera_handler.h" +#include "dcamera_hisysevent_adapter.h" #include "dcamera_sink_service_ipc.h" #include "distributed_camera_errno.h" #include "distributed_hardware_log.h" @@ -238,16 +236,7 @@ int32_t DistributedCameraSinkService::OpenChannel(const std::string& dhId, std:: int32_t ret = sinkDevice->OpenChannel(openInfo); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSinkService::OpenChannel failed, ret: %d", ret); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "CAMERA_OPERATER_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "sink service open channel failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportCameraOperaterFail(dhId, "sink service open channel failed."); return ret; } DHLOGI("DistributedCameraSinkService::OpenChannel success"); diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn index 4d328d04..ad111a6f 100644 --- a/services/cameraservice/sourceservice/BUILD.gn +++ b/services/cameraservice/sourceservice/BUILD.gn @@ -107,7 +107,6 @@ ohos_shared_library("distributed_camera_source") { "device_driver_framework:libhdf_utils", "device_driver_framework:libhdi", "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", 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 525446fb..94175ff2 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -15,9 +15,6 @@ #include "distributed_camera_source_service.h" -#include - -#include "hisysevent.h" #include "if_system_ability_manager.h" #include "ipc_skeleton.h" #include "ipc_types.h" @@ -27,6 +24,7 @@ #include "anonymous_string.h" #include "dcamera_hdf_operate.h" +#include "dcamera_hisysevent_adapter.h" #include "dcamera_service_state_listener.h" #include "dcamera_source_service_ipc.h" #include "distributed_camera_errno.h" @@ -90,16 +88,7 @@ int32_t DistributedCameraSourceService::InitSource(const std::string& params, const sptr& callback) { DHLOGI("DistributedCameraSourceService InitSource param: %s", params.c_str()); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "LOAD_HDF_EVENT", - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PID", getpid(), - "UID", getuid(), - "MSG", "load dcamera hdf event."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportLoadHDFEvent("load dcamera hdf event."); int32_t ret = LoadDCameraHDF(); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService InitSource LoadHDF failed, ret: %d", ret); @@ -113,16 +102,7 @@ int32_t DistributedCameraSourceService::InitSource(const std::string& params, int32_t DistributedCameraSourceService::ReleaseSource() { DHLOGI("DistributedCameraSourceService ReleaseSource"); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "UNLOAD_HDF_EVENT", - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PID", getpid(), - "UID", getuid(), - "MSG", "unload dcamera hdf event."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportUnLoadHDFEvent("unload dcamera hdf event."); int32_t ret = UnLoadCameraHDF(); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService ReleaseSource UnLoadHDF failed, ret: %d", ret); @@ -165,17 +145,9 @@ int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::s ret = camDev->RegisterDistributedHardware(devId, dhId, reqId, param.version, param.attrs); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService RegisterDistributedHardware failed, ret: %d", ret); + ReportRegisterHardwareFail(GetAnonyString(devId), dhId, param.version, + "dcamera source RegisterDistributedHardware fail."); camerasMap_.erase(camIndex); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "REGISTER_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "dcamera source RegisterDistributedHardware fail."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } } DHLOGI("DistributedCameraSourceService RegisterDistributedHardware end devId: %s, dhId: %s, version: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.version.c_str()); @@ -228,16 +200,7 @@ int32_t DistributedCameraSourceService::LoadDCameraHDF() int32_t ret = DCameraHdfOperate::GetInstance().LoadDcameraHDFImpl(); if (ret != DCAMERA_OK) { DHLOGE("load hdf driver failed, ret %d", ret); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "HDF_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "dcamera load hdf driver fail."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportHDFFail("dcamera load hdf driver fail."); return ret; } DHLOGI("load hdf driver end"); @@ -250,16 +213,7 @@ int32_t DistributedCameraSourceService::UnLoadCameraHDF() int32_t ret = DCameraHdfOperate::GetInstance().UnLoadDcameraHDFImpl(); if (ret != DCAMERA_OK) { DHLOGE("unload hdf driver failed, ret %d", ret); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "HDF_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "dcamera unload hdf driver fail."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportHDFFail("dcamera unload hdf driver fail."); return ret; } DHLOGI("unload hdf driver end"); diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index d3863732..bfd76254 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -16,7 +16,7 @@ #include "dcamera_source_dev.h" #include "anonymous_string.h" -#include "hisysevent.h" +#include "dcamera_hisysevent_adapter.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" #include "distributed_hardware_log.h" @@ -30,6 +30,13 @@ namespace OHOS { namespace DistributedHardware { +const string ENUM_STREAMTYPE_STRINGS[] = { + "CONTINUOUS_FRAME", "SNAPSHOT_FRAME" +}; +const string ENUM_ENCODETYPE_STRINGS[] = { + "ENCODE_TYPE_NULL", "ENCODE_TYPE_H264", "ENCODE_TYPE_H265", "ENCODE_TYPE_JPEG" +}; + DCameraSourceDev::DCameraSourceDev(std::string devId, std::string dhId, std::shared_ptr& stateLisener) : devId_(devId), dhId_(dhId), stateListener_(stateLisener) { @@ -216,16 +223,7 @@ int32_t DCameraSourceDev::ExecuteRegister(std::shared_ptr& p { DHLOGI("DCameraSourceDev Execute Register devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "REGIST_CAMERA_EVENT", - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PID", getpid(), - "UID", getuid(), - "MSG", "execute register event."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportRegisterCameraEvent(GetAnonyString(devId_), dhId_, version_, "execute register event."); std::vector actualDevInfo; actualDevInfo.assign(actualDevInfo_.begin(), actualDevInfo_.end()); int32_t ret = controller_->Init(actualDevInfo); @@ -269,16 +267,7 @@ int32_t DCameraSourceDev::ExecuteUnRegister(std::shared_ptr& { DHLOGI("DCameraSourceDev Execute UnRegister devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "UNREGIST_CAMERA_EVENT", - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PID", getpid(), - "UID", getuid(), - "MSG", "execute unregister event."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportUnRegisterCameraEvent(GetAnonyString(devId_), dhId_, "execute unregister event."); int32_t ret = controller_->UnInit(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute UnRegister controller uninit failed, ret: %d, devId: %s dhId: %s", ret, @@ -314,16 +303,7 @@ int32_t DCameraSourceDev::ExecuteOpenCamera() { DHLOGI("DCameraSourceDev Execute OpenCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "OPEN_CAMERA_EVENT", - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PID", getpid(), - "UID", getuid(), - "MSG", "execute open camera event."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportOpenCameraEvent(GetAnonyString(devId_), dhId_, "execute open camera event."); std::shared_ptr openInfo = std::make_shared(); int32_t ret = GetLocalDeviceNetworkId(openInfo->sourceDevId_); if (ret != DCAMERA_OK) { @@ -345,16 +325,7 @@ int32_t DCameraSourceDev::ExecuteCloseCamera() { DHLOGI("DCameraSourceDev Execute CloseCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "CLOSE_CAMERA_EVENT", - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PID", getpid(), - "UID", getuid(), - "MSG", "execute close camera event."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportCloseCameraEvent(GetAnonyString(devId_), dhId_, "execute close camera event."); int32_t ret = input_->CloseChannel(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute CloseCamera input CloseChannel failed, ret: %d, devId: %s dhId: %s", ret, @@ -372,15 +343,11 @@ int32_t DCameraSourceDev::ExecuteConfigStreams(std::vector streamInfo = *iter; + ReportConfigStreamsEvent(streamInfo->streamId_, streamInfo->width_, streamInfo->height_, streamInfo->format_, + ENUM_ENCODETYPE_STRINGS[streamInfo->encodeType_], ENUM_STREAMTYPE_STRINGS[streamInfo->type_], + "execute config streams event."); } int32_t ret = input_->ConfigStreams(streamInfos); if (ret != DCAMERA_OK) { @@ -423,15 +390,8 @@ int32_t DCameraSourceDev::ExecuteReleaseStreams(std::vector& streamIds, boo { DHLOGI("DCameraSourceDev Execute ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "RELEASE_STREAMS_EVENT", - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PID", getpid(), - "UID", getuid(), - "MSG", "execute release streams event."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + for (auto iter = streamIds.begin(); iter != streamIds.end(); iter++) { + ReportReleaseStreamsEvent(*iter, "execute release streams event."); } int32_t ret = input_->ReleaseStreams(streamIds, isAllRelease); if (ret != DCAMERA_OK) { @@ -459,16 +419,6 @@ int32_t DCameraSourceDev::ExecuteStartCapture(std::vectorStartCapture(captureInfos); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev input StartCapture failed ret: %d, devId: %s, dhId: %s", ret, @@ -489,6 +439,9 @@ int32_t DCameraSourceDev::ExecuteStartCapture(std::vectorcaptureSettings_.size(), capture->width_, capture->height_, capture->format_, capture->isCapture_ ? 1 : 0, capture->encodeType_, capture->streamType_); + ReportStartCaptureEvent(capture->width_, capture->height_, capture->format_, + capture->isCapture_ ? "true" : "false", ENUM_ENCODETYPE_STRINGS[capture->encodeType_], + ENUM_STREAMTYPE_STRINGS[capture->streamType_], "execute start capture event."); for (auto settingIter = (*iter)->captureSettings_.begin(); settingIter != (*iter)->captureSettings_.end(); settingIter++) { std::shared_ptr setting = std::make_shared(); @@ -511,15 +464,8 @@ int32_t DCameraSourceDev::ExecuteStopCapture(std::vector& streamIds, bool& { DHLOGI("DCameraSourceDev Execute StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "STOP_CAPTURE_EVENT", - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PID", getpid(), - "UID", getuid(), - "MSG", "execute stop capture event."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); + for (auto iter = streamIds.begin(); iter != streamIds.end(); iter++) { + ReportStopCaptureEvent(*iter, "execute stop capture event."); } int32_t ret = input_->StopCapture(streamIds, isAllStop); if (ret != DCAMERA_OK) { diff --git a/services/channel/BUILD.gn b/services/channel/BUILD.gn index 963cd150..3e263e04 100644 --- a/services/channel/BUILD.gn +++ b/services/channel/BUILD.gn @@ -54,7 +54,6 @@ ohos_shared_library("distributed_camera_channel") { external_deps = [ "dsoftbus_standard:softbus_client", "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", ] diff --git a/services/channel/include/dcamera_softbus_adapter.h b/services/channel/include/dcamera_softbus_adapter.h index 9a4191ba..999838f2 100644 --- a/services/channel/include/dcamera_softbus_adapter.h +++ b/services/channel/include/dcamera_softbus_adapter.h @@ -70,7 +70,6 @@ private: int32_t DCameraSoftbusSourceGetSession(int32_t sessionId, std::shared_ptr& session); int32_t DCameraSoftbusSinkGetSession(int32_t sessionId, std::shared_ptr& session); int32_t DCameraSoftbusGetSessionById(int32_t sessionId, std::shared_ptr& session); - void ReportSoftbusSessionFail(std::string mySessName, std::string peerSessName, std::string peerDevId); private: std::mutex optLock_; diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index be63b93e..212db477 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -15,14 +15,13 @@ #include "dcamera_softbus_adapter.h" -#include #include -#include "hisysevent.h" #include "softbus_bus_center.h" #include "softbus_common.h" #include "anonymous_string.h" +#include "dcamera_hisysevent_adapter.h" #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" #include "distributed_hardware_log.h" @@ -127,18 +126,7 @@ int32_t DCameraSoftbusAdapter::CreateSoftbusSessionServer(std::string sessionNam int32_t ret = CreateSessionServer(PKG_NAME.c_str(), sessionName.c_str(), &sessListeners_[role]); if (ret != DCAMERA_OK) { DHLOGE("DCameraSoftbusAdapter CreateSessionServer failed, ret: %d", ret); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "SOFTBUS_SESSIONSERVER_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "PKGNAME", PKG_NAME.c_str(), - "SESSIONNAME", sessionName.c_str(), - "MSG", "create session server failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } + ReportSoftbusSessionServerFail(PKG_NAME, sessionName, "create session server failed"); return ret; } sessionTotal_[sessionName]++; @@ -211,30 +199,12 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s int32_t sessionId = OpenSession(mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str(), "0", &attr); if (sessionId < 0) { DHLOGE("DCameraSoftbusAdapter OpenSoftbusSession failed %d", sessionId); - ReportSoftbusSessionFail(mySessName, peerSessName, peerDevId); + ReportSoftbusSessionFail(mySessName, peerSessName, peerDevId, "open softbus session failed."); return DCAMERA_BAD_OPERATE; } return DCAMERA_OK; } -void DCameraSoftbusAdapter::ReportSoftbusSessionFail(std::string mySessName, - std::string peerSessName, std::string peerDevId) -{ - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "SOFTBUS_SESSION_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MYSESSIONNAME", mySessName.c_str(), - "PEERSESSIONNAME", peerSessName.c_str(), - "PEERDEVID", peerDevId.c_str(), - "MSG", "open softbus session failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } -} - int32_t DCameraSoftbusAdapter::CloseSoftbusSession(int32_t sessionId) { DHLOGI("close softbus sessionId: %d", sessionId); diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn index 3dfa78ae..9197293b 100644 --- a/services/data_process/BUILD.gn +++ b/services/data_process/BUILD.gn @@ -84,7 +84,6 @@ ohos_shared_library("distributed_camera_data_process") { external_deps = [ "eventhandler:libeventhandler", - "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "multimedia_media_standard:media_client", ] diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp index 118f83b5..04931848 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp @@ -15,16 +15,20 @@ #include "decode_data_process.h" -#include "hisysevent.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" +#include "dcamera_hisysevent_adapter.h" #include "dcamera_utils_tools.h" #include "decode_surface_listener.h" #include "decode_video_callback.h" namespace OHOS { namespace DistributedHardware { +const string ENUM_VIDEOFORMAT_STRINGS[] = { + "YUVI420", "NV12", "NV21", "RGBA_8888" +}; + DecodeDataProcess::~DecodeDataProcess() { if (isDecoderProcess_.load()) { @@ -107,6 +111,9 @@ int32_t DecodeDataProcess::InitDecoder() ret = StartVideoDecoder(); if (ret != DCAMERA_OK) { DHLOGE("Start Video decoder failed."); + ReportStartVideoDecoderFail(sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())], + "start video decoder failed."); return ret; } return DCAMERA_OK; @@ -233,16 +240,6 @@ int32_t DecodeDataProcess::StartVideoDecoder() ret = videoDecoder_->Start(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("Video decoder start failed. Error code %d.", ret); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "VIDEO_DECODER_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "video decoder start failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -264,16 +261,6 @@ int32_t DecodeDataProcess::StopVideoDecoder() ret = videoDecoder_->Stop(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("VideoDecoder stop failed. Error type: %d.", ret); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "VIDEO_DECODER_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "video decoder stop failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } isSuccess = isSuccess && false; } if (!isSuccess) { @@ -294,6 +281,7 @@ void DecodeDataProcess::ReleaseVideoDecoder() int32_t ret = StopVideoDecoder(); if (ret != DCAMERA_OK) { DHLOGE("StopVideoDecoder failed."); + ReportStopVideoDecoderFail("stop video decoder failed."); } ret = videoDecoder_->Release(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp index dacc7236..3db9cd51 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp @@ -15,16 +15,20 @@ #include "decode_data_process.h" -#include "hisysevent.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" +#include "dcamera_hisysevent_adapter.h" #include "dcamera_utils_tools.h" #include "decode_surface_listener.h" #include "decode_video_callback.h" namespace OHOS { namespace DistributedHardware { +const string ENUM_VIDEOFORMAT_STRINGS[] = { + "YUVI420", "NV12", "NV21", "RGBA_8888" +}; + DecodeDataProcess::~DecodeDataProcess() { if (isDecoderProcess_.load()) { @@ -107,6 +111,9 @@ int32_t DecodeDataProcess::InitDecoder() ret = StartVideoDecoder(); if (ret != DCAMERA_OK) { DHLOGE("Start Video decoder failed."); + ReportStartVideoDecoderFail(sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())], + "start video decoder failed."); return ret; } return DCAMERA_OK; @@ -221,16 +228,6 @@ int32_t DecodeDataProcess::StartVideoDecoder() ret = videoDecoder_->Start(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("Video decoder start failed. Error code %d.", ret); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "VIDEO_DECODER_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "video decoder start failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -253,16 +250,6 @@ int32_t DecodeDataProcess::StopVideoDecoder() ret = videoDecoder_->Stop(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("VideoDecoder stop failed. Error type: %d.", ret); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "VIDEO_DECODER_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "video decoder stop failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } isSuccess = isSuccess && false; } if (!isSuccess) { @@ -283,6 +270,7 @@ void DecodeDataProcess::ReleaseVideoDecoder() int32_t ret = StopVideoDecoder(); if (ret != DCAMERA_OK) { DHLOGE("StopVideoDecoder failed."); + ReportStopVideoDecoderFail("stop video decoder failed."); } ret = videoDecoder_->Release(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp index 8a97cf68..5e999c66 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp @@ -16,13 +16,12 @@ #include "encode_data_process.h" #include -#include -#include "hisysevent.h" #include "display_type.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" +#include "dcamera_hisysevent_adapter.h" #include "dcamera_utils_tools.h" #include "encode_video_callback.h" @@ -44,6 +43,9 @@ const std::map EncodeDataProcess::ENCODER_BITRATE_TABLE = { std::map::value_type(WIDTH_1440_HEIGHT_1080, BITRATE_5000000), std::map::value_type(WIDTH_1920_HEIGHT_1080, BITRATE_6000000), }; +const string ENUM_VIDEOFORMAT_STRINGS[] = { + "YUVI420", "NV12", "NV21", "RGBA_8888" +}; EncodeDataProcess::~EncodeDataProcess() { @@ -114,6 +116,9 @@ int32_t EncodeDataProcess::InitEncoder() ret = StartVideoEncoder(); if (ret != DCAMERA_OK) { DHLOGE("Start Video encoder failed."); + ReportStartVideoEncoderFail(sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())], + "start video encoder failed."); return ret; } @@ -257,16 +262,6 @@ int32_t EncodeDataProcess::StartVideoEncoder() ret = videoEncoder_->Start(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("Video encoder start failed. Error code %d.", ret); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "VIDEO_ENCODER_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "video encoder start failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -288,16 +283,6 @@ int32_t EncodeDataProcess::StopVideoEncoder() ret = videoEncoder_->Stop(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("VideoEncoder stop failed. Error type: %d.", ret); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "VIDEO_ENCODER_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "video encoder stop failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } isSuccess = isSuccess && false; } @@ -321,6 +306,7 @@ void EncodeDataProcess::ReleaseVideoEncoder() int32_t ret = StopVideoEncoder(); if (ret != DCAMERA_OK) { DHLOGE("StopVideoEncoder failed."); + ReportStopVideoEncoderFail("stop video encoder failed."); } ret = videoEncoder_->Release(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp index ea82476f..e8b5e5be 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp @@ -16,13 +16,12 @@ #include "encode_data_process.h" #include -#include #include "display_type.h" #include "distributed_hardware_log.h" #include "graphic_common_c.h" -#include "hisysevent.h" +#include "dcamera_hisysevent_adapter.h" #include "dcamera_utils_tools.h" #include "encode_video_callback.h" @@ -44,6 +43,9 @@ const std::map EncodeDataProcess::ENCODER_BITRATE_TABLE = { std::map::value_type(WIDTH_1440_HEIGHT_1080, BITRATE_5000000), std::map::value_type(WIDTH_1920_HEIGHT_1080, BITRATE_6000000), }; +const string ENUM_VIDEOFORMAT_STRINGS[] = { + "YUVI420", "NV12", "NV21", "RGBA_8888" +}; EncodeDataProcess::~EncodeDataProcess() { @@ -114,6 +116,9 @@ int32_t EncodeDataProcess::InitEncoder() ret = StartVideoEncoder(); if (ret != DCAMERA_OK) { DHLOGE("Start Video encoder failed."); + ReportStartVideoEncoderFail(sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())], + "start video encoder failed."); return ret; } @@ -229,16 +234,6 @@ int32_t EncodeDataProcess::StartVideoEncoder() ret = videoEncoder_->Start(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("Video encoder start failed. Error code %d.", ret); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "VIDEO_ENCODER_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "video encoder start failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -260,16 +255,6 @@ int32_t EncodeDataProcess::StopVideoEncoder() ret = videoEncoder_->Stop(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { DHLOGE("VideoEncoder stop failed. Error type: %d.", ret); - int32_t retVal = OHOS::HiviewDFX::HiSysEvent::Write( - OHOS::HiviewDFX::HiSysEvent::Domain::DISTRIBUTED_CAMERA, - "VIDEO_ENCODER_ERROR", - OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, - "PID", getpid(), - "UID", getuid(), - "MSG", "video encoder stop failed."); - if (retVal != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, retVal:%d", retVal); - } isSuccess = isSuccess && false; } @@ -293,6 +278,7 @@ void EncodeDataProcess::ReleaseVideoEncoder() int32_t ret = StopVideoEncoder(); if (ret != DCAMERA_OK) { DHLOGE("StopVideoEncoder failed."); + ReportStopVideoEncoderFail("stop video encoder failed."); } ret = videoEncoder_->Release(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { -- Gitee From 7c28d6da6e6d3343e2a4a783b59f458aeda0bc47 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Sat, 28 May 2022 18:12:41 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0hisysevent=E6=89=93?= =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen0088 --- common/include/utils/dcamera_hisysevent_adapter.h | 2 +- common/src/utils/dcamera_hisysevent_adapter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/include/utils/dcamera_hisysevent_adapter.h b/common/include/utils/dcamera_hisysevent_adapter.h index 2a92a846..0a85c955 100644 --- a/common/include/utils/dcamera_hisysevent_adapter.h +++ b/common/include/utils/dcamera_hisysevent_adapter.h @@ -24,7 +24,7 @@ void ReportLoadSaFail(int32_t saId, const std::string& errMsg); void ReportHDFFail(const std::string& errMsg); void ReportRegisterHardwareFail(const std::string& devId, const std::string& dhId, std::string version, const std::string& errMsg); -void ReportSoftbusSessionServerFail(const std::string pkgName, std::string sessionName, const std::string& errMsg); +void ReportSoftbusSessionServerFail(const std::string& pkgName, std::string sessionName, const std::string& errMsg); void ReportSoftbusSessionFail(std::string mySessName, std::string peerSessName, std::string peerDevId, const std::string& errMsg); void ReportCameraOperaterFail(const std::string& dhId, const std::string& errMsg); diff --git a/common/src/utils/dcamera_hisysevent_adapter.cpp b/common/src/utils/dcamera_hisysevent_adapter.cpp index 01618c91..b2989861 100644 --- a/common/src/utils/dcamera_hisysevent_adapter.cpp +++ b/common/src/utils/dcamera_hisysevent_adapter.cpp @@ -65,7 +65,7 @@ void ReportRegisterHardwareFail(const std::string& devId, const std::string& dhI } } -void ReportSoftbusSessionServerFail(const std::string pkgName, std::string sessionName, const std::string& errMsg) +void ReportSoftbusSessionServerFail(const std::string& pkgName, std::string sessionName, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, "SOFTBUS_SESSIONSERVER_ERROR", -- Gitee From 366666cb7fddafdfca6f0f7b7196623ee7d9c22b Mon Sep 17 00:00:00 2001 From: chen0088 Date: Mon, 30 May 2022 17:25:33 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0hisysevent=E6=89=93?= =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen0088 --- .../utils/dcamera_hisysevent_adapter.h | 24 ++++++++++--- .../src/utils/dcamera_hisysevent_adapter.cpp | 36 ++++++++++--------- .../dcamera_source_dev.cpp | 31 +++++++++------- 3 files changed, 58 insertions(+), 33 deletions(-) diff --git a/common/include/utils/dcamera_hisysevent_adapter.h b/common/include/utils/dcamera_hisysevent_adapter.h index 0a85c955..ecc873ad 100644 --- a/common/include/utils/dcamera_hisysevent_adapter.h +++ b/common/include/utils/dcamera_hisysevent_adapter.h @@ -20,6 +20,24 @@ namespace OHOS { namespace DistributedHardware { +using EventStreamInfo = struct _EventStreamInfo { + int32_t streamId_; + int32_t width_; + int32_t height_; + int32_t format_; + int32_t encodeType_; + int32_t type_; +}; + +using EventCaptureInfo = struct _EventCaptureInfo { + int32_t width_; + int32_t height_; + int32_t format_; + bool isCapture_; + int32_t encodeType_; + int32_t type_; +}; + void ReportLoadSaFail(int32_t saId, const std::string& errMsg); void ReportHDFFail(const std::string& errMsg); void ReportRegisterHardwareFail(const std::string& devId, const std::string& dhId, @@ -41,11 +59,9 @@ void ReportRegisterCameraEvent(const std::string& devId, const std::string& dhId void ReportUnRegisterCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg); void ReportOpenCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg); void ReportCloseCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg); -void ReportConfigStreamsEvent(int32_t streamId, int32_t width, int32_t height, int32_t format, - std::string encodeType, std::string streamType, const std::string& errMsg); +void ReportConfigStreamsEvent(EventStreamInfo& streamInfo, const std::string& errMsg); void ReportReleaseStreamsEvent(int32_t streamId, const std::string& errMsg); -void ReportStartCaptureEvent(int32_t width, int32_t height, int32_t format, std::string isCapture, - std::string encodeType, std::string streamType, const std::string& errMsg); +void ReportStartCaptureEvent(EventCaptureInfo& capture, const std::string& errMsg); void ReportStopCaptureEvent(int32_t streamId, const std::string& errMsg); } // namespace DistributedHardware } // namespace OHOS diff --git a/common/src/utils/dcamera_hisysevent_adapter.cpp b/common/src/utils/dcamera_hisysevent_adapter.cpp index b2989861..323f8371 100644 --- a/common/src/utils/dcamera_hisysevent_adapter.cpp +++ b/common/src/utils/dcamera_hisysevent_adapter.cpp @@ -24,6 +24,12 @@ namespace DistributedHardware { namespace { using HiSysEventNameSpace = OHOS::HiviewDFX::HiSysEvent; const std::string DOMAIN_STR = std::string(HiSysEventNameSpace::Domain::DISTRIBUTED_CAMERA); +const std::string ENUM_STREAMTYPE_STRINGS[] = { + "CONTINUOUS_FRAME", "SNAPSHOT_FRAME" +}; +const std::string ENUM_ENCODETYPE_STRINGS[] = { + "ENCODE_TYPE_NULL", "ENCODE_TYPE_H264", "ENCODE_TYPE_H265", "ENCODE_TYPE_JPEG" +}; } void ReportLoadSaFail(int32_t saId, const std::string& errMsg) @@ -254,18 +260,17 @@ void ReportCloseCameraEvent(const std::string& devId, const std::string& dhId, c } } -void ReportConfigStreamsEvent(int32_t streamId, int32_t width, int32_t height, int32_t format, - std::string encodeType, std::string streamType, const std::string& errMsg) +void ReportConfigStreamsEvent(EventStreamInfo& streamInfo, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, "CONFIG_STREAMS_EVENT", HiSysEventNameSpace::EventType::BEHAVIOR, - "STREAMID", streamId, - "WIDTH", width, - "HEIGHT", height, - "FORMAT", format, - "ENCODETYPE", encodeType, - "STREAMTYPE", streamType, + "STREAMID", streamInfo.streamId_, + "WIDTH", streamInfo.width_, + "HEIGHT", streamInfo.height_, + "FORMAT", streamInfo.format_, + "ENCODETYPE", ENUM_ENCODETYPE_STRINGS[streamInfo.encodeType_], + "STREAMTYPE", ENUM_STREAMTYPE_STRINGS[streamInfo.type_], "MSG", errMsg); if (ret != DCAMERA_OK) { DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); @@ -284,18 +289,17 @@ void ReportReleaseStreamsEvent(int32_t streamId, const std::string& errMsg) } } -void ReportStartCaptureEvent(int32_t width, int32_t height, int32_t format, std::string isCapture, - std::string encodeType, std::string streamType, const std::string& errMsg) +void ReportStartCaptureEvent(EventCaptureInfo& capture, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, "START_CAPTURE_EVENT", HiSysEventNameSpace::EventType::BEHAVIOR, - "WIDTH", width, - "HEIGHT", height, - "FORMAT", format, - "ISCAPTURE", isCapture, - "ENCODETYPE", encodeType, - "STREAMTYPE", streamType, + "WIDTH", capture.width_, + "HEIGHT", capture.height_, + "FORMAT", capture.format_, + "ISCAPTURE", capture.isCapture_ ? "true" : "false", + "ENCODETYPE", ENUM_ENCODETYPE_STRINGS[capture.encodeType_], + "STREAMTYPE", ENUM_STREAMTYPE_STRINGS[capture.type_], "MSG", errMsg); if (ret != DCAMERA_OK) { DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index bfd76254..af7abc75 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -30,13 +30,6 @@ namespace OHOS { namespace DistributedHardware { -const string ENUM_STREAMTYPE_STRINGS[] = { - "CONTINUOUS_FRAME", "SNAPSHOT_FRAME" -}; -const string ENUM_ENCODETYPE_STRINGS[] = { - "ENCODE_TYPE_NULL", "ENCODE_TYPE_H264", "ENCODE_TYPE_H265", "ENCODE_TYPE_JPEG" -}; - DCameraSourceDev::DCameraSourceDev(std::string devId, std::string dhId, std::shared_ptr& stateLisener) : devId_(devId), dhId_(dhId), stateListener_(stateLisener) { @@ -345,9 +338,15 @@ int32_t DCameraSourceDev::ExecuteConfigStreams(std::vector streamInfo = *iter; - ReportConfigStreamsEvent(streamInfo->streamId_, streamInfo->width_, streamInfo->height_, streamInfo->format_, - ENUM_ENCODETYPE_STRINGS[streamInfo->encodeType_], ENUM_STREAMTYPE_STRINGS[streamInfo->type_], - "execute config streams event."); + EventStreamInfo eventStreamInfo = { + .streamId_ = streamInfo->streamId_, + .width_ = streamInfo->width_, + .height_ = streamInfo->height_, + .format_ = streamInfo->format_, + .encodeType_ = streamInfo->encodeType_, + .type_ = streamInfo->type_, + }; + ReportConfigStreamsEvent(eventStreamInfo, "execute config streams event."); } int32_t ret = input_->ConfigStreams(streamInfos); if (ret != DCAMERA_OK) { @@ -439,9 +438,15 @@ int32_t DCameraSourceDev::ExecuteStartCapture(std::vectorcaptureSettings_.size(), capture->width_, capture->height_, capture->format_, capture->isCapture_ ? 1 : 0, capture->encodeType_, capture->streamType_); - ReportStartCaptureEvent(capture->width_, capture->height_, capture->format_, - capture->isCapture_ ? "true" : "false", ENUM_ENCODETYPE_STRINGS[capture->encodeType_], - ENUM_STREAMTYPE_STRINGS[capture->streamType_], "execute start capture event."); + EventCaptureInfo eventCaptureInfo = { + .width_ = capture->width_, + .height_ = capture->height_, + .format_ = capture->format_, + .isCapture_ = capture->isCapture_, + .encodeType_ = capture->encodeType_, + .type_ = capture->streamType_, + }; + ReportStartCaptureEvent(eventCaptureInfo, "execute start capture event."); for (auto settingIter = (*iter)->captureSettings_.begin(); settingIter != (*iter)->captureSettings_.end(); settingIter++) { std::shared_ptr setting = std::make_shared(); -- Gitee From 430126cddddf3d865b45df2e0c818c420f879949 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Tue, 31 May 2022 16:27:46 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0hisysevent=E6=89=93?= =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen0088 --- .../utils/dcamera_hisysevent_adapter.h | 14 ++-- .../src/utils/dcamera_hisysevent_adapter.cpp | 65 +++---------------- hisysevent.yaml | 2 + .../camera_sink/src/dcamera_sink_handler.cpp | 4 +- .../src/dcamera_source_handler.cpp | 4 +- .../distributed_camera_source_service.cpp | 4 +- .../dcamera_source_dev.cpp | 10 +-- 7 files changed, 29 insertions(+), 74 deletions(-) diff --git a/common/include/utils/dcamera_hisysevent_adapter.h b/common/include/utils/dcamera_hisysevent_adapter.h index ecc873ad..e49bb3e5 100644 --- a/common/include/utils/dcamera_hisysevent_adapter.h +++ b/common/include/utils/dcamera_hisysevent_adapter.h @@ -50,15 +50,13 @@ void ReportStartVideoEncoderFail(int32_t width, int32_t height, std::string form void ReportStopVideoEncoderFail(const std::string& errMsg); void ReportStartVideoDecoderFail(int32_t width, int32_t height, std::string format, const std::string& errMsg); void ReportStopVideoDecoderFail(const std::string& errMsg); -void ReportInitSaEvent(int32_t saId, const std::string& errMsg); -void ReportReleaseSaEvent(const std::string& errMsg); -void ReportLoadHDFEvent(const std::string& errMsg); -void ReportUnLoadHDFEvent(const std::string& errMsg); -void ReportRegisterCameraEvent(const std::string& devId, const std::string& dhId, + +void ReportSaEvent(const std::string eventName, int32_t saId, const std::string& errMsg); +void ReportHDFEvent(const std::string eventName, const std::string& errMsg); +void ReportRegisterCameraEvent(const std::string eventName, const std::string& devId, const std::string& dhId, std::string version, const std::string& errMsg); -void ReportUnRegisterCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg); -void ReportOpenCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg); -void ReportCloseCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg); +void ReportCameraOperaterEvent(const std::string eventName, const std::string& devId, const std::string& dhId, + const std::string& errMsg); void ReportConfigStreamsEvent(EventStreamInfo& streamInfo, const std::string& errMsg); void ReportReleaseStreamsEvent(int32_t streamId, const std::string& errMsg); void ReportStartCaptureEvent(EventCaptureInfo& capture, const std::string& errMsg); diff --git a/common/src/utils/dcamera_hisysevent_adapter.cpp b/common/src/utils/dcamera_hisysevent_adapter.cpp index 323f8371..4709f893 100644 --- a/common/src/utils/dcamera_hisysevent_adapter.cpp +++ b/common/src/utils/dcamera_hisysevent_adapter.cpp @@ -161,10 +161,10 @@ void ReportStopVideoDecoderFail(const std::string& errMsg) } } -void ReportInitSaEvent(int32_t saId, const std::string& errMsg) +void ReportSaEvent(const std::string eventName, int32_t saId, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "INIT_SA_EVENT", + eventName, HiSysEventNameSpace::EventType::BEHAVIOR, "SAID", saId, "MSG", errMsg); @@ -173,10 +173,10 @@ void ReportInitSaEvent(int32_t saId, const std::string& errMsg) } } -void ReportReleaseSaEvent(const std::string& errMsg) +void ReportHDFEvent(const std::string eventName, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "RELEASE_SA_EVENT", + eventName, HiSysEventNameSpace::EventType::BEHAVIOR, "MSG", errMsg); if (ret != DCAMERA_OK) { @@ -184,33 +184,11 @@ void ReportReleaseSaEvent(const std::string& errMsg) } } -void ReportLoadHDFEvent(const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "LOAD_HDF_EVENT", - HiSysEventNameSpace::EventType::BEHAVIOR, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} - -void ReportUnLoadHDFEvent(const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "UNLOAD_HDF_EVENT", - HiSysEventNameSpace::EventType::BEHAVIOR, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} - -void ReportRegisterCameraEvent(const std::string& devId, const std::string& dhId, +void ReportRegisterCameraEvent(const std::string eventName, const std::string& devId, const std::string& dhId, std::string version, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "REGIST_CAMERA_EVENT", + eventName, HiSysEventNameSpace::EventType::BEHAVIOR, "DEVID", devId, "DHID", dhId, @@ -221,36 +199,11 @@ void ReportRegisterCameraEvent(const std::string& devId, const std::string& dhId } } -void ReportUnRegisterCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "UNREGIST_CAMERA_EVENT", - HiSysEventNameSpace::EventType::BEHAVIOR, - "DEVID", devId, - "DHID", dhId, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} - -void ReportOpenCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "OPEN_CAMERA_EVENT", - HiSysEventNameSpace::EventType::BEHAVIOR, - "DEVID", devId, - "DHID", dhId, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} - -void ReportCloseCameraEvent(const std::string& devId, const std::string& dhId, const std::string& errMsg) +void ReportCameraOperaterEvent(const std::string eventName, const std::string& devId, const std::string& dhId, + const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "CLOSE_CAMERA_EVENT", + eventName, HiSysEventNameSpace::EventType::BEHAVIOR, "DEVID", devId, "DHID", dhId, diff --git a/hisysevent.yaml b/hisysevent.yaml index 825137aa..0f76fa36 100644 --- a/hisysevent.yaml +++ b/hisysevent.yaml @@ -102,6 +102,7 @@ INIT_SA_EVENT: RELEASE_SA_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera release sa event} + SAID: {type: INT32, desc: dcamera SAID} MSG: {type: STRING, desc: dcamera release sa event} LOAD_HDF_EVENT: @@ -123,6 +124,7 @@ UNREGIST_CAMERA_EVENT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera unregister event} DEVID: {type: STRING, desc: dcamera devId} DHID: {type: STRING, desc: dcamera dhId} + VERSION: {type: STRING, desc: dcamera version} MSG: {type: STRING, desc: dcamera unregister event} OPEN_CAMERA_EVENT: diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp index 5fca8cde..d002dcfd 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp @@ -42,7 +42,7 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } - ReportInitSaEvent(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "init sink sa event."); + ReportSaEvent("INIT_SA_EVENT", DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "init sink sa event."); sptr loadCallback = new DCameraSinkLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, loadCallback); if (ret != DCAMERA_OK) { @@ -93,7 +93,7 @@ int32_t DCameraSinkHandler::ReleaseSink() return DCAMERA_BAD_VALUE; } - ReportReleaseSaEvent("release sink sa event."); + ReportSaEvent("RELEASE_SA_EVENT", DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "release sink sa event."); int32_t ret = dCameraSinkSrv->ReleaseSink(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSinkHandler::ReleaseSink sink service release failed, ret: %d", ret); diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp index 2b29c89d..6b16dc82 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp @@ -44,7 +44,7 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } - ReportInitSaEvent(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "init source sa event."); + ReportSaEvent("INIT_SA_EVENT", DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "init source sa event."); sptr loadCallback = new DCameraSourceLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, loadCallback); if (ret != DCAMERA_OK) { @@ -100,7 +100,7 @@ int32_t DCameraSourceHandler::ReleaseSource() DHLOGE("DCameraSourceHandler ReleaseSource get Service failed"); return DCAMERA_INIT_ERR; } - ReportReleaseSaEvent("release source sa event."); + ReportSaEvent("RELEASE_SA_EVENT", DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "release source sa event."); dCameraSourceSrv->ReleaseSource(); DCameraSourceHandlerIpc::GetInstance().UnInit(); std::unique_lock lock(producerMutex_); 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 94175ff2..05f3cd26 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -88,7 +88,7 @@ int32_t DistributedCameraSourceService::InitSource(const std::string& params, const sptr& callback) { DHLOGI("DistributedCameraSourceService InitSource param: %s", params.c_str()); - ReportLoadHDFEvent("load dcamera hdf event."); + ReportHDFEvent("LOAD_HDF_EVENT", "load dcamera hdf event."); int32_t ret = LoadDCameraHDF(); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService InitSource LoadHDF failed, ret: %d", ret); @@ -102,7 +102,7 @@ int32_t DistributedCameraSourceService::InitSource(const std::string& params, int32_t DistributedCameraSourceService::ReleaseSource() { DHLOGI("DistributedCameraSourceService ReleaseSource"); - ReportUnLoadHDFEvent("unload dcamera hdf event."); + ReportHDFEvent("UNLOAD_HDF_EVENT", "unload dcamera hdf event."); int32_t ret = UnLoadCameraHDF(); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService ReleaseSource UnLoadHDF failed, ret: %d", ret); diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index af7abc75..ca05b312 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -216,7 +216,8 @@ int32_t DCameraSourceDev::ExecuteRegister(std::shared_ptr& p { DHLOGI("DCameraSourceDev Execute Register devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - ReportRegisterCameraEvent(GetAnonyString(devId_), dhId_, version_, "execute register event."); + ReportRegisterCameraEvent("REGIST_CAMERA_EVENT", GetAnonyString(devId_), dhId_, + version_, "execute register event."); std::vector actualDevInfo; actualDevInfo.assign(actualDevInfo_.begin(), actualDevInfo_.end()); int32_t ret = controller_->Init(actualDevInfo); @@ -260,7 +261,8 @@ int32_t DCameraSourceDev::ExecuteUnRegister(std::shared_ptr& { DHLOGI("DCameraSourceDev Execute UnRegister devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - ReportUnRegisterCameraEvent(GetAnonyString(devId_), dhId_, "execute unregister event."); + ReportRegisterCameraEvent("UNREGIST_CAMERA_EVENT", GetAnonyString(devId_), dhId_, + version_, "execute unregister event."); int32_t ret = controller_->UnInit(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute UnRegister controller uninit failed, ret: %d, devId: %s dhId: %s", ret, @@ -296,7 +298,7 @@ int32_t DCameraSourceDev::ExecuteOpenCamera() { DHLOGI("DCameraSourceDev Execute OpenCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - ReportOpenCameraEvent(GetAnonyString(devId_), dhId_, "execute open camera event."); + ReportCameraOperaterEvent("OPEN_CAMERA_EVENT", GetAnonyString(devId_), dhId_, "execute open camera event."); std::shared_ptr openInfo = std::make_shared(); int32_t ret = GetLocalDeviceNetworkId(openInfo->sourceDevId_); if (ret != DCAMERA_OK) { @@ -318,7 +320,7 @@ int32_t DCameraSourceDev::ExecuteCloseCamera() { DHLOGI("DCameraSourceDev Execute CloseCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - ReportCloseCameraEvent(GetAnonyString(devId_), dhId_, "execute close camera event."); + ReportCameraOperaterEvent("CLOSE_CAMERA_EVENT", GetAnonyString(devId_), dhId_, "execute close camera event."); int32_t ret = input_->CloseChannel(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute CloseCamera input CloseChannel failed, ret: %d, devId: %s dhId: %s", ret, -- Gitee From c203f4aa044cba089461ae59b7b2341eda753205 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Wed, 1 Jun 2022 15:09:36 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0hisysevent=E6=89=93?= =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen0088 --- .../utils/dcamera_hisysevent_adapter.h | 53 ++++---- .../src/utils/dcamera_hisysevent_adapter.cpp | 115 ++++-------------- hisysevent.yaml | 88 ++++---------- .../camera_sink/src/dcamera_sink_handler.cpp | 4 +- .../src/dcamera_sink_load_callback.cpp | 2 +- .../src/dcamera_source_handler.cpp | 4 +- .../src/dcamera_source_load_callback.cpp | 2 +- .../distributed_camera_sink_service.cpp | 2 +- .../distributed_camera_source_service.cpp | 7 +- .../dcamera_source_dev.cpp | 28 +---- .../channel/src/dcamera_softbus_adapter.cpp | 6 +- .../decoder/decode_data_process.cpp | 3 +- .../decoder/decode_data_process_common.cpp | 3 +- .../encoder/encode_data_process.cpp | 3 +- .../encoder/encode_data_process_common.cpp | 3 +- 15 files changed, 99 insertions(+), 224 deletions(-) diff --git a/common/include/utils/dcamera_hisysevent_adapter.h b/common/include/utils/dcamera_hisysevent_adapter.h index e49bb3e5..b28c2aac 100644 --- a/common/include/utils/dcamera_hisysevent_adapter.h +++ b/common/include/utils/dcamera_hisysevent_adapter.h @@ -20,14 +20,22 @@ namespace OHOS { namespace DistributedHardware { -using EventStreamInfo = struct _EventStreamInfo { - int32_t streamId_; - int32_t width_; - int32_t height_; - int32_t format_; - int32_t encodeType_; - int32_t type_; -}; +const std::string SA_ERROR = "DCAMERA_SA_START_FAIL"; +const std::string HDF_ERROR = "DCAMERA_HDF_START_FAIL"; +const std::string REGISTER_CAMERA_ERROR = "DCAMERA_REGISTER_FAIL"; +const std::string SOFTBUS_SESSIONSERVER_ERROR = "DCAMERA_CREATE_SESSIONSVR_FAIL"; +const std::string SOFTBUS_SESSION_ERROR = "DCAMERA_OPEN_SESSION_FAIL"; +const std::string SINK_OPEN_CAMERA_ERROR = "DCAMERA_SINK_OPEN_CAM_FAIL"; +const std::string START_VIDEO_ENCODER_ERROR = "DCAMERA_ENCODE_FAIL"; +const std::string START_VIDEO_DECODER_ERROR = "DCAMERA_DECODE_FAIL"; + +const std::string INIT_SA_EVENT = "DCAMERA_INIT"; +const std::string RELEASE_SA_EVENT = "DCAMERA_EXIT"; +const std::string REGIST_CAMERA_EVENT = "DCAMERA_REGISTER"; +const std::string UNREGIST_CAMERA_EVENT = "DCAMERA_UNREGISTER"; +const std::string OPEN_CAMERA_EVENT = "DCAMERA_OPEN"; +const std::string CLOSE_CAMERA_EVENT = "DCAMERA_CLOSE"; +const std::string START_CAPTURE_EVENT = "DCAMERA_CAPTURE"; using EventCaptureInfo = struct _EventCaptureInfo { int32_t width_; @@ -38,29 +46,26 @@ using EventCaptureInfo = struct _EventCaptureInfo { int32_t type_; }; -void ReportLoadSaFail(int32_t saId, const std::string& errMsg); -void ReportHDFFail(const std::string& errMsg); -void ReportRegisterHardwareFail(const std::string& devId, const std::string& dhId, +void ReportStartSaFail(const std::string eventName, int32_t saId, const std::string& errMsg); +void ReportStartHDFFail(const std::string eventName, const std::string& errMsg); +void ReportRegisterCameraFail(const std::string eventName, const std::string& devId, const std::string& dhId, std::string version, const std::string& errMsg); -void ReportSoftbusSessionServerFail(const std::string& pkgName, std::string sessionName, const std::string& errMsg); -void ReportSoftbusSessionFail(std::string mySessName, std::string peerSessName, std::string peerDevId, - const std::string& errMsg); -void ReportCameraOperaterFail(const std::string& dhId, const std::string& errMsg); -void ReportStartVideoEncoderFail(int32_t width, int32_t height, std::string format, const std::string& errMsg); -void ReportStopVideoEncoderFail(const std::string& errMsg); -void ReportStartVideoDecoderFail(int32_t width, int32_t height, std::string format, const std::string& errMsg); -void ReportStopVideoDecoderFail(const std::string& errMsg); +void ReportSoftbusSessionServerFail(const std::string eventName, const std::string& pkgName, + std::string sessionName, const std::string& errMsg); +void ReportSoftbusSessionFail(const std::string eventName, std::string mySessName, + std::string peerSessName, std::string peerDevId, const std::string& errMsg); +void ReportSinkOpenCamFail(const std::string eventName, const std::string& dhId, const std::string& errMsg); +void ReportStartVideoEncoderFail(const std::string eventName, int32_t width, int32_t height, + std::string format, const std::string& errMsg); +void ReportStartVideoDecoderFail(const std::string eventName, int32_t width, int32_t height, + std::string format, const std::string& errMsg); void ReportSaEvent(const std::string eventName, int32_t saId, const std::string& errMsg); -void ReportHDFEvent(const std::string eventName, const std::string& errMsg); void ReportRegisterCameraEvent(const std::string eventName, const std::string& devId, const std::string& dhId, std::string version, const std::string& errMsg); void ReportCameraOperaterEvent(const std::string eventName, const std::string& devId, const std::string& dhId, const std::string& errMsg); -void ReportConfigStreamsEvent(EventStreamInfo& streamInfo, const std::string& errMsg); -void ReportReleaseStreamsEvent(int32_t streamId, const std::string& errMsg); -void ReportStartCaptureEvent(EventCaptureInfo& capture, const std::string& errMsg); -void ReportStopCaptureEvent(int32_t streamId, const std::string& errMsg); +void ReportStartCaptureEvent(const std::string eventName, EventCaptureInfo& capture, const std::string& errMsg); } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DCAMERA_HISYSEVENT_ADAPTER_H \ No newline at end of file diff --git a/common/src/utils/dcamera_hisysevent_adapter.cpp b/common/src/utils/dcamera_hisysevent_adapter.cpp index 4709f893..cd397601 100644 --- a/common/src/utils/dcamera_hisysevent_adapter.cpp +++ b/common/src/utils/dcamera_hisysevent_adapter.cpp @@ -32,10 +32,10 @@ const std::string ENUM_ENCODETYPE_STRINGS[] = { }; } -void ReportLoadSaFail(int32_t saId, const std::string& errMsg) +void ReportStartSaFail(const std::string eventName, int32_t saId, const std::string& errMsg) { int ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "SA_ERROR", + eventName, HiSysEventNameSpace::EventType::FAULT, "SAID", saId, "MSG", errMsg); @@ -44,10 +44,10 @@ void ReportLoadSaFail(int32_t saId, const std::string& errMsg) } } -void ReportHDFFail(const std::string& errMsg) +void ReportStartHDFFail(const std::string eventName, const std::string& errMsg) { int ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "HDF_ERROR", + eventName, HiSysEventNameSpace::EventType::FAULT, "MSG", errMsg); if (ret != DCAMERA_OK) { @@ -55,11 +55,11 @@ void ReportHDFFail(const std::string& errMsg) } } -void ReportRegisterHardwareFail(const std::string& devId, const std::string& dhId, +void ReportRegisterCameraFail(const std::string eventName, const std::string& devId, const std::string& dhId, std::string version, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "REGISTER_HARDWARE_ERROR", + eventName, HiSysEventNameSpace::EventType::FAULT, "DEVID", devId, "DHID", dhId, @@ -71,10 +71,11 @@ void ReportRegisterHardwareFail(const std::string& devId, const std::string& dhI } } -void ReportSoftbusSessionServerFail(const std::string& pkgName, std::string sessionName, const std::string& errMsg) +void ReportSoftbusSessionServerFail(const std::string eventName, const std::string& pkgName, + std::string sessionName, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "SOFTBUS_SESSIONSERVER_ERROR", + eventName, HiSysEventNameSpace::EventType::FAULT, "PKGNAME", pkgName, "SESSIONNAME", sessionName, @@ -84,11 +85,11 @@ void ReportSoftbusSessionServerFail(const std::string& pkgName, std::string sess } } -void ReportSoftbusSessionFail(std::string mySessName, std::string peerSessName, std::string peerDevId, - const std::string& errMsg) +void ReportSoftbusSessionFail(const std::string eventName, std::string mySessName, + std::string peerSessName, std::string peerDevId, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "SOFTBUS_SESSION_ERROR", + eventName, HiSysEventNameSpace::EventType::FAULT, "MYSESSIONNAME", mySessName, "PEERSESSIONNAME", peerSessName, @@ -99,10 +100,10 @@ void ReportSoftbusSessionFail(std::string mySessName, std::string peerSessName, } } -void ReportCameraOperaterFail(const std::string& dhId, const std::string& errMsg) +void ReportSinkOpenCamFail(const std::string eventName, const std::string& dhId, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "CAMERA_OPERATER_ERROR", + eventName, HiSysEventNameSpace::EventType::FAULT, "DHID", dhId, "MSG", errMsg); @@ -111,10 +112,11 @@ void ReportCameraOperaterFail(const std::string& dhId, const std::string& errMsg } } -void ReportStartVideoEncoderFail(int32_t width, int32_t height, std::string format, const std::string& errMsg) +void ReportStartVideoEncoderFail(const std::string eventName, int32_t width, int32_t height, + std::string format, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "START_VIDEO_ENCODER_ERROR", + eventName, HiSysEventNameSpace::EventType::FAULT, "WIDTH", width, "HEIGHT", height, @@ -125,21 +127,11 @@ void ReportStartVideoEncoderFail(int32_t width, int32_t height, std::string form } } -void ReportStopVideoEncoderFail(const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "STOP_VIDEO_ENCODER_ERROR", - HiSysEventNameSpace::EventType::FAULT, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} - -void ReportStartVideoDecoderFail(int32_t width, int32_t height, std::string format, const std::string& errMsg) +void ReportStartVideoDecoderFail(const std::string eventName, int32_t width, int32_t height, + std::string format, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "START_VIDEO_DECODER_ERROR", + eventName, HiSysEventNameSpace::EventType::FAULT, "WIDTH", width, "HEIGHT", height, @@ -150,17 +142,6 @@ void ReportStartVideoDecoderFail(int32_t width, int32_t height, std::string form } } -void ReportStopVideoDecoderFail(const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "STOP_VIDEO_DECODER_ERROR", - HiSysEventNameSpace::EventType::FAULT, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} - void ReportSaEvent(const std::string eventName, int32_t saId, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, @@ -173,17 +154,6 @@ void ReportSaEvent(const std::string eventName, int32_t saId, const std::string& } } -void ReportHDFEvent(const std::string eventName, const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - eventName, - HiSysEventNameSpace::EventType::BEHAVIOR, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} - void ReportRegisterCameraEvent(const std::string eventName, const std::string& devId, const std::string& dhId, std::string version, const std::string& errMsg) { @@ -213,39 +183,10 @@ void ReportCameraOperaterEvent(const std::string eventName, const std::string& d } } -void ReportConfigStreamsEvent(EventStreamInfo& streamInfo, const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "CONFIG_STREAMS_EVENT", - HiSysEventNameSpace::EventType::BEHAVIOR, - "STREAMID", streamInfo.streamId_, - "WIDTH", streamInfo.width_, - "HEIGHT", streamInfo.height_, - "FORMAT", streamInfo.format_, - "ENCODETYPE", ENUM_ENCODETYPE_STRINGS[streamInfo.encodeType_], - "STREAMTYPE", ENUM_STREAMTYPE_STRINGS[streamInfo.type_], - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} - -void ReportReleaseStreamsEvent(int32_t streamId, const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "RELEASE_STREAMS_EVENT", - HiSysEventNameSpace::EventType::BEHAVIOR, - "STREAMID", streamId, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} - -void ReportStartCaptureEvent(EventCaptureInfo& capture, const std::string& errMsg) +void ReportStartCaptureEvent(const std::string eventName, EventCaptureInfo& capture, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "START_CAPTURE_EVENT", + eventName, HiSysEventNameSpace::EventType::BEHAVIOR, "WIDTH", capture.width_, "HEIGHT", capture.height_, @@ -258,17 +199,5 @@ void ReportStartCaptureEvent(EventCaptureInfo& capture, const std::string& errMs DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); } } - -void ReportStopCaptureEvent(int32_t streamId, const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - "STOP_CAPTURE_EVENT", - HiSysEventNameSpace::EventType::BEHAVIOR, - "STREAMID", streamId, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/hisysevent.yaml b/hisysevent.yaml index 0f76fa36..020c4516 100644 --- a/hisysevent.yaml +++ b/hisysevent.yaml @@ -39,132 +39,96 @@ domain: DISTCAMERA -SA_ERROR: - __BASE: {type: FAULT, level: CRITICAL, desc: dcamera sa error occured} +DCAMERA_SA_START_FAIL: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera sa start error occured} SAID: {type: INT32, desc: dcamera SAID} MSG: {type: STRING, desc: dcamera sa error info} -HDF_ERROR: - __BASE: {type: FAULT, level: CRITICAL, desc: dcamera hdf error occured} +DCAMERA_HDF_START_FAIL: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera hdf start error occured} MSG: {type: STRING, desc: dcamera hdf error info} -REGISTER_HARDWARE_ERROR: - __BASE: {type: FAULT, level: CRITICAL, desc: register dcamera error occured} +DCAMERA_REGISTER_FAIL: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera register error occured} DEVID: {type: STRING, desc: dcamera devId} DHID: {type: STRING, desc: dcamera dhId} VERSION: {type: STRING, desc: dcamera version} MSG: {type: STRING, desc: register dcamera error info} -SOFTBUS_SESSIONSERVER_ERROR: - __BASE: {type: FAULT, level: CRITICAL, desc: softbus sessionserver error occured} +DCAMERA_CREATE_SESSIONSVR_FAIL: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera softbus sessionserver error occured} PKGNAME: {type: STRING, desc: softbus package name} SESSIONNAME: {type: STRING, desc: softbus session name} MSG: {type: STRING, desc: dcamera softbus sessionserver error info} -SOFTBUS_SESSION_ERROR: - __BASE: {type: FAULT, level: CRITICAL, desc: softbus session error occured} +DCAMERA_OPEN_SESSION_FAIL: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera softbus session error occured} MYSESSIONNAME: {type: STRING, desc: softbus my session name} PEERSESSIONNAME: {type: STRING, desc: softbus peer session name} PEERDEVID: {type: STRING, desc: peer network id} MSG: {type: STRING, desc: dcamera softbus session error info} -CAMERA_OPERATER_ERROR: - __BASE: {type: FAULT, level: CRITICAL, desc: dcamera operater error occured} +DCAMERA_SINK_OPEN_CAM_FAIL: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera sink open camera error occured} DHID: {type: STRING, desc: dcamera dhId} - MSG: {type: STRING, desc: dcamera operater error info} + MSG: {type: STRING, desc: dcamera sink open camera error info} -START_VIDEO_ENCODER_ERROR: - __BASE: {type: FAULT, level: CRITICAL, desc: video encoder error occured} +DCAMERA_ENCODE_FAIL: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera video encoder error occured} WIDTH: {type: INT32, desc: dcamera width} HEIGHT: {type: INT32, desc: dcamera height} FORMAT: {type: STRING, desc: dcamera FORMAT} MSG: {type: STRING, desc: dcamera video encoder error info} -STOP_VIDEO_ENCODER_ERROR: - __BASE: {type: FAULT, level: CRITICAL, desc: video encoder error occured} - MSG: {type: STRING, desc: dcamera video encoder error info} - -START_VIDEO_DECODER_ERROR: - __BASE: {type: FAULT, level: CRITICAL, desc: video decoder error occured} +DCAMERA_DECODE_FAIL: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera video decoder error occured} WIDTH: {type: INT32, desc: dcamera width} HEIGHT: {type: INT32, desc: dcamera height} FORMAT: {type: STRING, desc: dcamera format} MSG: {type: STRING, desc: dcamera video decoder error info} -STOP_VIDEO_DECODER_ERROR: - __BASE: {type: FAULT, level: CRITICAL, desc: video decoder error occured} - MSG: {type: STRING, desc: dcamera video encoder error info} - -INIT_SA_EVENT: +DCAMERA_INIT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera init sa event} SAID: {type: INT32, desc: dcamera SAID} MSG: {type: STRING, desc: dcamera init sa event} -RELEASE_SA_EVENT: +DCAMERA_EXIT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera release sa event} SAID: {type: INT32, desc: dcamera SAID} MSG: {type: STRING, desc: dcamera release sa event} -LOAD_HDF_EVENT: - __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera load hdf event} - MSG: {type: STRING, desc: dcamera load hdf event} - -UNLOAD_HDF_EVENT: - __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera unload hdf event} - MSG: {type: STRING, desc: dcamera unload hdf event} - -REGIST_CAMERA_EVENT: +DCAMERA_REGISTER: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera register event} DEVID: {type: STRING, desc: dcamera devId} DHID: {type: STRING, desc: dcamera dhId} VERSION: {type: STRING, desc: dcamera version} MSG: {type: STRING, desc: dcamera register event} -UNREGIST_CAMERA_EVENT: +DCAMERA_UNREGISTER: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera unregister event} DEVID: {type: STRING, desc: dcamera devId} DHID: {type: STRING, desc: dcamera dhId} VERSION: {type: STRING, desc: dcamera version} MSG: {type: STRING, desc: dcamera unregister event} -OPEN_CAMERA_EVENT: +DCAMERA_OPEN: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera open event} DEVID: {type: STRING, desc: dcamera devId} DHID: {type: STRING, desc: dcamera dhId} MSG: {type: STRING, desc: dcamera open event} -CLOSE_CAMERA_EVENT: +DCAMERA_CLOSE: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera close event} DEVID: {type: STRING, desc: dcamera devId} DHID: {type: STRING, desc: dcamera dhId} MSG: {type: STRING, desc: dcamera close event} -CONFIG_STREAMS_EVENT: - __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera config streams event} - STREAMID: {type: INT32, desc: dcamera streamId} - WIDTH: {type: INT32, desc: dcamera width} - HEIGHT: {type: INT32, desc: dcamera height} - FORMAT: {type: INT32, desc: dcamera format} - ENCODETYPE: {type: STRING, desc: dcamera encodeType} - STREAMTYPE: {type: STRING, desc: dcamera streamType} - MSG: {type: STRING, desc: dcamera config streams event} - -RELEASE_STREAMS_EVENT: - __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera release streams event} - STREAMID: {type: INT32, desc: dcamera streamId} - MSG: {type: STRING, desc: dcamera release streams event} - -START_CAPTURE_EVENT: - __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera start capture event} +DCAMERA_CAPTURE: + __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera capture event} WIDTH: {type: INT32, desc: dcamera width} HEIGHT: {type: INT32, desc: dcamera height} FORMAT: {type: INT32, desc: dcamera format} ISCAPTURE: {type: STRING, desc: dcamera isCapture} ENCODETYPE: {type: STRING, desc: dcamera encodeType} STREAMTYPE: {type: STRING, desc: dcamera streamType} - MSG: {type: STRING, desc: dcamera start capture event} - -STOP_CAPTURE_EVENT: - __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera stop capture event} - STREAMID: {type: INT32, desc: dcamera streamId} - MSG: {type: STRING, desc: dcamera stop capture event} + MSG: {type: STRING, desc: dcamera capture event} diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp index d002dcfd..9fa16d9a 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp @@ -42,7 +42,7 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } - ReportSaEvent("INIT_SA_EVENT", DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "init sink sa event."); + ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "init sink sa event."); sptr loadCallback = new DCameraSinkLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, loadCallback); if (ret != DCAMERA_OK) { @@ -93,7 +93,7 @@ int32_t DCameraSinkHandler::ReleaseSink() return DCAMERA_BAD_VALUE; } - ReportSaEvent("RELEASE_SA_EVENT", DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "release sink sa event."); + ReportSaEvent(RELEASE_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "release sink sa event."); int32_t ret = dCameraSinkSrv->ReleaseSink(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSinkHandler::ReleaseSink sink service release failed, ret: %d", ret); diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp index a3a8de72..a380242f 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp @@ -44,7 +44,7 @@ void DCameraSinkLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID) { DHLOGE("start aystemabilityId is not sinkSAId!"); - ReportLoadSaFail(systemAbilityId, "dcamera sink OnLoadSystemAbilityFail."); + ReportStartSaFail(SA_ERROR, systemAbilityId, "dcamera sink OnLoadSystemAbilityFail."); return; } DCameraSinkHandler::GetInstance().FinishStartSAFailed(systemAbilityId); diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp index 6b16dc82..4b688c2c 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp @@ -44,7 +44,7 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } - ReportSaEvent("INIT_SA_EVENT", DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "init source sa event."); + ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "init source sa event."); sptr loadCallback = new DCameraSourceLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, loadCallback); if (ret != DCAMERA_OK) { @@ -100,7 +100,7 @@ int32_t DCameraSourceHandler::ReleaseSource() DHLOGE("DCameraSourceHandler ReleaseSource get Service failed"); return DCAMERA_INIT_ERR; } - ReportSaEvent("RELEASE_SA_EVENT", DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "release source sa event."); + ReportSaEvent(RELEASE_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "release source sa event."); dCameraSourceSrv->ReleaseSource(); DCameraSourceHandlerIpc::GetInstance().UnInit(); std::unique_lock lock(producerMutex_); diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp index b5275581..41c7eda4 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp @@ -44,7 +44,7 @@ void DCameraSourceLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID) { DHLOGE("start systemabilityId is not sourceSAId!"); - ReportLoadSaFail(systemAbilityId, "dcamera source OnLoadSystemAbilityFail."); + ReportStartSaFail(SA_ERROR, systemAbilityId, "dcamera source OnLoadSystemAbilityFail."); return; } DCameraSourceHandler::GetInstance().FinishStartSAFailed(systemAbilityId); diff --git a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp index 3065aa99..f637d049 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp @@ -236,7 +236,7 @@ int32_t DistributedCameraSinkService::OpenChannel(const std::string& dhId, std:: int32_t ret = sinkDevice->OpenChannel(openInfo); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSinkService::OpenChannel failed, ret: %d", ret); - ReportCameraOperaterFail(dhId, "sink service open channel failed."); + ReportSinkOpenCamFail(SINK_OPEN_CAMERA_ERROR, dhId, "sink service open channel failed."); return ret; } DHLOGI("DistributedCameraSinkService::OpenChannel success"); 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 05f3cd26..3593a811 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -88,7 +88,6 @@ int32_t DistributedCameraSourceService::InitSource(const std::string& params, const sptr& callback) { DHLOGI("DistributedCameraSourceService InitSource param: %s", params.c_str()); - ReportHDFEvent("LOAD_HDF_EVENT", "load dcamera hdf event."); int32_t ret = LoadDCameraHDF(); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService InitSource LoadHDF failed, ret: %d", ret); @@ -102,7 +101,6 @@ int32_t DistributedCameraSourceService::InitSource(const std::string& params, int32_t DistributedCameraSourceService::ReleaseSource() { DHLOGI("DistributedCameraSourceService ReleaseSource"); - ReportHDFEvent("UNLOAD_HDF_EVENT", "unload dcamera hdf event."); int32_t ret = UnLoadCameraHDF(); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService ReleaseSource UnLoadHDF failed, ret: %d", ret); @@ -145,7 +143,7 @@ int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::s ret = camDev->RegisterDistributedHardware(devId, dhId, reqId, param.version, param.attrs); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService RegisterDistributedHardware failed, ret: %d", ret); - ReportRegisterHardwareFail(GetAnonyString(devId), dhId, param.version, + ReportRegisterCameraFail(REGISTER_CAMERA_ERROR, GetAnonyString(devId), dhId, param.version, "dcamera source RegisterDistributedHardware fail."); camerasMap_.erase(camIndex); } @@ -200,7 +198,7 @@ int32_t DistributedCameraSourceService::LoadDCameraHDF() int32_t ret = DCameraHdfOperate::GetInstance().LoadDcameraHDFImpl(); if (ret != DCAMERA_OK) { DHLOGE("load hdf driver failed, ret %d", ret); - ReportHDFFail("dcamera load hdf driver fail."); + ReportStartHDFFail(HDF_ERROR, "dcamera load hdf driver fail."); return ret; } DHLOGI("load hdf driver end"); @@ -213,7 +211,6 @@ int32_t DistributedCameraSourceService::UnLoadCameraHDF() int32_t ret = DCameraHdfOperate::GetInstance().UnLoadDcameraHDFImpl(); if (ret != DCAMERA_OK) { DHLOGE("unload hdf driver failed, ret %d", ret); - ReportHDFFail("dcamera unload hdf driver fail."); return ret; } DHLOGI("unload hdf driver end"); diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index ca05b312..b8ce763f 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -216,7 +216,7 @@ int32_t DCameraSourceDev::ExecuteRegister(std::shared_ptr& p { DHLOGI("DCameraSourceDev Execute Register devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - ReportRegisterCameraEvent("REGIST_CAMERA_EVENT", GetAnonyString(devId_), dhId_, + ReportRegisterCameraEvent(REGIST_CAMERA_EVENT, GetAnonyString(devId_), dhId_, version_, "execute register event."); std::vector actualDevInfo; actualDevInfo.assign(actualDevInfo_.begin(), actualDevInfo_.end()); @@ -261,7 +261,7 @@ int32_t DCameraSourceDev::ExecuteUnRegister(std::shared_ptr& { DHLOGI("DCameraSourceDev Execute UnRegister devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - ReportRegisterCameraEvent("UNREGIST_CAMERA_EVENT", GetAnonyString(devId_), dhId_, + ReportRegisterCameraEvent(UNREGIST_CAMERA_EVENT, GetAnonyString(devId_), dhId_, version_, "execute unregister event."); int32_t ret = controller_->UnInit(); if (ret != DCAMERA_OK) { @@ -298,7 +298,7 @@ int32_t DCameraSourceDev::ExecuteOpenCamera() { DHLOGI("DCameraSourceDev Execute OpenCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - ReportCameraOperaterEvent("OPEN_CAMERA_EVENT", GetAnonyString(devId_), dhId_, "execute open camera event."); + ReportCameraOperaterEvent(OPEN_CAMERA_EVENT, GetAnonyString(devId_), dhId_, "execute open camera event."); std::shared_ptr openInfo = std::make_shared(); int32_t ret = GetLocalDeviceNetworkId(openInfo->sourceDevId_); if (ret != DCAMERA_OK) { @@ -320,7 +320,7 @@ int32_t DCameraSourceDev::ExecuteCloseCamera() { DHLOGI("DCameraSourceDev Execute CloseCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - ReportCameraOperaterEvent("CLOSE_CAMERA_EVENT", GetAnonyString(devId_), dhId_, "execute close camera event."); + ReportCameraOperaterEvent(CLOSE_CAMERA_EVENT, GetAnonyString(devId_), dhId_, "execute close camera event."); int32_t ret = input_->CloseChannel(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute CloseCamera input CloseChannel failed, ret: %d, devId: %s dhId: %s", ret, @@ -338,18 +338,6 @@ int32_t DCameraSourceDev::ExecuteConfigStreams(std::vector streamInfo = *iter; - EventStreamInfo eventStreamInfo = { - .streamId_ = streamInfo->streamId_, - .width_ = streamInfo->width_, - .height_ = streamInfo->height_, - .format_ = streamInfo->format_, - .encodeType_ = streamInfo->encodeType_, - .type_ = streamInfo->type_, - }; - ReportConfigStreamsEvent(eventStreamInfo, "execute config streams event."); - } int32_t ret = input_->ConfigStreams(streamInfos); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute ConfigStreams ConfigStreams failed, ret: %d, devId: %s dhId: %s", ret, @@ -391,9 +379,6 @@ int32_t DCameraSourceDev::ExecuteReleaseStreams(std::vector& streamIds, boo { DHLOGI("DCameraSourceDev Execute ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - for (auto iter = streamIds.begin(); iter != streamIds.end(); iter++) { - ReportReleaseStreamsEvent(*iter, "execute release streams event."); - } int32_t ret = input_->ReleaseStreams(streamIds, isAllRelease); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute ReleaseStreams failed ret: %d, devId: %s, dhId: %s", ret, @@ -448,7 +433,7 @@ int32_t DCameraSourceDev::ExecuteStartCapture(std::vectorencodeType_, .type_ = capture->streamType_, }; - ReportStartCaptureEvent(eventCaptureInfo, "execute start capture event."); + ReportStartCaptureEvent(START_CAPTURE_EVENT, eventCaptureInfo, "execute start capture event."); for (auto settingIter = (*iter)->captureSettings_.begin(); settingIter != (*iter)->captureSettings_.end(); settingIter++) { std::shared_ptr setting = std::make_shared(); @@ -471,9 +456,6 @@ int32_t DCameraSourceDev::ExecuteStopCapture(std::vector& streamIds, bool& { DHLOGI("DCameraSourceDev Execute StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - for (auto iter = streamIds.begin(); iter != streamIds.end(); iter++) { - ReportStopCaptureEvent(*iter, "execute stop capture event."); - } int32_t ret = input_->StopCapture(streamIds, isAllStop); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute StopCapture input StopCapture failed, ret: %d, devId: %s dhId: %s", ret, diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 212db477..92a71244 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -126,7 +126,8 @@ int32_t DCameraSoftbusAdapter::CreateSoftbusSessionServer(std::string sessionNam int32_t ret = CreateSessionServer(PKG_NAME.c_str(), sessionName.c_str(), &sessListeners_[role]); if (ret != DCAMERA_OK) { DHLOGE("DCameraSoftbusAdapter CreateSessionServer failed, ret: %d", ret); - ReportSoftbusSessionServerFail(PKG_NAME, sessionName, "create session server failed"); + ReportSoftbusSessionServerFail(SOFTBUS_SESSIONSERVER_ERROR, PKG_NAME, + sessionName, "create session server failed"); return ret; } sessionTotal_[sessionName]++; @@ -199,7 +200,8 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s int32_t sessionId = OpenSession(mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str(), "0", &attr); if (sessionId < 0) { DHLOGE("DCameraSoftbusAdapter OpenSoftbusSession failed %d", sessionId); - ReportSoftbusSessionFail(mySessName, peerSessName, peerDevId, "open softbus session failed."); + ReportSoftbusSessionFail(SOFTBUS_SESSION_ERROR, mySessName, peerSessName, + peerDevId, "open softbus session failed."); return DCAMERA_BAD_OPERATE; } return DCAMERA_OK; diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp index 04931848..85de2742 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp @@ -111,7 +111,7 @@ int32_t DecodeDataProcess::InitDecoder() ret = StartVideoDecoder(); if (ret != DCAMERA_OK) { DHLOGE("Start Video decoder failed."); - ReportStartVideoDecoderFail(sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), + ReportStartVideoDecoderFail(START_VIDEO_DECODER_ERROR, sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())], "start video decoder failed."); return ret; @@ -281,7 +281,6 @@ void DecodeDataProcess::ReleaseVideoDecoder() int32_t ret = StopVideoDecoder(); if (ret != DCAMERA_OK) { DHLOGE("StopVideoDecoder failed."); - ReportStopVideoDecoderFail("stop video decoder failed."); } ret = videoDecoder_->Release(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp index 3db9cd51..89d07264 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp @@ -111,7 +111,7 @@ int32_t DecodeDataProcess::InitDecoder() ret = StartVideoDecoder(); if (ret != DCAMERA_OK) { DHLOGE("Start Video decoder failed."); - ReportStartVideoDecoderFail(sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), + ReportStartVideoDecoderFail(START_VIDEO_DECODER_ERROR, sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())], "start video decoder failed."); return ret; @@ -270,7 +270,6 @@ void DecodeDataProcess::ReleaseVideoDecoder() int32_t ret = StopVideoDecoder(); if (ret != DCAMERA_OK) { DHLOGE("StopVideoDecoder failed."); - ReportStopVideoDecoderFail("stop video decoder failed."); } ret = videoDecoder_->Release(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp index 5e999c66..2eaf3efd 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp @@ -116,7 +116,7 @@ int32_t EncodeDataProcess::InitEncoder() ret = StartVideoEncoder(); if (ret != DCAMERA_OK) { DHLOGE("Start Video encoder failed."); - ReportStartVideoEncoderFail(sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), + ReportStartVideoEncoderFail(START_VIDEO_ENCODER_ERROR, sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())], "start video encoder failed."); return ret; @@ -306,7 +306,6 @@ void EncodeDataProcess::ReleaseVideoEncoder() int32_t ret = StopVideoEncoder(); if (ret != DCAMERA_OK) { DHLOGE("StopVideoEncoder failed."); - ReportStopVideoEncoderFail("stop video encoder failed."); } ret = videoEncoder_->Release(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp index e8b5e5be..feb27c67 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp @@ -116,7 +116,7 @@ int32_t EncodeDataProcess::InitEncoder() ret = StartVideoEncoder(); if (ret != DCAMERA_OK) { DHLOGE("Start Video encoder failed."); - ReportStartVideoEncoderFail(sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), + ReportStartVideoEncoderFail(START_VIDEO_ENCODER_ERROR, sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())], "start video encoder failed."); return ret; @@ -278,7 +278,6 @@ void EncodeDataProcess::ReleaseVideoEncoder() int32_t ret = StopVideoEncoder(); if (ret != DCAMERA_OK) { DHLOGE("StopVideoEncoder failed."); - ReportStopVideoEncoderFail("stop video encoder failed."); } ret = videoEncoder_->Release(); if (ret != Media::MediaServiceErrCode::MSERR_OK) { -- Gitee