Remove several exception-throwing asserts from destructors.

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index f318da03b5c2878dc5be5f3d30e74244ebcdf57e..7e015200370afaff06b5f75b6606274665a359f5 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -85,15 +85,23 @@ EncodeServer::~EncodeServer ()
        }
 
        BOOST_FOREACH (boost::thread* i, _worker_threads) {
        }
 
        BOOST_FOREACH (boost::thread* i, _worker_threads) {

-               DCPOMATIC_ASSERT (i->joinable ());
-               i->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(i->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (i->joinable ()) {
+                       i->join ();
+               }

                delete i;
        }
 
        _broadcast.io_service.stop ();
        if (_broadcast.thread) {
                delete i;
        }
 
        _broadcast.io_service.stop ();
        if (_broadcast.thread) {

-               DCPOMATIC_ASSERT (_broadcast.thread->joinable ());
-               _broadcast.thread->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(_broadcast.thread->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (_broadcast.thread->joinable ()) {
+                       _broadcast.thread->join ();
+               }

        }
 }
 
        }
 }
 

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 7491d9ef7cc3d578ffd7ecbd8be7e80d87c7fb70..eebf404fafa9604116fb8cb0831b7458c7390e43 100644 (file)
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -64,14 +64,22 @@ EncodeServerFinder::~EncodeServerFinder ()
 
        _search_condition.notify_all ();
        if (_search_thread) {
 
        _search_condition.notify_all ();
        if (_search_thread) {

-               DCPOMATIC_ASSERT (_search_thread->joinable ());
-               _search_thread->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(_search_thread->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (_search_thread->joinable ()) {
+                       _search_thread->join ();
+               }

        }
 
        _listen_io_service.stop ();
        if (_listen_thread) {
        }
 
        _listen_io_service.stop ();
        if (_listen_thread) {

-               DCPOMATIC_ASSERT (_listen_thread->joinable ());
-               _listen_thread->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(_listen_thread->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (_listen_thread->joinable ()) {
+                       _listen_thread->join ();
+               }

        }
 }
 
        }
 }
 

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 08c744e0738a8faa4155d0bdf7ac083b8fcba134..c9924d226426c0da60d358d9b362fcd6f4d356f4 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -63,8 +63,12 @@ JobManager::~JobManager ()
        }
 
        if (_scheduler) {
        }
 
        if (_scheduler) {

-               DCPOMATIC_ASSERT (_scheduler->joinable ());
-               _scheduler->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(_scheduler->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (_scheduler->joinable ()) {
+                       _scheduler->join ();
+               }

        }
 
        delete _scheduler;
        }
 
        delete _scheduler;

diff --git a/src/lib/update_checker.cc b/src/lib/update_checker.cc
index e3bbd663ee254af8abbc68fabf71774edb2141f6..58bc7c1b7436d6743615a56a5da7e3176cebe818 100644 (file)
--- a/src/lib/update_checker.cc
+++ b/src/lib/update_checker.cc
@@ -86,8 +86,12 @@ UpdateChecker::~UpdateChecker ()
 
        _condition.notify_all ();
        if (_thread) {
 
        _condition.notify_all ();
        if (_thread) {

-               DCPOMATIC_ASSERT (_thread->joinable ());
-               _thread->join ();
+               /* Ideally this would be a DCPOMATIC_ASSERT(_thread->joinable()) but we
+                  can't throw exceptions from a destructor.
+               */
+               if (_thread->joinable ()) {
+                       _thread->join ();
+               }

        }
        delete _thread;
 
        }
        delete _thread;