[Filesystem] Moving execution of FSManager's methods into TaskQueue

Change-Id: I97c136014e57ba9d677ce6d8e7633531348bf1c6
Signed-off-by: Szymon Jastrzebski <s.jastrzebsk@partner.samsung.com>

diff --git a/src/filesystem/filesystem_instance.cc b/src/filesystem/filesystem_instance.cc
index a8ed1fd32a12998f0700c9230985ad4cfe8f55f5..133658ca34f596802993ea9328e895a8628496e9 100644 (file)
--- a/src/filesystem/filesystem_instance.cc
+++ b/src/filesystem/filesystem_instance.cc
@@ -228,7 +228,7 @@ void FilesystemInstance::FileRename(const picojson::value& args, picojson::objec
   };
 
   FilesystemManager& fsm = FilesystemManager::GetInstance();
-  common::TaskQueue::GetInstance().Async(
+  common::TaskQueue::GetInstance().Queue(
       std::bind(&FilesystemManager::Rename, &fsm, oldPath, newPath, onSuccess, onError));
 }
 
@@ -1125,7 +1125,7 @@ void FilesystemInstance::RemoveDirectory(const picojson::value& args, picojson::
   };
 
   FilesystemManager& fm = FilesystemManager::GetInstance();
-  common::TaskQueue::GetInstance().Async(
+  common::TaskQueue::GetInstance().Queue(
       std::bind(&FilesystemManager::RemoveDirectory, &fm, pathToDelete, onSuccess, onError));
 }
 
@@ -1170,7 +1170,7 @@ void FilesystemInstance::CopyTo(const picojson::value& args, picojson::object& o
   };
 
   FilesystemManager& fm = FilesystemManager::GetInstance();
-  common::TaskQueue::GetInstance().Async(std::bind(&FilesystemManager::CopyTo, &fm, originPath,
+  common::TaskQueue::GetInstance().Queue(std::bind(&FilesystemManager::CopyTo, &fm, originPath,
                                                    destinationPath, overwrite, onSuccess, onError));
 }
 
@@ -1340,7 +1340,7 @@ void FilesystemInstance::FileSystemManagerCreateDirectory(const picojson::value&
   bool make_parents = args.get("makeParents").get<bool>();
   CHECK_STORAGE_ACCESS(path, &out);
 
-  this->worker.add_job([this, callback_id, path, make_parents] {
+  common::TaskQueue::GetInstance().Async([this, callback_id, path, make_parents] {
     picojson::value response = picojson::value(picojson::object());
     picojson::object& obj = response.get<picojson::object>();
     obj["callbackId"] = picojson::value(callback_id);
@@ -1366,7 +1366,7 @@ void FilesystemInstance::FileSystemManagerDeleteFile(const picojson::value& args
   const std::string& path = args.get("path").get<std::string>();
 
   CHECK_STORAGE_ACCESS(path, &out);
-  this->worker.add_job([this, callback_id, path] {
+  common::TaskQueue::GetInstance().Async([this, callback_id, path] {
     picojson::value response = picojson::value(picojson::object());
     picojson::object& obj = response.get<picojson::object>();
     obj["callbackId"] = picojson::value(callback_id);
@@ -1401,7 +1401,7 @@ void FilesystemInstance::FileSystemManagerDeleteDirectory(const picojson::value&
   CHECK_STORAGE_ACCESS(path, &out);
   bool recursive = args.get("recursive").get<bool>();
 
-  this->worker.add_job([this, callback_id, path, recursive] {
+  common::TaskQueue::GetInstance().Queue([this, callback_id, path, recursive] {
     ScopeLogger();
     picojson::value response = picojson::value(picojson::object());
     picojson::object& obj = response.get<picojson::object>();
@@ -1443,7 +1443,7 @@ void FilesystemInstance::FileSystemManagerCopyFile(const picojson::value& args,
   CHECK_STORAGE_ACCESS(destination_path, &out);
   bool overwrite = args.get("overwrite").get<bool>();
 
-  this->worker.add_job([this, callback_id, path, destination_path, overwrite] {
+  common::TaskQueue::GetInstance().Queue([this, callback_id, path, destination_path, overwrite] {
     picojson::value response = picojson::value(picojson::object());
     picojson::object& obj = response.get<picojson::object>();
     obj["callbackId"] = picojson::value(callback_id);
@@ -1486,7 +1486,7 @@ void FilesystemInstance::FileSystemManagerCopyDirectory(const picojson::value& a
   double callback_id = args.get("callbackId").get<double>();
   bool overwrite = args.get("overwrite").get<bool>();
 
-  this->worker.add_job([this, callback_id, path, destination_path, overwrite] {
+  common::TaskQueue::GetInstance().Queue([this, callback_id, path, destination_path, overwrite] {
     ScopeLogger();
     picojson::value response = picojson::value(picojson::object());
     picojson::object& obj = response.get<picojson::object>();
@@ -1532,7 +1532,7 @@ void FilesystemInstance::FileSystemManagerMoveFile(const picojson::value& args,
   double callback_id = args.get("callbackId").get<double>();
   bool overwrite = args.get("overwrite").get<bool>();
 
-  this->worker.add_job([this, callback_id, path, destination_path, overwrite] {
+  common::TaskQueue::GetInstance().Queue([this, callback_id, path, destination_path, overwrite] {
     ScopeLogger();
     picojson::value response = picojson::value(picojson::object());
     picojson::object& obj = response.get<picojson::object>();
@@ -1584,7 +1584,7 @@ void FilesystemInstance::FileSystemManagerMoveDirectory(const picojson::value& a
   CHECK_STORAGE_ACCESS(destination_path, &out);
   bool overwrite = args.get("overwrite").get<bool>();
 
-  this->worker.add_job([this, callback_id, path, destination_path, overwrite] {
+  common::TaskQueue::GetInstance().Queue([this, callback_id, path, destination_path, overwrite] {
     picojson::value response = picojson::value(picojson::object());
     picojson::object& obj = response.get<picojson::object>();
     obj["callbackId"] = picojson::value(callback_id);
@@ -1631,7 +1631,7 @@ void FilesystemInstance::FileSystemManagerRename(const picojson::value& args,
   double callback_id = args.get("callbackId").get<double>();
   const std::string& new_name = args.get("newName").get<std::string>();
 
-  this->worker.add_job([this, callback_id, new_name, path] {
+  common::TaskQueue::GetInstance().Async([this, callback_id, new_name, path] {
     ScopeLogger();
     picojson::value response = picojson::value(picojson::object());
     picojson::object& obj = response.get<picojson::object>();
@@ -1688,7 +1688,7 @@ void FilesystemInstance::FileSystemManagerListDirectory(const picojson::value& a
   const picojson::object& filter = args.get("filter").get<picojson::object>();
   CHECK_STORAGE_ACCESS(path, &out);
 
-  this->worker.add_job([this, callback_id, path, filter] {
+  common::TaskQueue::GetInstance().Async([this, callback_id, path, filter] {
     ScopeLogger();
     picojson::value response = picojson::value(picojson::object());
     picojson::object& obj = response.get<picojson::object>();