diff --git a/frameworks/native/audioschedule/audio_schedule.cpp b/frameworks/native/audioschedule/audio_schedule.cpp index 2f6dea413177d8f584b8690a459fa131dbbe170d..ea7a0ac4c67aa1aa5d0e1503c38bd9200e206c6b 100644 --- a/frameworks/native/audioschedule/audio_schedule.cpp +++ b/frameworks/native/audioschedule/audio_schedule.cpp @@ -82,10 +82,10 @@ void ScheduleReportData(pid_t pid, pid_t tid, const char *bundleName) void ScheduleReportDataWithQosLevel(pid_t pid, pid_t tid, const char *bundleName, int32_t qosLevel) { - AudioXCollie audioXcollie("RSS::ReportData with qos level + " + std::to_string(qosLevel) + + AudioXCollie audioXcollie("RSS::ReportData with qos level " + std::to_string(qosLevel) + ", pid " + std::to_string(pid) + ", tid " + std::to_string(tid), REPORTDATA_TIMEOUT, nullptr, nullptr, AUDIO_XCOLLIE_FLAG_LOG | AUDIO_XCOLLIE_FLAG_RECOVERY); - AUDIO_INFO_LOG("Report tid %{public}u to qosLeve %{public}d", tid, qosLevel); + AUDIO_INFO_LOG("Report tid %{public}u to qosLevel %{public}d", tid, qosLevel); ScheduleReportDataInner(pid, tid, bundleName, qosLevel); } diff --git a/interfaces/inner_api/native/audiomanager/include/audio_system_manager.h b/interfaces/inner_api/native/audiomanager/include/audio_system_manager.h index 678d9a3851c2da182ef623c7f8ea18728eb651ba..203466a27e547487e5d6e57f382c7c994e29e7f9 100644 --- a/interfaces/inner_api/native/audiomanager/include/audio_system_manager.h +++ b/interfaces/inner_api/native/audiomanager/include/audio_system_manager.h @@ -1524,7 +1524,7 @@ public: std::mutex workgroupThreadsMutex_; }; std::shared_ptr GetRecorderByGrpId(int32_t grpId); - int32_t ExcuteAudioWorkgroupPrioImprove(int32_t workgroupId, + int32_t ExecuteAudioWorkgroupPrioImprove(int32_t workgroupId, const std::unordered_map threads, bool &needUpdatePrio); private: diff --git a/services/audio_service/client/src/audio_system_manager.cpp b/services/audio_service/client/src/audio_system_manager.cpp index fc8bfffb6334d57774bba21ba1be09c040eb0a06..93b877d8c47347758dcf452437a58170befc0020 100644 --- a/services/audio_service/client/src/audio_system_manager.cpp +++ b/services/audio_service/client/src/audio_system_manager.cpp @@ -2395,7 +2395,7 @@ int32_t AudioSystemManager::RemoveThreadFromGroup(int32_t workgroupId, int32_t t return gasp->RemoveThreadFromGroup(getpid(), workgroupId, tokenId); } -int32_t AudioSystemManager::ExcuteAudioWorkgroupPrioImprove(int32_t workgroupId, +int32_t AudioSystemManager::ExecuteAudioWorkgroupPrioImprove(int32_t workgroupId, const std::unordered_map threads, bool &needUpdatePrio) { bool restoreByPermission = false; @@ -2438,8 +2438,8 @@ int32_t AudioSystemManager::StartGroup(int32_t workgroupId, uint64_t startTime, audioDeadlineRate <= AUDIO_DEADLINE_PARAM_MAX, ERR_INVALID_PARAM, "Invalid Audio Deadline Rate"); RME::SetFrameRateAndPrioType(workgroupId, audioDeadlineRate, 0); - if (ExcuteAudioWorkgroupPrioImprove(workgroupId, threads, needUpdatePrio) != AUDIO_OK) { - AUDIO_ERR_LOG("[WorkgroupInClient] excute audioworkgroup prio improve failed"); + if (ExecuteAudioWorkgroupPrioImprove(workgroupId, threads, needUpdatePrio) != AUDIO_OK) { + AUDIO_ERR_LOG("[WorkgroupInClient] execute audioworkgroup prio improve failed"); return AUDIO_ERR; } diff --git a/services/audio_service/server/include/audio_workgroup.h b/services/audio_service/server/include/audio_workgroup.h index d6f59f83f023212f0b1c73c6fdc41903d6f15308..8b5e427ba2e9ad4dedd28fe6474026aa5d945359 100644 --- a/services/audio_service/server/include/audio_workgroup.h +++ b/services/audio_service/server/include/audio_workgroup.h @@ -30,7 +30,7 @@ public: }; struct AudioWorkgroupCgroupLimit { - pid_t clientPid; + int32_t clientPid; int32_t globalCgroupId; };