From da9088fa30aa4ed819b1376c1e06be727199567c Mon Sep 17 00:00:00 2001 From: Hosang Kim Date: Tue, 2 Jan 2024 15:48:02 +0900 Subject: [PATCH] Revert "[Tizen] Add some logs for SVG rasterize task for debug" This reverts commit 1acc1f8ed056d8562c64906e6fe8b1c7b5fef660. --- .../system/common/async-task-manager-impl.cpp | 46 +++------------------- 1 file changed, 5 insertions(+), 41 deletions(-) diff --git a/dali/internal/system/common/async-task-manager-impl.cpp b/dali/internal/system/common/async-task-manager-impl.cpp index 6ff5049..1ff0f02 100644 --- a/dali/internal/system/common/async-task-manager-impl.cpp +++ b/dali/internal/system/common/async-task-manager-impl.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include @@ -67,6 +68,8 @@ Debug::Filter* gAsyncTasksManagerLogFilter = Debug::Filter::New(Debug::NoLogging uint32_t gThreadId = 0u; // Only for debug #endif +DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_PERFORMANCE_MARKER, false); + /** * @brief Get the Task Name. * Note that we can get const char* from std::string_view as data() since it will be const class. @@ -164,7 +167,9 @@ void AsyncTaskThread::Run() else { DALI_LOG_INFO(gAsyncTasksManagerLogFilter, Debug::General, "Thread[%u] Process task [%p][%s]\n", threadId, task.Get(), GetTaskName(task)); + DALI_TRACE_BEGIN(gTraceFilter, GetTaskName(task)); task->Process(); + DALI_TRACE_END(gTraceFilter, GetTaskName(task)); DALI_LOG_INFO(gAsyncTasksManagerLogFilter, Debug::General, "Thread[%u] Complete task [%p][%s]\n", threadId, task.Get(), GetTaskName(task)); if(!mDestroyThread) { @@ -648,14 +653,6 @@ void AsyncTaskManager::AddTask(AsyncTaskPtr task) DALI_LOG_INFO(gAsyncTasksManagerLogFilter, Debug::Verbose, "AddTask [%p][%s]\n", task.Get(), GetTaskName(task)); -#ifndef DALI_PROFILE_UBUNTU - /// Debug log for SVG memory corruption error, for VD - if(DALI_LIKELY(task->GetCallbackInvocationThread() == AsyncTask::ThreadType::MAIN_THREAD)) - { - DALI_LOG_RELEASE_INFO("AddTask [%p][%s]\n", task.Get(), GetTaskName(task)); - } -#endif //DALI_PROFILE_UBUNTU - // push back into waiting queue. auto waitingIter = mWaitingTasks.insert(mWaitingTasks.end(), task); CacheImpl::InsertTaskCache(mCacheImpl->mWaitingTasksCache, task, waitingIter); @@ -703,14 +700,6 @@ void AsyncTaskManager::RemoveTask(AsyncTaskPtr task) { DALI_LOG_INFO(gAsyncTasksManagerLogFilter, Debug::Verbose, "RemoveTask [%p][%s]\n", task.Get(), GetTaskName(task)); -#ifndef DALI_PROFILE_UBUNTU - /// Debug log for SVG memory corruption error, for VD - if(DALI_LIKELY(task->GetCallbackInvocationThread() == AsyncTask::ThreadType::MAIN_THREAD)) - { - DALI_LOG_RELEASE_INFO("RemoveTask [%p][%s]\n", task.Get(), GetTaskName(task)); - } -#endif //DALI_PROFILE_UBUNTU - // Check whether we need to unregister processor. // If there is some non-empty queue exist, we don't need to unregister processor. bool needCheckUnregisterProcessor = true; @@ -974,15 +963,6 @@ void AsyncTaskManager::TasksCompleted() while(AsyncTaskPtr task = PopNextCompletedTask()) { DALI_LOG_INFO(gAsyncTasksManagerLogFilter, Debug::Verbose, "Execute callback [%p][%s]\n", task.Get(), GetTaskName(task)); - -#ifndef DALI_PROFILE_UBUNTU - /// Debug log for SVG memory corruption error, for VD - if(DALI_LIKELY(task->GetCallbackInvocationThread() == AsyncTask::ThreadType::MAIN_THREAD)) - { - DALI_LOG_RELEASE_INFO("Execute callback [%p][%s]\n", task.Get(), GetTaskName(task)); - } -#endif //DALI_PROFILE_UBUNTU - CallbackBase::Execute(*(task->GetCompletedCallback()), task); // Remove TasksCompleted callback trace @@ -1068,14 +1048,6 @@ AsyncTaskPtr AsyncTaskManager::PopNextTaskToProcess() DALI_LOG_INFO(gAsyncTasksManagerLogFilter, Debug::Verbose, "Waiting -> Running [%p][%s]\n", nextTask.Get(), GetTaskName(nextTask)); -#ifndef DALI_PROFILE_UBUNTU - /// Debug log for SVG memory corruption error, for VD - if(DALI_LIKELY(nextTask->GetCallbackInvocationThread() == AsyncTask::ThreadType::MAIN_THREAD)) - { - DALI_LOG_RELEASE_INFO("Waiting -> Running [%p][%s]\n", nextTask.Get(), GetTaskName(nextTask)); - } -#endif //DALI_PROFILE_UBUNTU - auto runningIter = mRunningTasks.insert(mRunningTasks.end(), std::make_pair(nextTask, RunningTaskState::RUNNING)); CacheImpl::InsertTaskCache(mCacheImpl->mRunningTasksCache, nextTask, runningIter); @@ -1184,14 +1156,6 @@ void AsyncTaskManager::CompleteTask(AsyncTaskPtr&& task) DALI_LOG_INFO(gAsyncTasksManagerLogFilter, Debug::Verbose, "Running -> Completed [%p][%s] (callback required? : %d)\n", task.Get(), GetTaskName(task), callbackRequired); -#ifndef DALI_PROFILE_UBUNTU - /// Debug log for SVG memory corruption error, for VD - if(DALI_LIKELY(task->GetCallbackInvocationThread() == AsyncTask::ThreadType::MAIN_THREAD)) - { - DALI_LOG_RELEASE_INFO("Running -> Completed [%p][%s] (callback required? : %d)\n", task.Get(), GetTaskName(task), callbackRequired); - } -#endif //DALI_PROFILE_UBUNTU - auto completedIter = mCompletedTasks.insert(mCompletedTasks.end(), std::make_pair(task, callbackRequired ? CompletedTaskState::REQUIRE_CALLBACK : CompletedTaskState::SKIP_CALLBACK)); CacheImpl::InsertTaskCache(mCacheImpl->mCompletedTasksCache, task, completedIter); -- 2.7.4