diff --git a/frameworks/native/audioutils/src/xperf_adapter.cpp b/frameworks/native/audioutils/src/xperf_adapter.cpp index 8385139343df291a917b69c192ec1c4caa847087..4208068b706ed361e967298b6fc5764b7a91b04b 100644 --- a/frameworks/native/audioutils/src/xperf_adapter.cpp +++ b/frameworks/native/audioutils/src/xperf_adapter.cpp @@ -69,7 +69,7 @@ void XperfAdapter::ReportFaultEvent(int32_t faultcode, uint32_t uid, uint32_t se "#HAPPEN_TIME:" + std::to_string(durationSinceEpochMs.count()); OHOS::HiviewDFX::XperfServiceClient::GetInstance().NotifyToXperf(HiviewDFX::DomainId::AUDIO, - XPERF_EVENT_FAULT, msg); + OHOS::HiviewDFX::AudioEventCode::AUDIO_JNAK_FRAME, msg); } } // namespace AudioStandard } // namespace OHOS \ No newline at end of file diff --git a/interfaces/inner_api/native/audiocommon/include/audio_info.h b/interfaces/inner_api/native/audiocommon/include/audio_info.h index 4650862b658190e7af2b29bd0bdf2838cb61cbec..2c918e8188d9b69ce88bc45e2e530bcacff1edac 100644 --- a/interfaces/inner_api/native/audiocommon/include/audio_info.h +++ b/interfaces/inner_api/native/audiocommon/include/audio_info.h @@ -1950,14 +1950,6 @@ enum BoostTriggerMethod : uint32_t { METHOD_WRITE_OR_READ, METHOD_MAX }; - -enum XperfEventId : int32_t { - XPERF_EVENT_START = 0, - XPERF_EVENT_STOP = 1, - XPERF_EVENT_RELEASE = 2, - XPERF_EVENT_FAULT = 3, - XPERF_EVENT_MAX = 4, -}; } // namespace AudioStandard } // namespace OHOS #endif // AUDIO_INFO_H diff --git a/services/audio_service/server/src/audio_process_in_server.cpp b/services/audio_service/server/src/audio_process_in_server.cpp index 0a52043ffd4ce50cdf0ca8037c165cbdb8d7f251..45241c478890e565ee355b33a1e8088cc8865480 100644 --- a/services/audio_service/server/src/audio_process_in_server.cpp +++ b/services/audio_service/server/src/audio_process_in_server.cpp @@ -94,7 +94,7 @@ AudioProcessInServer::~AudioProcessInServer() if (processConfig_.audioMode == AUDIO_MODE_RECORD && needCheckBackground_) { TurnOffMicIndicator(CAPTURER_INVALID); } - NotifyXperfOnPlayback(processConfig_.audioMode, XPERF_EVENT_RELEASE); + NotifyXperfOnPlayback(processConfig_.audioMode, OHOS::HiviewDFX::AudioEventCode::AUDIO_RELEASE); AudioStreamMonitor::GetInstance().DeleteCheckForMonitor(processConfig_.originalSessionId); } @@ -340,7 +340,7 @@ int32_t AudioProcessInServer::StartInner() processBuffer_->SetLastWrittenTime(ClockTime::GetCurNano()); AudioPerformanceMonitor::GetInstance().StartSilenceMonitor(sessionId_, processConfig_.appInfo.appTokenId); - NotifyXperfOnPlayback(processConfig_.audioMode, XPERF_EVENT_START); + NotifyXperfOnPlayback(processConfig_.audioMode, OHOS::HiviewDFX::AudioEventCode::AUDIO_START); AUDIO_INFO_LOG("Start in server success!"); return SUCCESS; } @@ -379,7 +379,7 @@ int32_t AudioProcessInServer::Pause(bool isFlush) CoreServiceHandler::GetInstance().UpdateSessionOperation(sessionId_, SESSION_OPERATION_PAUSE); StreamDfxManager::GetInstance().CheckStreamOccupancy(sessionId_, processConfig_, false); AudioPerformanceMonitor::GetInstance().PauseSilenceMonitor(sessionId_); - NotifyXperfOnPlayback(processConfig_.audioMode, XPERF_EVENT_STOP); + NotifyXperfOnPlayback(processConfig_.audioMode, OHOS::HiviewDFX::AudioEventCode::AUDIO_PAUSE_STOP); AUDIO_PRERELEASE_LOGI("Pause in server success!"); return SUCCESS; } @@ -407,7 +407,7 @@ int32_t AudioProcessInServer::Resume() processBuffer_->SetLastWrittenTime(ClockTime::GetCurNano()); CoreServiceHandler::GetInstance().UpdateSessionOperation(sessionId_, SESSION_OPERATION_START); audioStreamChecker_->MonitorOnAllCallback(AUDIO_STREAM_START, false); - NotifyXperfOnPlayback(processConfig_.audioMode, XPERF_EVENT_START); + NotifyXperfOnPlayback(processConfig_.audioMode, OHOS::HiviewDFX::AudioEventCode::AUDIO_START); AUDIO_PRERELEASE_LOGI("Resume in server success!"); return SUCCESS; } @@ -451,7 +451,7 @@ int32_t AudioProcessInServer::Stop(int32_t stage) CoreServiceHandler::GetInstance().UpdateSessionOperation(sessionId_, SESSION_OPERATION_STOP); StreamDfxManager::GetInstance().CheckStreamOccupancy(sessionId_, processConfig_, false); AudioPerformanceMonitor::GetInstance().PauseSilenceMonitor(sessionId_); - NotifyXperfOnPlayback(processConfig_.audioMode, XPERF_EVENT_STOP); + NotifyXperfOnPlayback(processConfig_.audioMode, OHOS::HiviewDFX::AudioEventCode::AUDIO_PAUSE_STOP); AUDIO_INFO_LOG("Stop in server success!"); return SUCCESS; } @@ -475,7 +475,7 @@ int32_t AudioProcessInServer::Release(bool isSwitchStream) CHECK_AND_RETURN_RET_LOG(ret == SUCCESS, ret, "Policy remove client failed, reason: %{public}d", ret); StreamDfxManager::GetInstance().CheckStreamOccupancy(sessionId_, processConfig_, false); ret = releaseCallback_->OnProcessRelease(this, isSwitchStream); - NotifyXperfOnPlayback(processConfig_.audioMode, XPERF_EVENT_RELEASE); + NotifyXperfOnPlayback(processConfig_.audioMode, OHOS::HiviewDFX::AudioEventCode::AUDIO_RELEASE); AUDIO_INFO_LOG("notify service release result: %{public}d", ret); return SUCCESS; } diff --git a/services/audio_service/server/src/renderer_in_server.cpp b/services/audio_service/server/src/renderer_in_server.cpp index f3ba2955413a8dcc5bd5ca5dee72f3cf273d611b..5376dc833f870b6d22b971e96b17b3ae42a8d4ad 100644 --- a/services/audio_service/server/src/renderer_in_server.cpp +++ b/services/audio_service/server/src/renderer_in_server.cpp @@ -975,7 +975,7 @@ int32_t RendererInServer::Start() StreamDfxManager::GetInstance().CheckStreamOccupancy(streamIndex_, processConfig_, true); } - XperfAdapter::GetInstance().ReportStateChangeEventIfNeed(XPERF_EVENT_START, + XperfAdapter::GetInstance().ReportStateChangeEventIfNeed(OHOS::HiviewDFX::AudioEventCode::AUDIO_START, processConfig_.rendererInfo.streamUsage, streamIndex_, processConfig_.appInfo.appPid, processConfig_.appInfo.appUid); @@ -1122,7 +1122,7 @@ int32_t RendererInServer::Pause() audioStreamChecker_->MonitorOnAllCallback(AUDIO_STREAM_PAUSE, isStandbyTmp); StreamDfxManager::GetInstance().CheckStreamOccupancy(streamIndex_, processConfig_, false); AudioPerformanceMonitor::GetInstance().PauseSilenceMonitor(streamIndex_); - XperfAdapter::GetInstance().ReportStateChangeEventIfNeed(XPERF_EVENT_STOP, processConfig_.rendererInfo.streamUsage, + XperfAdapter::GetInstance().ReportStateChangeEventIfNeed(OHOS::HiviewDFX::AudioEventCode::AUDIO_PAUSE_STOP, processConfig_.rendererInfo.streamUsage, streamIndex_, processConfig_.appInfo.appPid, processConfig_.appInfo.appUid); return SUCCESS; } @@ -1253,7 +1253,7 @@ int32_t RendererInServer::Stop() status_ = I_STATUS_STOPPING; } int32_t ret = StopInner(); - XperfAdapter::GetInstance().ReportStateChangeEventIfNeed(XPERF_EVENT_STOP, + XperfAdapter::GetInstance().ReportStateChangeEventIfNeed(OHOS::HiviewDFX::AudioEventCode::AUDIO_PAUSE_STOP, processConfig_.rendererInfo.streamUsage, streamIndex_, processConfig_.appInfo.appPid, processConfig_.appInfo.appUid); return ret; @@ -1347,7 +1347,7 @@ int32_t RendererInServer::Release(bool isSwitchStream) if (isDualToneEnabled_) { DisableDualTone(); } - XperfAdapter::GetInstance().ReportStateChangeEventIfNeed(XPERF_EVENT_RELEASE, + XperfAdapter::GetInstance().ReportStateChangeEventIfNeed(OHOS::HiviewDFX::AudioEventCode::AUDIO_RELEASE, processConfig_.rendererInfo.streamUsage, streamIndex_, processConfig_.appInfo.appPid, processConfig_.appInfo.appUid); return SUCCESS;