Issue 5118 - Lock the platform interfaces before use

include/AdblockPlus/Platform.h

 /*
  * 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
@@ skipping 89 matching lines @@
       const OnFilterEngineCreatedCallback& onCreated = OnFilterEngineCreatedCallback());
 
     /**
      * Synchronous equivalent of `CreateFilterEngineAsync`.
      * Internally it blocks and waits for finishing of certain asynchronous
      * operations, please ensure that provided implementation does not lead to
      * a dead lock.
      */
     FilterEngine& GetFilterEngine();
 
-    /**
-    * @return The asynchronous ITimer implementation.
-     */
-    ITimer& GetTimer();
+    typedef std::function<void(ITimer&)> WithTimerCallback;
+    void WithTimer(const WithTimerCallback&);
 
-    /**
-     * @return The asynchronous IFileSystem implementation.
-     */
-    IFileSystem& GetFileSystem();
+    typedef std::function<void(IFileSystem&)> WithFileSystemCallback;
+    void WithFileSystem(const WithFileSystemCallback&);
 
-    /**
-    * @return The asynchronous IWebRequest implementation.
-    */
-    IWebRequest& GetWebRequest();
+    typedef std::function<void(IWebRequest&)> WithWebRequestCallback;
+    void WithWebRequest(const WithWebRequestCallback&);
 
-    /**
-     * @return The LogSystem implementation.
-     */
-    LogSystem& GetLogSystem();
+    typedef std::function<void(LogSystem&)> WithLogSystemCallback;
+    void WithLogSystem(const WithLogSystemCallback&);
 
   private:
     LogSystemPtr logSystem;
     TimerPtr timer;
     FileSystemPtr fileSystem;
     WebRequestPtr webRequest;
     // used for creation and deletion of modules.
     std::mutex modulesMutex;
+    std::recursive_mutex interfacesMutex;

[sergei, 2017/09/13 19:20:53]

What do you think about making the methods WithSomeInterface virtual, moving the
mutex into DefaultPlatform and overriding the corresponding methods there which
are using the mutex? I think about it because we basically "should pay only for
what we use", if the implementation of the interfaces does not imply
multi-threading then then this mutex is not required. Though, it seems a small
optimization and there is still `modulesMutex`, which should not be touched in
this codereview.

[hub, 2017/09/13 19:50:49]

I can do that.

     std::shared_ptr<JsEngine> jsEngine;
     std::shared_future<FilterEnginePtr> filterEngine;
   };
 
   /**
    * A helper class allowing to construct a default Platform and to obtain
    * the Scheduler used by Platform before the latter is constructed.
    */
   class DefaultPlatformBuilder : public Platform::CreationParameters
   {
@@ skipping 32 matching lines @@
      * when a corresponding field is nullptr and with a default Scheduler.
      */
     std::unique_ptr<Platform> CreatePlatform();
   private:
     std::shared_ptr<Scheduler> asyncExecutor;
     Scheduler defaultScheduler;
   };
 }
 
 #endif // ADBLOCK_PLUS_PLATFORM_H