Issue 3595 - Get rid of detached threads for setTimeout

src/DefaultTimer.h

 /*
 * This file is part of Adblock Plus <https://adblockplus.org/>,
 * Copyright (C) 2006-2017 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 11 matching lines @@
 #include <mutex>
 #include <condition_variable>
 #include <queue>
 #include <atomic>
 #include <thread>
 
 namespace AdblockPlus
 {
   class DefaultTimer : public ITimer
   {
-    struct TimerUnit {
+    struct TimerUnit
+    {
       std::chrono::steady_clock::time_point fireAt;
       TimerCallback callback;
     };
-    struct TimerUnitComparator {
-      typedef bool result_type;
-      typedef TimerUnit first_argument_type;
-      typedef TimerUnit second_argument_type;
-      bool operator()(const first_argument_type& t1, const second_argument_type& t2) const {
-        // pay attention 2 < 1 becaus we need the smallest time at the top.

[hub, 2017/03/27 13:42:22]

'nit: typo in the comment: "because"

[sergei, 2017/03/27 14:45:25]

Done.

+    struct TimerUnitComparator
+    {
+      bool operator()(const TimerUnit& t1, const TimerUnit& t2) const
+      {
+        // pay attention 2 < 1 because we need the smallest time at the top.
         return t2.fireAt < t1.fireAt;
       }
     };
     typedef std::priority_queue<TimerUnit, std::vector<TimerUnit>, TimerUnitComparator> TimerUnits;
   public:
     DefaultTimer();
     ~DefaultTimer();
     void SetTimer(const std::chrono::milliseconds& timeout, const TimerCallback& timerCallback) override;
   private:
     void ThreadFunc();
   private:
     std::mutex mutex;
     std::condition_variable conditionVariable;
     TimerUnits timers;
     std::atomic<bool> shouldThreadStop;
     std::thread m_thread;
   };
 }
 
 #endif