From 9219d677801de5e060a43193d0297f4cd88b872d Mon Sep 17 00:00:00 2001
From: Yury Melnichek <melnichek@gmail.com>
Date: Sat, 4 Jun 2011 16:20:31 +0200
Subject: [PATCH] Make IRunner::Run() const and IRunner::Join() protected.

---
 base/runner.hpp                                  | 16 +++++++++++-----
 platform/concurrent_runner.hpp                   |  4 +++-
 platform/ios_concurrent_runner.mm                |  2 +-
 .../platform_tests/concurrent_runner_test.cpp    | 13 ++++++++++++-
 platform/qt_concurrent_runner.cpp                |  2 +-
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/base/runner.hpp b/base/runner.hpp
index a755a5bddf..4504b62ca4 100644
--- a/base/runner.hpp
+++ b/base/runner.hpp
@@ -7,26 +7,32 @@ namespace threads
 
 typedef function<void()> RunnerFuncT;
 
-/// Automatically uses system thread pools if it's available
+// Base Runner interface: performes given tasks.
 class IRunner
 {
 public:
+
+  virtual void Run(RunnerFuncT const & f) const = 0;
+
+protected:
   virtual ~IRunner() {}
 
-  virtual void Run(RunnerFuncT f) = 0;
-  /// Waits until all running threads will stop
+  // Waits until all running threads stop.
+  // Not for public use! Used in unit tests only, since
+  // some runners use global thread pool and interfere with each other.
   virtual void Join() = 0;
 };
 
-/// Synchronous implementation
+// Synchronous implementation: just immediately executes given tasks.
 class SimpleRunner : public IRunner
 {
 public:
-  virtual void Run(RunnerFuncT f)
+  virtual void Run(RunnerFuncT const & f) const
   {
     f();
   }
 
+protected:
   virtual void Join()
   {
   }
diff --git a/platform/concurrent_runner.hpp b/platform/concurrent_runner.hpp
index daa586f6b5..c85691853d 100644
--- a/platform/concurrent_runner.hpp
+++ b/platform/concurrent_runner.hpp
@@ -14,7 +14,9 @@ class ConcurrentRunner : public IRunner
 public:
   ConcurrentRunner();
   virtual ~ConcurrentRunner();
-  virtual void Run(RunnerFuncT f);
+  virtual void Run(RunnerFuncT const & f) const;
+
+protected:
   virtual void Join();
 };
 
diff --git a/platform/ios_concurrent_runner.mm b/platform/ios_concurrent_runner.mm
index c51e80186b..57ed12dce4 100644
--- a/platform/ios_concurrent_runner.mm
+++ b/platform/ios_concurrent_runner.mm
@@ -47,7 +47,7 @@ namespace threads
     }
   };
 
-  void ConcurrentRunner::Run(RunnerFuncT f)
+  void ConcurrentRunner::Run(RunnerFuncT const & f) const
   {
     dispatch_queue_t globalQ = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
     BoostExceptionFixer * tmp = new BoostExceptionFixer(f);
diff --git a/platform/platform_tests/concurrent_runner_test.cpp b/platform/platform_tests/concurrent_runner_test.cpp
index 8e6ed28bf2..d992296c58 100644
--- a/platform/platform_tests/concurrent_runner_test.cpp
+++ b/platform/platform_tests/concurrent_runner_test.cpp
@@ -8,6 +8,17 @@
 
 #include "../../std/bind.hpp"
 
+namespace
+{
+
+class ConcurrentRunnerForTest : public threads::ConcurrentRunner
+{
+public:
+  using threads::ConcurrentRunner::Join;
+};
+
+}
+
 int globalCounter = 0;
 
 threads::Mutex m;
@@ -22,7 +33,7 @@ static const int MAX_THREADS = 20;
 
 UNIT_TEST(ConcurrentRunnerSmoke)
 {
-  threads::ConcurrentRunner r;
+  ConcurrentRunnerForTest r;
   for (int i = 0; i < MAX_THREADS; ++i)
     r.Run(&f);
   r.Join();
diff --git a/platform/qt_concurrent_runner.cpp b/platform/qt_concurrent_runner.cpp
index 38f685995d..85960676e8 100644
--- a/platform/qt_concurrent_runner.cpp
+++ b/platform/qt_concurrent_runner.cpp
@@ -13,7 +13,7 @@ namespace threads
   {
   }
 
-  void ConcurrentRunner::Run(RunnerFuncT f)
+  void ConcurrentRunner::Run(RunnerFuncT const & f) const
   {
     QtConcurrent::run(f);
   }