}
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) {
- 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 ();
+ }
}
}
_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) {
- 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 ();
+ }
}
}
}
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;
_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;