Put back in the code that (de-)registers threads and catches exceptions.

git-svn-id: https://svn.dealii.org/trunk@18262 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/base/include/base/thread_management.h b/deal.II/base/include/base/thread_management.h
index a2d7efa69fbda1103ab9966f27a027d01df289eb..bf56e0a51e357bd1b1b66bdc7226f48b04a671a7 100644 (file)
--- a/deal.II/base/include/base/thread_management.h
+++ b/deal.II/base/include/base/thread_management.h
@@ -1260,7 +1260,32 @@ namespace Threads
        void thread_entry_point (const std_cxx0x::function<RT ()> function,
                                 return_value<RT> *ret_val)
          {
-           call (function, *ret_val);
+                                            // now call the function
+                                            // in question. since an
+                                             // exception that is
+                                             // thrown from one of the
+                                             // called functions will
+                                             // not propagate to the
+                                             // main thread, it will
+                                             // kill the program if
+                                             // not treated here
+                                             // before we return to
+                                             // the operating system's
+                                             // thread library
+            internal::register_thread ();
+            try 
+              {
+                call (function, *ret_val);
+              }
+            catch (const std::exception &exc)
+              {
+                internal::handle_std_exception (exc);
+              }
+            catch (...)
+              {
+                internal::handle_unknown_exception ();
+              }
+            internal::deregister_thread ();
          }
     };