openharmony/distributed_camera
1
0
Fork 0
mirror of https://github.com/openharmony/distributed_camera.git synced 2026-07-19 16:43:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

添加hisysevent打点信息

Browse Source 
Signed-off-by: chen0088 <chenmenghuan3@huawei.com>
This commit is contained in:
chen0088
2022-05-31 16:27:46 +08:00
parent b4c70257d7
commit 4b210b9fd6
7 changed files with 29 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/include/utils/dcamera_hisysevent_adapter.h
+6 -8
View File
@@ -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);
common/src/utils/dcamera_hisysevent_adapter.cpp
+9 -56
View File
@@ -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)
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,
"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",
eventName,
HiSysEventNameSpace::EventType::BEHAVIOR,
"DEVID", devId,
"DHID", dhId,
hisysevent.yaml
+2
View File
@@ -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:
interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp
+2 -2
View File
@@ -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<DCameraSinkLoadCallback> 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);
interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp
+2 -2
View File
@@ -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<DCameraSourceLoadCallback> 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<std::mutex> lock(producerMutex_);
services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp
+2 -2
View File
@@ -88,7 +88,7 @@ int32_t DistributedCameraSourceService::InitSource(const std::string& params,
const sptr<IDCameraSourceCallback>& 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);
services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp
+6 -4
View File
@@ -216,7 +216,8 @@ int32_t DCameraSourceDev::ExecuteRegister(std::shared_ptr<DCameraRegistParam>& 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<DCameraIndex> actualDevInfo;
actualDevInfo.assign(actualDevInfo_.begin(), actualDevInfo_.end());
int32_t ret = controller_->Init(actualDevInfo);
@@ -260,7 +261,8 @@ int32_t DCameraSourceDev::ExecuteUnRegister(std::shared_ptr<DCameraRegistParam>&
{
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<DCameraOpenInfo> openInfo = std::make_shared<DCameraOpenInfo>();
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,