From c8466bdeb071f35a7b63921cd28772beef50d474 Mon Sep 17 00:00:00 2001
From: Yury Melnichek <melnichek@gmail.com>
Date: Sun, 5 Jun 2011 17:13:52 +0200
Subject: [PATCH] Catch all exceptions in Runner.

---
 base/base.pro                     |  1 +
 base/runner.cpp                   | 23 ++++++++++++++++++++
 base/runner.hpp                   |  5 ++++-
 platform/ios_concurrent_runner.mm | 10 ++++++---
 platform/qt_concurrent_runner.cpp | 36 +++++++++++++++++--------------
 5 files changed, 55 insertions(+), 20 deletions(-)
 create mode 100644 base/runner.cpp

diff --git a/base/base.pro b/base/base.pro
index 38a8d233b6..ae2dd355fc 100644
--- a/base/base.pro
+++ b/base/base.pro
@@ -22,6 +22,7 @@ SOURCES += \
     condition.cpp \
     lower_case.cpp \
     normalize_unicode.cpp \
+    runner.cpp \
 
 HEADERS += \
     SRC_FIRST.hpp \
diff --git a/base/runner.cpp b/base/runner.cpp
new file mode 100644
index 0000000000..198117f97f
--- /dev/null
+++ b/base/runner.cpp
@@ -0,0 +1,23 @@
+#include "runner.hpp"
+#include "logging.hpp"
+#include "exception.hpp"
+
+void threads::IRunner::CallAndCatchAll(RunnerFuncT const & f)
+{
+  try
+  {
+    f();
+  }
+  catch (RootException & e)
+  {
+    LOG(LERROR, ("Exception caught by runner", e.Msg()));
+  }
+  catch (::std::exception & e)
+  {
+    LOG(LERROR, ("Std exception caught by runner", e.what()));
+  }
+  catch (...)
+  {
+    LOG(LERROR, ("Unknown exception caught by runner"));
+  }
+}
diff --git a/base/runner.hpp b/base/runner.hpp
index 231230d8c4..1705e5ec37 100644
--- a/base/runner.hpp
+++ b/base/runner.hpp
@@ -15,6 +15,9 @@ public:
 
   virtual void Run(RunnerFuncT const & f) const = 0;
 
+  // Helper function that calls f() and catches all exception.
+  static void CallAndCatchAll(RunnerFuncT const & f);
+
 protected:
 
   // Waits until all running threads stop.
@@ -29,7 +32,7 @@ class SimpleRunner : public IRunner
 public:
   virtual void Run(RunnerFuncT const & f) const
   {
-    f();
+    IRunner::CallAndCatchAll(f);
   }
 
 protected:
diff --git a/platform/ios_concurrent_runner.mm b/platform/ios_concurrent_runner.mm
index 57ed12dce4..6510f4ee83 100644
--- a/platform/ios_concurrent_runner.mm
+++ b/platform/ios_concurrent_runner.mm
@@ -1,8 +1,11 @@
 #include "concurrent_runner.hpp"
 
 #include "../base/assert.hpp"
+#include "../base/macros.hpp"
 #include "../base/logging.hpp"
 
+#include "../std/scoped_ptr.hpp"
+
 #include <dispatch/dispatch.h>
 
 namespace threads
@@ -41,9 +44,10 @@ namespace threads
 
     void operator()() const
     {
-      m_f();
-      // selfdestruct
-      delete this;
+      scoped_ptr<BoostExceptionFixer> scopedThis;
+      UNUSED_VALUE(scopedThis);
+
+      IRunner<RunnerFuncT>::CallAndCatchAll(f);
     }
   };
 
diff --git a/platform/qt_concurrent_runner.cpp b/platform/qt_concurrent_runner.cpp
index 85960676e8..55d637531f 100644
--- a/platform/qt_concurrent_runner.cpp
+++ b/platform/qt_concurrent_runner.cpp
@@ -1,25 +1,29 @@
 #include "concurrent_runner.hpp"
 
+#include "../std/bind.hpp"
+
 #include <QtCore/QtConcurrentRun>
 #include <QtCore/QThreadPool>
 
 namespace threads
 {
-  ConcurrentRunner::ConcurrentRunner()
-  {
-  }
 
-  ConcurrentRunner::~ConcurrentRunner()
-  {
-  }
-
-  void ConcurrentRunner::Run(RunnerFuncT const & f) const
-  {
-    QtConcurrent::run(f);
-  }
-
-  void ConcurrentRunner::Join()
-  {
-    QThreadPool::globalInstance()->waitForDone();
-  }
+ConcurrentRunner::ConcurrentRunner()
+{
 }
+
+ConcurrentRunner::~ConcurrentRunner()
+{
+}
+
+void ConcurrentRunner::Run(RunnerFuncT const & f) const
+{
+  QtConcurrent::run(bind(&IRunner::CallAndCatchAll, f));
+}
+
+void ConcurrentRunner::Join()
+{
+  QThreadPool::globalInstance()->waitForDone();
+}
+
+}  // namespace threads