Issue #4711 - Rewrite legacy thread facilities

src/FileSystemJsObject.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <AdblockPlus/FileSystem.h>
 #include <stdexcept>
 #include <sstream>
 #include <vector>
 
 #include <AdblockPlus/JsValue.h>
 #include "FileSystemJsObject.h"
 #include "JsContext.h"
-#include "Thread.h"
+#include "Scheduler.h"
 #include "Utils.h"
 
 using namespace AdblockPlus;
 
 namespace
 {
-  class IoThread : public Thread
+  class IoTask
   {
+  protected:
+    virtual void operator()() = 0;
+    JsEnginePtr jsEngine;
+    FileSystemPtr fileSystem;
+    JsValuePtr callback;
+
   public:
-    IoThread(JsEnginePtr jsEngine, JsValuePtr callback)
-      : Thread(true), jsEngine(jsEngine), fileSystem(jsEngine->GetFileSystem()),
+    IoTask(JsEnginePtr jsEngine, JsValuePtr callback)
+      : jsEngine(jsEngine), fileSystem(jsEngine->GetFileSystem()),
         callback(callback)
     {
     }
 
-  protected:
-    JsEnginePtr jsEngine;
-    FileSystemPtr fileSystem;
-    JsValuePtr callback;
+    virtual ~IoTask() {}
   };
 
-  class ReadThread : public IoThread
+  class ReadTask : public IoTask
   {
   public:
-    ReadThread(JsEnginePtr jsEngine, JsValuePtr callback,
+    ReadTask(JsEnginePtr jsEngine, JsValuePtr callback,
                const std::string& path)
-      : IoThread(jsEngine, callback), path(path)
+      : IoTask(jsEngine, callback), path(path)
     {
     }
 
-    void Run()
+    void operator()()
     {
       std::string content;
       std::string error;
       try
       {
         std::shared_ptr<std::istream> stream = fileSystem->Read(path);
         content = Utils::Slurp(*stream);
       }
       catch (std::exception& e)
       {
@@ skipping 10 matching lines @@
       result->SetProperty("error", error);
       JsValueList params;
       params.push_back(result);
       callback->Call(params);
     }
 
   private:
     std::string path;
   };
 
-  class WriteThread : public IoThread
+  class WriteTask : public IoTask
   {
   public:
-    WriteThread(JsEnginePtr jsEngine, JsValuePtr callback,
+    WriteTask(JsEnginePtr jsEngine, JsValuePtr callback,
                 const std::string& path, const std::string& content)
-      : IoThread(jsEngine, callback), path(path), content(content)
+      : IoTask(jsEngine, callback), path(path), content(content)
     {
     }
 
-    void Run()
+    void operator()()
     {
       std::string error;
       try
       {
         std::shared_ptr<std::iostream> stream(new std::stringstream);
         *stream << content;
         fileSystem->Write(path, stream);
       }
       catch (std::exception& e)
       {
         error = e.what();
       }
       catch (...)
       {
         error = "Unknown error while writing to " + path;
       }
 
       const JsContext context(jsEngine);
       JsValuePtr errorValue = jsEngine->NewValue(error);
       JsValueList params;
       params.push_back(errorValue);
       callback->Call(params);
     }
 
   private:
     std::string path;
     std::string content;
   };
 
-  class MoveThread : public IoThread
+  class MoveTask : public IoTask
   {
   public:
-    MoveThread(JsEnginePtr jsEngine, JsValuePtr callback,
+    MoveTask(JsEnginePtr jsEngine, JsValuePtr callback,
                const std::string& fromPath, const std::string& toPath)
-      : IoThread(jsEngine, callback), fromPath(fromPath), toPath(toPath)
+      : IoTask(jsEngine, callback), fromPath(fromPath), toPath(toPath)
     {
     }
 
-    void Run()
+    void operator()()
     {
       std::string error;
       try
       {
         fileSystem->Move(fromPath, toPath);
       }
       catch (std::exception& e)
       {
         error = e.what();
       }
       catch (...)
       {
         error = "Unknown error while moving " + fromPath + " to " + toPath;
       }
 
       const JsContext context(jsEngine);
       JsValuePtr errorValue = jsEngine->NewValue(error);
       JsValueList params;
       params.push_back(errorValue);
       callback->Call(params);
     }
 
   private:
     std::string fromPath;
     std::string toPath;
   };
 
-  class RemoveThread : public IoThread
+  class RemoveTask : public IoTask
   {
   public:
-    RemoveThread(JsEnginePtr jsEngine, JsValuePtr callback,
+    RemoveTask(JsEnginePtr jsEngine, JsValuePtr callback,
                  const std::string& path)
-      : IoThread(jsEngine, callback), path(path)
+      : IoTask(jsEngine, callback), path(path)
     {
     }
 
-    void Run()
+    void operator()()
     {
       std::string error;
       try
       {
         fileSystem->Remove(path);
       }
       catch (std::exception& e)
       {
         error = e.what();
       }
       catch (...)
       {
         error = "Unknown error while removing " + path;
       }
 
       const JsContext context(jsEngine);
       JsValuePtr errorValue = jsEngine->NewValue(error);
       JsValueList params;
       params.push_back(errorValue);
       callback->Call(params);
     }
 
   private:
     std::string path;
   };
 
 
-  class StatThread : public IoThread
+  class StatTask : public IoTask
   {
   public:
-    StatThread(JsEnginePtr jsEngine, JsValuePtr callback,
+    StatTask(JsEnginePtr jsEngine, JsValuePtr callback,
                const std::string& path)
-      : IoThread(jsEngine, callback), path(path)
+      : IoTask(jsEngine, callback), path(path)
     {
     }
 
-    void Run()
+    void operator()()
     {
       std::string error;
       FileSystem::StatResult statResult;
       try
       {
         statResult = fileSystem->Stat(path);
       }
       catch (std::exception& e)
       {
         error = e.what();
@@ skipping 25 matching lines @@
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
     AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
     if (converted.size() != 2)
       return v8::ThrowException(Utils::ToV8String(isolate,
         "_fileSystem.read requires 2 parameters"));
     if (!converted[1]->IsFunction())
       return v8::ThrowException(Utils::ToV8String(isolate,
         "Second argument to _fileSystem.read must be a function"));
-    ReadThread* const readThread = new ReadThread(jsEngine, converted[1],
+    const auto readTask = std::make_shared<ReadTask>(jsEngine, converted[1],
         converted[0]->AsString());
-    readThread->Start();
+    AdblockPlus::Scheduler::StartImmediatelyInSingleUseThread(AdblockPlus::MakeHeapFunction(readTask));
     return v8::Undefined();
   }
 
   v8::Handle<v8::Value> WriteCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
     AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
     if (converted.size() != 3)
       return v8::ThrowException(Utils::ToV8String(isolate,
         "_fileSystem.write requires 3 parameters"));
     if (!converted[2]->IsFunction())
       return v8::ThrowException(Utils::ToV8String(isolate,
         "Third argument to _fileSystem.write must be a function"));
-    WriteThread* const writeThread = new WriteThread(jsEngine, converted[2],
+    const auto writeTask = std::make_shared<WriteTask>(jsEngine, converted[2],
         converted[0]->AsString(), converted[1]->AsString());
-    writeThread->Start();
+    AdblockPlus::Scheduler::StartImmediatelyInSingleUseThread(AdblockPlus::MakeHeapFunction(writeTask));
     return v8::Undefined();
   }
 
   v8::Handle<v8::Value> MoveCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
     AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
     if (converted.size() != 3)
       return v8::ThrowException(Utils::ToV8String(isolate,
         "_fileSystem.move requires 3 parameters"));
     if (!converted[2]->IsFunction())
       return v8::ThrowException(Utils::ToV8String(isolate,
         "Third argument to _fileSystem.move must be a function"));
-    MoveThread* const moveThread = new MoveThread(jsEngine, converted[2],
+    const auto moveTask = std::make_shared<MoveTask>(jsEngine, converted[2],
         converted[0]->AsString(), converted[1]->AsString());
-    moveThread->Start();
+    AdblockPlus::Scheduler::StartImmediatelyInSingleUseThread(AdblockPlus::MakeHeapFunction(moveTask));
     return v8::Undefined();
   }
 
   v8::Handle<v8::Value> RemoveCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
     AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
     if (converted.size() != 2)
       return v8::ThrowException(Utils::ToV8String(isolate,
         "_fileSystem.remove requires 2 parameters"));
     if (!converted[1]->IsFunction())
       return v8::ThrowException(Utils::ToV8String(isolate,
         "Second argument to _fileSystem.remove must be a function"));
-    RemoveThread* const removeThread = new RemoveThread(jsEngine, converted[1],
+    const auto removeTask = std::make_shared<RemoveTask>(jsEngine, converted[1],
         converted[0]->AsString());
-    removeThread->Start();
+    AdblockPlus::Scheduler::StartImmediatelyInSingleUseThread(AdblockPlus::MakeHeapFunction(removeTask));
     return v8::Undefined();
   }
 
   v8::Handle<v8::Value> StatCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
     AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
     if (converted.size() != 2)
       return v8::ThrowException(Utils::ToV8String(isolate,
         "_fileSystem.stat requires 2 parameters"));
     if (!converted[1]->IsFunction())
       return v8::ThrowException(Utils::ToV8String(isolate,
         "Second argument to _fileSystem.stat must be a function"));
-    StatThread* const statThread = new StatThread(jsEngine, converted[1],
+    const auto statTask = std::make_shared<StatTask>(jsEngine, converted[1],
         converted[0]->AsString());
-    statThread->Start();
+    AdblockPlus::Scheduler::StartImmediatelyInSingleUseThread(AdblockPlus::MakeHeapFunction(statTask));
     return v8::Undefined();
   }
 
   v8::Handle<v8::Value> ResolveCallback(const v8::Arguments& arguments)
   {
     AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
     AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
 
     v8::Isolate* isolate = arguments.GetIsolate();
     if (converted.size() != 1)
@@ skipping 11 matching lines @@
 JsValuePtr FileSystemJsObject::Setup(JsEnginePtr jsEngine, JsValuePtr obj)
 {
   obj->SetProperty("read", jsEngine->NewCallback(::ReadCallback));
   obj->SetProperty("write", jsEngine->NewCallback(::WriteCallback));
   obj->SetProperty("move", jsEngine->NewCallback(::MoveCallback));
   obj->SetProperty("remove", jsEngine->NewCallback(::RemoveCallback));
   obj->SetProperty("stat", jsEngine->NewCallback(::StatCallback));
   obj->SetProperty("resolve", jsEngine->NewCallback(::ResolveCallback));
   return obj;
 }