Add GetCallbackInvocationThread() for AsyncTaskMananager

[platform/core/uifw/dali-adaptor.git] / dali / internal / system / common / async-task-manager-impl.cpp

diff --git a/dali/internal/system/common/async-task-manager-impl.cpp b/dali/internal/system/common/async-task-manager-impl.cpp
index 22e274c..a1ed1ce 100644 (file)
--- a/dali/internal/system/common/async-task-manager-impl.cpp
+++ b/dali/internal/system/common/async-task-manager-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 #include "async-task-manager-impl.h"
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/common/singleton-service.h>
 #include <dali/devel-api/adaptor-framework/environment-variable.h>
 #include <dali/devel-api/adaptor-framework/thread-settings.h>
+#include <dali/devel-api/common/singleton-service.h>
 #include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
 
@@ -123,7 +123,7 @@ void AsyncTaskThread::Run()
 Dali::AsyncTaskManager AsyncTaskManager::Get()
 {
   Dali::AsyncTaskManager manager;
-  SingletonService singletonService(SingletonService::Get());
+  SingletonService       singletonService(SingletonService::Get());
   if(singletonService)
   {
     // Check whether the async task manager is already created
@@ -138,7 +138,7 @@ Dali::AsyncTaskManager AsyncTaskManager::Get()
     {
       // If not, create the async task manager and register it as a singleton
       Internal::Adaptor::AsyncTaskManager* internalAsyncTaskManager = new Internal::Adaptor::AsyncTaskManager();
-      manager = Dali::AsyncTaskManager(internalAsyncTaskManager);
+      manager                                                       = Dali::AsyncTaskManager(internalAsyncTaskManager);
       singletonService.Register(typeid(manager), manager);
     }
   }
@@ -154,7 +154,7 @@ AsyncTaskManager::AsyncTaskManager()
 
 AsyncTaskManager::~AsyncTaskManager()
 {
-  if(mProcessorRegistered)
+  if(mProcessorRegistered && Dali::Adaptor::IsAvailable())
   {
     Dali::Adaptor::Get().UnregisterProcessor(*this);
   }
@@ -189,7 +189,7 @@ void AsyncTaskManager::AddTask(AsyncTaskPtr task)
     // If all threads are busy, then it's ok just to push the task because they will try to get the next job.
   }
 
-  if(!mProcessorRegistered)
+  if(!mProcessorRegistered && Dali::Adaptor::IsAvailable())
   {
     Dali::Adaptor::Get().RegisterProcessor(*this);
     mProcessorRegistered = true;
@@ -292,29 +292,41 @@ AsyncTaskPtr AsyncTaskManager::PopNextCompletedTask()
 void AsyncTaskManager::CompleteTask(AsyncTaskPtr task)
 {
   // Lock while adding task to the queue
-  Mutex::ScopedLock lock(mMutex);
-  for(auto iter = mRunningTasks.begin(), endIter = mRunningTasks.end(); iter != endIter; ++iter)
   {
-    if((*iter).first == task)
+    Mutex::ScopedLock lock(mMutex);
+    for(auto iter = mRunningTasks.begin(), endIter = mRunningTasks.end(); iter != endIter; ++iter)
     {
-      if(!(*iter).second)
+      if((*iter).first == task)
       {
-        mCompletedTasks.push_back(task);
-      }
+        if(!(*iter).second)
+        {
+          if(task->GetCallbackInvocationThread() == AsyncTask::ThreadType::MAIN_THREAD)
+          {
+            mCompletedTasks.push_back(task);
+          }
+        }
 
-      // Delete this task in running queue
-      mRunningTasks.erase(iter);
-      break;
+        // Delete this task in running queue
+        mRunningTasks.erase(iter);
+        break;
+      }
     }
   }
 
   // wake up the main thread
-  mTrigger->Trigger();
+  if(task->GetCallbackInvocationThread() == AsyncTask::ThreadType::MAIN_THREAD)
+  {
+    mTrigger->Trigger();
+  }
+  else
+  {
+    CallbackBase::Execute(*(task->GetCompletedCallback()), task);
+  }
 }
 
 void AsyncTaskManager::UnregisterProcessor()
 {
-  if(mProcessorRegistered)
+  if(mProcessorRegistered && Dali::Adaptor::IsAvailable())
   {
     Mutex::ScopedLock lock(mMutex);
     if(mWaitingTasks.empty() && mCompletedTasks.empty() && mRunningTasks.empty())
@@ -329,7 +341,7 @@ void AsyncTaskManager::TasksCompleted()
 {
   while(AsyncTaskPtr task = PopNextCompletedTask())
   {
-    CallbackBase::Execute(*(task->GetCompletedCallback()),task);
+    CallbackBase::Execute(*(task->GetCompletedCallback()), task);
   }
 
   UnregisterProcessor();