Refactoring task

include/AdblockPlus/Platform.h

@@ -141,6 +141,7 @@ namespace AdblockPlus
     std::shared_future<FilterEnginePtr> filterEngine;
     std::shared_ptr<Updater> updater;
     std::set<std::string> evaluatedJsSources;
+    std::mutex evaluatedJsSourcesMutex;
     std::function<void(const std::string&)> GetEvaluateCallback();
   };
 

libadblockplus.gyp

@@ -209,7 +209,8 @@
       'test/Prefs.cpp',
       'test/ReferrerMapping.cpp',
       'test/UpdateCheck.cpp',
-      'test/WebRequest.cpp'
+      'test/WebRequest.cpp',
+      'test/UpdaterAndFilterEngineCreation.cpp'
     ],
     'msvs_settings': {
       'VCLinkerTool': {

src/Platform.cpp

@@ -72,6 +72,7 @@ std::function<void(const std::string&)> Platform::GetEvaluateCallback()
     // GetEvaluateCallback() method assumes that jsEngine is already created
     return [this](const std::string& filename)
     {
+      std::lock_guard<std::mutex> lock(evaluatedJsSourcesMutex);
       if (evaluatedJsSources.find(filename) != evaluatedJsSources.end())
         return; //NO-OP, file was already evaluated
 
@@ -119,11 +120,15 @@ FilterEngine& Platform::GetFilterEngine()
 
 Updater& Platform::GetUpdater()
 {
-  if (updater == nullptr)
   {
-      GetJsEngine(); // ensures that JsEngine is instantiated
-      updater = std::make_shared<Updater>(jsEngine, GetEvaluateCallback());
+    std::lock_guard<std::mutex> lock(modulesMutex);
+    if (updater)
+      return *updater;
   }
+  GetJsEngine(); // ensures that JsEngine is instantiated
+  std::lock_guard<std::mutex> lock(modulesMutex);
+  if (!updater)
+    updater = std::make_shared<Updater>(jsEngine, GetEvaluateCallback());
   return *updater;
 }
 

test/UpdaterAndFilterEngineCreation.cpp

@@ -0,0 +1,172 @@
+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-present 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 <thread>
+#include <vector>
+#include <chrono>
+#include <string>
+#include <memory>
+
+#include "BaseJsTest.h"
+
+using namespace AdblockPlus;
+
+namespace
+{
+  class UpdaterAndFilterEngineCreationTest : public BaseJsTest
+  {
+  protected:
+
+    static const size_t COUNT = 100;
+    const std::string PROP_NAME = "patternsbackupinterval";
+    std::vector<std::thread> threadsVector;
+    Updater* updaterAddrArray[COUNT];
+    FilterEngine* filterAddrArray[COUNT];
+    DelayedWebRequest::SharedTasks webRequestTasks;
+    DelayedTimer::SharedTasks timerTasks;
+
+    void SetUp()
+    {
+      LazyFileSystem* fileSystem;
+      ThrowingPlatformCreationParameters platformParams;
+      platformParams.logSystem.reset(new LazyLogSystem());
+      platformParams.timer = DelayedTimer::New(timerTasks);
+      platformParams.fileSystem.reset(fileSystem = new LazyFileSystem());
+      platformParams.webRequest = DelayedWebRequest::New(webRequestTasks);
+      platform.reset(new Platform(std::move(platformParams)));
+      threadsVector.reserve(COUNT);
+      std::uninitialized_fill(updaterAddrArray, updaterAddrArray + COUNT, nullptr);
+      std::uninitialized_fill(filterAddrArray, filterAddrArray + COUNT, nullptr);
+    }
+
+    void CallGetUpdaterSimultaneously()
+    {
+      CallGetSimultaneously(true, false);
+    }
+
+    void CallGetFilterEngineSimultaneously()
+    {
+      CallGetSimultaneously(false, true);
+    }
+
+    void CallGetUpdaterAndGetFilterEngineSimultaneously()
+    {
+      CallGetSimultaneously(true, true);
+    }
+
+  private:
+
+    void CallGetSimultaneously(bool isUpdater, bool isFilterEngine)
+    {
+      for (size_t idx = 0; idx < COUNT; ++idx)
+        threadsVector.push_back(
+          std::thread([this, idx, isUpdater, isFilterEngine]() -> void {
+            Updater* updaterAddr = nullptr;
+            FilterEngine* filterEngineAddr = nullptr;
+            if (isUpdater && isFilterEngine)
+            {
+              // some randomization in order of calling gets
+              if (idx % 2)
+              {
+                updaterAddr = &(platform->GetUpdater());
+                filterEngineAddr = &(platform->GetFilterEngine());
+              }
+              else
+              {
+                filterEngineAddr = &(platform->GetFilterEngine());
+                updaterAddr = &(platform->GetUpdater());
+              }
+            }
+            else if (isUpdater)
+              updaterAddr = &(platform->GetUpdater());
+            else if (isFilterEngine)
+              filterEngineAddr = &(platform->GetFilterEngine());
+
+            if (updaterAddr != nullptr)
+              updaterAddrArray[idx] = updaterAddr;
+
+            if (filterEngineAddr != nullptr)
+              filterAddrArray[idx] = filterEngineAddr;
+          }));
+
+      // join the threads
+      for (auto& th: threadsVector)
+        if (th.joinable())
+          th.join();
+    }
+  };
+}
+
+TEST_F(UpdaterAndFilterEngineCreationTest, TestFilterEngineSingleInstance)
+{
+    CallGetFilterEngineSimultaneously();
+    FilterEngine* filterEngineAddr = filterAddrArray[0];
+    for (size_t i = 1; i < COUNT; ++i)
+      ASSERT_EQ(filterEngineAddr, filterAddrArray[i]);
+}
+
+TEST_F(UpdaterAndFilterEngineCreationTest, TestUpdaterSingleInstance)
+{
+    CallGetUpdaterSimultaneously();
+    Updater* updaterAddr = updaterAddrArray[0];
+    for (size_t i = 1; i < COUNT; ++i)
+      ASSERT_EQ(updaterAddr, updaterAddrArray[i]);
+}
+
+TEST_F(UpdaterAndFilterEngineCreationTest, TestUpdaterAndFilterEngineCreationsDontCollide)
+{
+    CallGetUpdaterAndGetFilterEngineSimultaneously();
+    ASSERT_EQ(filterAddrArray[0], filterAddrArray[COUNT - 1]);
+    ASSERT_EQ(updaterAddrArray[0], updaterAddrArray[COUNT - 1]);
+}
+
+TEST_F(UpdaterAndFilterEngineCreationTest, TestUpdaterAndFilterEngineCreationOrder1)
+{
+    Updater& updater = platform->GetUpdater();
+    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    FilterEngine& filterEngine = platform->GetFilterEngine();
+
+    int propFromUpdater = updater.GetPref(PROP_NAME).AsInt();
+    int propFromFilterEngine = filterEngine.GetPref(PROP_NAME).AsInt();
+    ASSERT_EQ(propFromUpdater, propFromFilterEngine);
+
+    int newPropValue = 8;
+    updater.SetPref(PROP_NAME, GetJsEngine().NewValue(newPropValue));
+    propFromUpdater = updater.GetPref(PROP_NAME).AsInt();
+    propFromFilterEngine = filterEngine.GetPref(PROP_NAME).AsInt();
+    ASSERT_EQ(propFromUpdater, newPropValue);
+    ASSERT_EQ(propFromFilterEngine, newPropValue);
+}
+
+TEST_F(UpdaterAndFilterEngineCreationTest, TestUpdaterAndFilterEngineCreationOrder2)
+{
+    FilterEngine& filterEngine = platform->GetFilterEngine();
+    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    Updater& updater = platform->GetUpdater();
+
+    int propFromFilterEngine = filterEngine.GetPref(PROP_NAME).AsInt();
+    int propFromUpdater = updater.GetPref(PROP_NAME).AsInt();
+    ASSERT_EQ(propFromUpdater, propFromFilterEngine);
+
+    int newPropValue = 18;
+    filterEngine.SetPref(PROP_NAME, GetJsEngine().NewValue(newPropValue));
+    propFromFilterEngine = filterEngine.GetPref(PROP_NAME).AsInt();
+    propFromUpdater = updater.GetPref(PROP_NAME).AsInt();
+    ASSERT_EQ(propFromUpdater, newPropValue);
+    ASSERT_EQ(propFromFilterEngine, newPropValue);
+}