From e9453bdfe76deafb3e58321aceb470ed0bfcbe0b Mon Sep 17 00:00:00 2001 From: kw Date: Mon, 25 Aug 2025 19:15:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8xperf?= =?UTF-8?q?=E7=9A=84=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kw --- frameworks/native/audioutils/src/xperf_adapter.cpp | 2 +- .../native/audiocommon/include/audio_info.h | 8 -------- .../server/src/audio_process_in_server.cpp | 12 ++++++------ .../audio_service/server/src/renderer_in_server.cpp | 8 ++++---- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/frameworks/native/audioutils/src/xperf_adapter.cpp b/frameworks/native/audioutils/src/xperf_adapter.cpp index 8385139343..4208068b70 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 4650862b65..2c918e8188 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 0a52043ffd..45241c4788 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 f3ba295541..5376dc833f 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; -- Gitee