assert (joinable) before joining threads.

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 545fd956c11548bdc409525c93d8bce5454b0fe3..86e010c106b929d0cb6869026eda4a70baab86e5 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -62,6 +62,7 @@ JobManager::~JobManager ()
        }
 
        if (_scheduler) {
+               DCPOMATIC_ASSERT (_scheduler->joinable ());
                _scheduler->join ();
        }
 

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 260f2e469aeacad2bfd39d71030e05c28e50dc72..dd076a049cd01b62cc08c47d51ee90b62a8d2db6 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -81,15 +81,17 @@ Server::~Server ()
                _full_condition.notify_all ();
        }
 
-       for (vector<boost::thread*>::iterator i = _worker_threads.begin(); i != _worker_threads.end(); ++i) {
-               (*i)->join ();
-               delete *i;
+       BOOST_FOREACH (boost::thread* i, _worker_threads) {
+               DCPOMATIC_ASSERT (i->joinable ());
+               i->join ();
+               delete i;
        }
 
        _io_service.stop ();
 
        _broadcast.io_service.stop ();
        if (_broadcast.thread) {
+               DCPOMATIC_ASSERT (_broadcast.thread->join ());
                _broadcast.thread->join ();
        }
 }

diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 4b532f98129d4f70386040d9dfc182761973312f..642767e8bdda60f1c5e2f751619015da886c4382 100644 (file)
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -63,11 +63,13 @@ ServerFinder::~ServerFinder ()
 
        _search_condition.notify_all ();
        if (_search_thread) {
+               DCPOMATIC_ASSERT (_search_thread->joinable ());
                _search_thread->join ();
        }
 
        _listen_io_service.stop ();
        if (_listen_thread) {
+               DCPOMATIC_ASSERT (_listen_thread->joinable ());
                _listen_thread->join ();
        }
 }

diff --git a/src/lib/update_checker.cc b/src/lib/update_checker.cc
index 4ee728fdeb6252ecad7f9f6bfecc52bc744e94bf..4c5075e20f3d81a1e298cf0f914e3434fd616497 100644 (file)
--- a/src/lib/update_checker.cc
+++ b/src/lib/update_checker.cc
@@ -86,6 +86,7 @@ UpdateChecker::~UpdateChecker ()
 
        _condition.notify_all ();
        if (_thread) {
+               DCPOMATIC_ASSERT (_thread->joinable ());
                _thread->join ();
        }
        delete _thread;

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 1318cc20f2a6b93514dc897ba26a5218493ce6b7..bace6602dfb6331fa74a643244757fc4f9caeb81 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -477,6 +477,7 @@ Writer::terminate_thread (bool can_throw)
        _full_condition.notify_all ();
        lock.unlock ();
 
+       DCPOMATIC_ASSERT (_thread->joinable ());
        _thread->join ();
        if (can_throw) {
                rethrow ();