Another macOS std::list boost::thread SNAFU.

[dcpomatic.git] / src / lib / encode_server_finder.cc

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 06a6a396b1ae75161d6cbe940b585ae18b335083..52c8c89496bdec9b46bb5de1487b06d48907eed8 100644 (file)
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -45,9 +45,7 @@ using dcp::raw_convert;
 EncodeServerFinder* EncodeServerFinder::_instance = 0;
 
 EncodeServerFinder::EncodeServerFinder ()
-       : _search_thread (0)
-       , _listen_thread (0)
-       , _stop (false)
+       : _stop (false)
 {
        Config::instance()->Changed.connect (boost::bind (&EncodeServerFinder::config_changed, this, _1));
 }
@@ -55,11 +53,11 @@ EncodeServerFinder::EncodeServerFinder ()
 void
 EncodeServerFinder::start ()
 {
-       _search_thread = new boost::thread (boost::bind (&EncodeServerFinder::search_thread, this));
-       _listen_thread = new boost::thread (boost::bind (&EncodeServerFinder::listen_thread, this));
+       _search_thread = boost::thread (boost::bind(&EncodeServerFinder::search_thread, this));
+       _listen_thread = boost::thread (boost::bind(&EncodeServerFinder::listen_thread, this));
 #ifdef DCPOMATIC_LINUX
-       pthread_setname_np (_search_thread->native_handle(), "encode-server-search");
-       pthread_setname_np (_listen_thread->native_handle(), "encode-server-listen");
+       pthread_setname_np (_search_thread.native_handle(), "encode-server-search");
+       pthread_setname_np (_listen_thread.native_handle(), "encode-server-listen");
 #endif
 }
 
@@ -75,51 +73,25 @@ EncodeServerFinder::stop ()
        _stop = true;
 
        _search_condition.notify_all ();
-       if (_search_thread) {
-               /* 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 ();
+       if (_search_thread.joinable()) {
+               try {
+                       _search_thread.join();
+               } catch (...) {
+
                }
        }
-       delete _search_thread;
-       _search_thread = 0;
 
        _listen_io_service.stop ();
-       if (_listen_thread) {
-               /* 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 (_listen_thread.joinable()) {
+               try {
+                       _listen_thread.join ();
+               } catch (...) {
+
                }
        }
-       delete _listen_thread;
-       _listen_thread = 0;
 
        boost::mutex::scoped_lock lm (_servers_mutex);
-       _good_servers.clear ();
-       _bad_servers.clear ();
-}
-
-static bool
-remove_missing (list<EncodeServerDescription>& servers, int since)
-{
-       bool removed = false;
-       list<EncodeServerDescription>::iterator i = servers.begin();
-       while (i != servers.end()) {
-               if (i->last_seen_seconds() > since) {
-                       list<EncodeServerDescription>::iterator j = i;
-                       ++j;
-                       servers.erase (i);
-                       i = j;
-                       removed = true;
-               } else {
-                       ++i;
-               }
-       }
-       return removed;
+       _servers.clear ();
 }
 
 void
@@ -169,15 +141,28 @@ try
                }
 
                /* Discard servers that we haven't seen for a while */
+               bool removed = false;
                {
                        boost::mutex::scoped_lock lm (_servers_mutex);
-                       bool g = remove_missing(_good_servers, 2 * interval);
-                       bool b = remove_missing(_bad_servers, 2 * interval);
-                       if (g || b) {
-                               emit (boost::bind (boost::ref (ServersListChanged)));
+
+                       list<EncodeServerDescription>::iterator i = _servers.begin();
+                       while (i != _servers.end()) {
+                               if (i->last_seen_seconds() > 2 * interval) {
+                                       list<EncodeServerDescription>::iterator j = i;
+                                       ++j;
+                                       _servers.erase (i);
+                                       i = j;
+                                       removed = true;
+                               } else {
+                                       ++i;
+                               }
                        }
                }
 
+               if (removed) {
+                       emit (boost::bind (boost::ref (ServersListChanged)));
+               }
+
                boost::mutex::scoped_lock lm (_search_condition_mutex);
                _search_condition.timed_wait (lm, boost::get_system_time() + boost::posix_time::seconds (interval));
        }
@@ -243,12 +228,9 @@ EncodeServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Sock
                (*found)->set_seen ();
        } else {
                EncodeServerDescription sd (ip, xml->number_child<int>("Threads"), xml->optional_number_child<int>("Version").get_value_or(0));
-               if (sd.link_version() == SERVER_LINK_VERSION) {
-                       boost::mutex::scoped_lock lm (_servers_mutex);
-                       _good_servers.push_back (sd);
-               } else {
+               {
                        boost::mutex::scoped_lock lm (_servers_mutex);
-                       _bad_servers.push_back (sd);
+                       _servers.push_back (sd);
                }
                emit (boost::bind (boost::ref (ServersListChanged)));
        }
@@ -260,21 +242,12 @@ optional<list<EncodeServerDescription>::iterator>
 EncodeServerFinder::server_found (string ip)
 {
        boost::mutex::scoped_lock lm (_servers_mutex);
-       list<EncodeServerDescription>::iterator i = _good_servers.begin();
-       while (i != _good_servers.end() && i->host_name() != ip) {
+       list<EncodeServerDescription>::iterator i = _servers.begin();
+       while (i != _servers.end() && i->host_name() != ip) {
                ++i;
        }
 
-       if (i != _good_servers.end()) {
-               return i;
-       }
-
-       i = _bad_servers.begin();
-       while (i != _bad_servers.end() && i->host_name() != ip) {
-               ++i;
-       }
-
-       if (i != _bad_servers.end()) {
+       if (i != _servers.end()) {
                return i;
        }
 
@@ -300,17 +273,10 @@ EncodeServerFinder::drop ()
 }
 
 list<EncodeServerDescription>
-EncodeServerFinder::good_servers () const
-{
-       boost::mutex::scoped_lock lm (_servers_mutex);
-       return _good_servers;
-}
-
-list<EncodeServerDescription>
-EncodeServerFinder::bad_servers () const
+EncodeServerFinder::servers () const
 {
        boost::mutex::scoped_lock lm (_servers_mutex);
-       return _bad_servers;
+       return _servers;
 }
 
 void
@@ -319,8 +285,7 @@ EncodeServerFinder::config_changed (Config::Property what)
        if (what == Config::USE_ANY_SERVERS || what == Config::SERVERS) {
                {
                        boost::mutex::scoped_lock lm (_servers_mutex);
-                       _good_servers.clear ();
-                       _bad_servers.clear ();
+                       _servers.clear ();
                }
                ServersListChanged ();
                _search_condition.notify_all ();