diff --git a/frameworks/native/ndk/impl/capture_session_impl.cpp b/frameworks/native/ndk/impl/capture_session_impl.cpp index 322c3283da5b1a3132d4d493f327df88feb440bb..6978b89a45920985bef2d54ffd55094d2b2d34e2 100644 --- a/frameworks/native/ndk/impl/capture_session_impl.cpp +++ b/frameworks/native/ndk/impl/capture_session_impl.cpp @@ -107,6 +107,7 @@ Camera_ErrorCode Camera_CaptureSession::AddSecureOutput(Camera_PreviewOutput* pr Camera_ErrorCode Camera_CaptureSession::BeginConfig() { int32_t ret = innerCaptureSession_->BeginConfig(); + innerCaptureSession_->EnableDeferredType(DELIVERY_NONE, true); return FrameworkToNdkCameraError(ret); } diff --git a/services/deferred_processing_service/include/utils/watch_dog.h b/services/deferred_processing_service/include/utils/watch_dog.h index 5e074a7c3a4e69938bcb8baece35fa2290cf406d..25d12385a25d821af6cdc796c702307aa7dcbcec 100644 --- a/services/deferred_processing_service/include/utils/watch_dog.h +++ b/services/deferred_processing_service/include/utils/watch_dog.h @@ -54,9 +54,9 @@ public: bool ret = timeBroker_->RegisterCallback(durationMs, [callback = std::move(callback)](uint32_t handle) {callback(handle); }, handle); if (ret) { - DP_INFO_LOG("(%s) handle = %d", name_.c_str(), handle); + DP_INFO_LOG("(%s) handle = %{public}d", name_.c_str(), handle); } else { - DP_ERR_LOG("(%s) timerBroker_ RegisterCallback failed, status = %d.", name_.c_str(), ret); + DP_ERR_LOG("(%s) timerBroker_ RegisterCallback failed, status = %{public}d.", name_.c_str(), ret); } } @@ -64,7 +64,7 @@ public: { std::lock_guard lock(mutex_); if (timeBroker_) { - DP_INFO_LOG("(%s) handle = %d", name_.c_str(), handle); + DP_INFO_LOG("(%s) handle = %{public}d", name_.c_str(), handle); timeBroker_->DeregisterCallback(handle); } else { DP_ERR_LOG("(%s) failed", name_.c_str()); diff --git a/services/deferred_processing_service/src/base/task_manager/task_group/base_task_group.cpp b/services/deferred_processing_service/src/base/task_manager/task_group/base_task_group.cpp index f2d3028004db3c25aaf6bf5bc54eb6725c76cc31..6def9f4ec73ee2ae3cb0666512b97f750c18f7bc 100644 --- a/services/deferred_processing_service/src/base/task_manager/task_group/base_task_group.cpp +++ b/services/deferred_processing_service/src/base/task_manager/task_group/base_task_group.cpp @@ -33,7 +33,7 @@ BaseTaskGroup::BaseTaskGroup(const std::string& name, TaskFunc func, bool serial BaseTaskGroup::~BaseTaskGroup() { - DP_DEBUG_LOG("task group name: %s, handle: %d", name_.c_str(), static_cast(handle_)); + DP_DEBUG_LOG("task group name: %s, handle: %{public}d", name_.c_str(), static_cast(handle_)); que_.SetActive(false); que_.Clear(); } @@ -42,7 +42,7 @@ void BaseTaskGroup::Initialize() { handle_ = GenerateHandle(); que_.SetActive(true); - DP_DEBUG_LOG("task group (%s), handle: %d", name_.c_str(), static_cast(handle_)); + DP_DEBUG_LOG("task group (%s), handle: %{public}d", name_.c_str(), static_cast(handle_)); } const std::string& BaseTaskGroup::GetName() @@ -59,9 +59,9 @@ bool BaseTaskGroup::SubmitTask(std::any param) { std::lock_guard lock(mutex_); if (que_.Full()) { - DP_WARNING_LOG("Submit task (%s), handle: %d, que is full!", name_.c_str(), static_cast(handle_)); + DP_WARNING_LOG("Submit task (%s), handle: %{public}d, que is full!", name_.c_str(), static_cast(handle_)); } else { - DP_DEBUG_LOG("Submit task (%s), handle: %d, size: %zu.", name_.c_str(), + DP_DEBUG_LOG("Submit task (%s), handle: %{public}d, size: %zu.", name_.c_str(), static_cast(handle_), que_.Size()); } que_.Push(std::move(param)); @@ -83,7 +83,8 @@ std::function BaseTaskGroup::GetTaskUnlocked() thiz->OnTaskComplete(); } }; - DP_DEBUG_LOG("return one task %s, handle:%d, size: %zu.", name_.c_str(), static_cast(handle_), que_.Size()); + DP_DEBUG_LOG("return one task %s, handle:%{public}d, size: %zu.", name_.c_str(), static_cast(handle_), + que_.Size()); return task; } @@ -108,7 +109,7 @@ void BaseTaskGroup::DispatchTaskUnlocked() inflight_ = true; threadPool_->Submit([task = std::move(task)] { task(); }); } else { - DP_DEBUG_LOG("all tasks have completed for %s handle:%d.", name_.c_str(), static_cast(handle_)); + DP_DEBUG_LOG("all tasks have completed for %s handle:%{public}d.", name_.c_str(), static_cast(handle_)); } } void BaseTaskGroup::OnTaskComplete() diff --git a/services/deferred_processing_service/src/base/task_manager/task_group/delayed_task_group.cpp b/services/deferred_processing_service/src/base/task_manager/task_group/delayed_task_group.cpp index 83f290e18440b1bbbc0bdbddfdeb241b1efce4a1..3eb9dd78d5d68754fbf858dfbf9ee77ba6cadff1 100644 --- a/services/deferred_processing_service/src/base/task_manager/task_group/delayed_task_group.cpp +++ b/services/deferred_processing_service/src/base/task_manager/task_group/delayed_task_group.cpp @@ -52,7 +52,7 @@ bool DelayedTaskGroup::SubmitTask(std::any param) } std::lock_guard lock(mutex_); auto&& [delayTimeMs, task] = std::any_cast>&&>(std::move(param)); - DP_DEBUG_LOG("(%s) SubmitTask, delayTimeMs %d ,expiring timestamp: %d", + DP_DEBUG_LOG("(%s) SubmitTask, delayTimeMs %{public}d ,expiring timestamp: %{public}d", GetName().c_str(), static_cast(delayTimeMs), static_cast(SteadyClock::GetTimestampMilli() + delayTimeMs)); @@ -68,10 +68,10 @@ bool DelayedTaskGroup::SubmitTask(std::any param) void DelayedTaskGroup::TimerExpired(uint32_t handle) { - DP_DEBUG_LOG("(%s) TimerExpired, handle = %d", GetName().c_str(), static_cast(handle)); + DP_DEBUG_LOG("(%s) TimerExpired, handle = %{public}d", GetName().c_str(), static_cast(handle)); std::lock_guard lock(mutex_); if (paramMap_.count(handle) == 0) { - DP_DEBUG_LOG("(%s) TimerExpired, handle = %d", GetName().c_str(), static_cast(handle)); + DP_DEBUG_LOG("(%s) TimerExpired, handle = %{public}d", GetName().c_str(), static_cast(handle)); return; } BaseTaskGroup::SubmitTask(std::move(paramMap_[handle])); diff --git a/services/deferred_processing_service/src/base/task_manager/task_manager.cpp b/services/deferred_processing_service/src/base/task_manager/task_manager.cpp index 8f96052a27eda827bc65e7de99953d5322991ef5..b90f68d6a28696b7d1d118577b353b8d46d2bd02 100644 --- a/services/deferred_processing_service/src/base/task_manager/task_manager.cpp +++ b/services/deferred_processing_service/src/base/task_manager/task_manager.cpp @@ -30,7 +30,7 @@ TaskManager::TaskManager(const std::string& name, uint32_t numThreads, bool ser defaultTaskHandle_(INVALID_TASK_GROUP_HANDLE), delayedTaskHandle_(INVALID_TASK_GROUP_HANDLE) { - DP_INFO_LOG("name: %s, maxThreads: %d.", name.c_str(), numThreads); + DP_INFO_LOG("name: %s, maxThreads: %{public}d.", name.c_str(), numThreads); Initialize(); } @@ -41,7 +41,8 @@ void TaskManager::Initialize() taskRegistry_ = std::make_unique(name_, pool_.get()); auto ret = RegisterTaskGroup("defaultTaskGroup", [this](std::any param) { DoDefaultWorks(std::move(param)); }, serial_, false, defaultTaskHandle_); - DP_INFO_LOG("register default task group: %d, handle: %d", ret, static_cast(defaultTaskHandle_)); + DP_INFO_LOG("register default task group: %{public}d, handle: %{public}d", ret, + static_cast(defaultTaskHandle_)); (void)(ret); return; } @@ -90,7 +91,7 @@ bool TaskManager::DeregisterTaskGroup(const std::string& name, TaskGroupHandle& bool ret = false; if (taskRegistry_) { ret = taskRegistry_->DeregisterTaskGroup(name, handle); - DP_INFO_LOG("deregister task group: %s, ret: %d", name.c_str(), ret); + DP_INFO_LOG("deregister task group: %s, ret: %{public}d", name.c_str(), ret); } else { DP_INFO_LOG("invalid ptr"); } @@ -110,7 +111,7 @@ bool TaskManager::SubmitTask(std::function task, uint32_t delayMilli) bool TaskManager::SubmitTask(TaskGroupHandle handle, std::any param) { - DP_INFO_LOG("submit task to handle: %d", static_cast(handle)); + DP_INFO_LOG("submit task to handle: %{public}d", static_cast(handle)); if (taskRegistry_ == nullptr) { DP_ERR_LOG("invalid ptr"); return false; diff --git a/services/deferred_processing_service/src/base/task_manager/task_registry.cpp b/services/deferred_processing_service/src/base/task_manager/task_registry.cpp index 5ec0a0d04c3f57b1620b1e09a216076b1c760337..226b831ad26121ba438283af09a160db6d015b71 100644 --- a/services/deferred_processing_service/src/base/task_manager/task_registry.cpp +++ b/services/deferred_processing_service/src/base/task_manager/task_registry.cpp @@ -37,7 +37,7 @@ TaskRegistry::~TaskRegistry() bool TaskRegistry::RegisterTaskGroup(const std::string& name, TaskFunc func, bool serial, bool delayTask, TaskGroupHandle& handle) { - DP_DEBUG_LOG("name: %s, serial: %d, delayTask: %d.", name.c_str(), serial, delayTask); + DP_DEBUG_LOG("name: %s, serial: %{public}d, delayTask: %{public}d.", name.c_str(), serial, delayTask); if (IsTaskGroupAlreadyRegistered(name)) { DP_DEBUG_LOG("failed, task group (%s) already existed!", name.c_str()); return false; @@ -61,14 +61,14 @@ bool TaskRegistry::DeregisterTaskGroup(const std::string& name, TaskGroupHandle& { DP_DEBUG_LOG("name: %s.", name.c_str()); if (!IsTaskGroupAlreadyRegistered(name)) { - DP_DEBUG_LOG("name: %s, with handle:%d, failed due to non exist task group!", + DP_DEBUG_LOG("name: %s, with handle:%{public}d, failed due to non exist task group!", name.c_str(), static_cast(handle)); return false; } std::lock_guard lock(mutex_); auto it = registry_.find(handle); if (it == registry_.end()) { - DP_DEBUG_LOG("name: %s, handle:%d failed due to non-existent task group!", + DP_DEBUG_LOG("name: %s, handle:%{public}d failed due to non-existent task group!", name.c_str(), static_cast(handle)); return false; } @@ -78,11 +78,11 @@ bool TaskRegistry::DeregisterTaskGroup(const std::string& name, TaskGroupHandle& bool TaskRegistry::SubmitTask(TaskGroupHandle handle, std::any param) { - DP_DEBUG_LOG("submit one task to %d", static_cast(handle)); + DP_DEBUG_LOG("submit one task to %{public}d", static_cast(handle)); std::lock_guard lock(mutex_); auto it = registry_.find(handle); if (it == registry_.end()) { - DP_DEBUG_LOG("failed due to task group %d non-exist!", static_cast(handle)); + DP_DEBUG_LOG("failed due to task group %{public}d non-exist!", static_cast(handle)); return false; } return it->second->SubmitTask(std::move(param)); diff --git a/services/deferred_processing_service/src/base/task_manager/thread_pool.cpp b/services/deferred_processing_service/src/base/task_manager/thread_pool.cpp index 9970f60fe32e1d388dbcdfb06229d9ea813ba87b..c5769ff06e2a1886535899fe83e5d5bfe8cc9ad6 100644 --- a/services/deferred_processing_service/src/base/task_manager/thread_pool.cpp +++ b/services/deferred_processing_service/src/base/task_manager/thread_pool.cpp @@ -106,10 +106,10 @@ void ThreadPool::PrintThreadInfo() for (auto& workerInfo : workers_) { int ret = pthread_getschedparam(workerInfo.thread.native_handle(), &policy, &sch); if (ret == 0) { - DP_DEBUG_LOG("thread (%s) priority: %d, policy = %d(0:OTHER, 1:FIFO, 2:RR)", workerInfo.name.c_str(), - sch.sched_priority, policy); + DP_DEBUG_LOG("thread (%s) priority: %{public}d, policy = %{public}d(0:OTHER, 1:FIFO, 2:RR)", + workerInfo.name.c_str(), sch.sched_priority, policy); } else { - DP_DEBUG_LOG("thread (%s) pthread_getschedparam failed, ret = %d.", workerInfo.name.c_str(), ret); + DP_DEBUG_LOG("thread (%s) pthread_getschedparam failed, ret = %{public}d.", workerInfo.name.c_str(), ret); } } } diff --git a/services/deferred_processing_service/src/base/task_manager/thread_utils.cpp b/services/deferred_processing_service/src/base/task_manager/thread_utils.cpp index b9d8342f0801036b0e4e08dcb3191f7ad28c3920..804968287c66d4450f21069ca16e2b66a674a9d5 100644 --- a/services/deferred_processing_service/src/base/task_manager/thread_utils.cpp +++ b/services/deferred_processing_service/src/base/task_manager/thread_utils.cpp @@ -27,10 +27,10 @@ void SetThreadName(pthread_t tid, const std::string& name) constexpr int threadNameMaxSize = 15; auto threadName = name.size() > threadNameMaxSize ? name.substr(0, threadNameMaxSize).c_str() : name; if (name.size() > threadNameMaxSize) { - DP_DEBUG_LOG("task name %s exceed max size: %d", name.c_str(), threadNameMaxSize); + DP_DEBUG_LOG("task name %s exceed max size: %{public}d", name.c_str(), threadNameMaxSize); } int ret = pthread_setname_np(tid, threadName.c_str()); - DP_DEBUG_LOG("threadId: %ld, threadName: %s, pthread_setname_np ret = %d.", + DP_DEBUG_LOG("threadId: %ld, threadName: %s, pthread_setname_np ret = %{public}d.", static_cast(pthread_gettid_np(tid)), threadName.c_str(), ret); } @@ -43,9 +43,10 @@ void SetThreadPriority(pthread_t handle, int priority) } int ret = setpriority(PRIO_PROCESS, tid, priority); if (ret == 0) { - DP_DEBUG_LOG("succeed for tid (%ld) with priority (%d).", static_cast(tid), priority); + DP_DEBUG_LOG("succeed for tid (%ld) with priority (%{public}d).", static_cast(tid), priority); } else { - DP_DEBUG_LOG("failed for tid (%ld) with priority (%d), ret = %d.", static_cast(tid), priority, ret); + DP_DEBUG_LOG("failed for tid (%ld) with priority (%{public}d), ret = %{public}d.", + static_cast(tid), priority, ret); } } } //namespace DeferredProcessing diff --git a/services/deferred_processing_service/src/base/timer/core/timer_core.cpp b/services/deferred_processing_service/src/base/timer/core/timer_core.cpp index 893b6c400b7a73c9689fbd36562f609d6397a856..39aa9b84695d775595657f36c506bbeb51931600 100644 --- a/services/deferred_processing_service/src/base/timer/core/timer_core.cpp +++ b/services/deferred_processing_service/src/base/timer/core/timer_core.cpp @@ -85,7 +85,7 @@ bool TimerCore::RegisterTimer(uint64_t timestampMs, const std::shared_ptr } } registeredTimers_[timestampMs].push_back(timer); - DP_DEBUG_LOG("register timer (%s), timestamp: %d, timeline.top: %d", timer->GetName().c_str(), + DP_DEBUG_LOG("register timer (%s), timestamp: %{public}d, timeline.top: %{public}d", timer->GetName().c_str(), static_cast(timestampMs), static_cast(timeline_.top())); return true; } @@ -99,7 +99,7 @@ bool TimerCore::DeregisterTimer(uint64_t timestampMs, const std::shared_ptr