X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server_finder.cc;h=5a5a2bfb74cd38a6bf3329f362c7b9c43dbee215;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=267fbb62ac78235180b42f9df680507513870ada;hpb=918124fb0b2fdf05bf98aee2c74c85387f1d8638;p=dcpomatic.git

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 267fbb62a..5a5a2bfb7 100644
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -27,6 +27,7 @@
 #include "dcpomatic_socket.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+#include <boost/bind/placeholders.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <iostream>
 
@@ -36,17 +37,19 @@ using std::string;
 using std::list;
 using std::vector;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::scoped_array;
-using boost::weak_ptr;
+using std::weak_ptr;
+using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 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));
 }
@@ -54,8 +57,12 @@ 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");
+#endif
 }
 
 
@@ -67,31 +74,19 @@ EncodeServerFinder::~EncodeServerFinder ()
 void
 EncodeServerFinder::stop ()
 {
+	boost::this_thread::disable_interruption dis;
+
 	_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 ();
-		}
-	}
-	delete _search_thread;
-	_search_thread = 0;
+	try {
+		_search_thread.join();
+	} catch (...) {}
 
 	_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 ();
-		}
-	}
-	delete _listen_thread;
-	_listen_thread = 0;
+	try {
+		_listen_thread.join ();
+	} catch (...) {}
 
 	boost::mutex::scoped_lock lm (_servers_mutex);
 	_servers.clear ();
@@ -113,6 +108,7 @@ try
         socket.set_option (boost::asio::socket_base::broadcast (true));
 
 	string const data = DCPOMATIC_HELLO;
+	int const interval = 10;
 
 	while (!_stop) {
 		if (Config::instance()->use_any_servers ()) {
@@ -126,15 +122,10 @@ try
 		}
 
 		/* Query our `definite' servers (if there are any) */
-		vector<string> servers = Config::instance()->servers ();
-		for (vector<string>::const_iterator i = servers.begin(); i != servers.end(); ++i) {
-			if (server_found (*i)) {
-				/* Don't bother asking a server that we already know about */
-				continue;
-			}
+		BOOST_FOREACH (string const& i, Config::instance()->servers()) {
 			try {
 				boost::asio::ip::udp::resolver resolver (io_service);
-				boost::asio::ip::udp::resolver::query query (*i, raw_convert<string> (HELLO_PORT));
+				boost::asio::ip::udp::resolver::query query (i, raw_convert<string> (HELLO_PORT));
 				boost::asio::ip::udp::endpoint end_point (*resolver.resolve (query));
 				socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
 			} catch (...) {
@@ -142,8 +133,31 @@ try
 			}
 		}
 
+		/* Discard servers that we haven't seen for a while */
+		bool removed = false;
+		{
+			boost::mutex::scoped_lock lm (_servers_mutex);
+
+			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 (10));
+		_search_condition.timed_wait (lm, boost::get_system_time() + boost::posix_time::seconds (interval));
 	}
 }
 catch (...)
@@ -202,8 +216,11 @@ EncodeServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Sock
 	xml->read_string (s);
 
 	string const ip = socket->socket().remote_endpoint().address().to_string ();
-	if (!server_found (ip) && xml->optional_number_child<int>("Version").get_value_or (0) == SERVER_LINK_VERSION) {
-		EncodeServerDescription sd (ip, xml->number_child<int> ("Threads"));
+	optional<list<EncodeServerDescription>::iterator> found = server_found (ip);
+	if (found) {
+		(*found)->set_seen ();
+	} else {
+		EncodeServerDescription sd (ip, xml->number_child<int>("Threads"), xml->optional_number_child<int>("Version").get_value_or(0));
 		{
 			boost::mutex::scoped_lock lm (_servers_mutex);
 			_servers.push_back (sd);
@@ -214,16 +231,20 @@ EncodeServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Sock
 	start_accept ();
 }
 
-bool
-EncodeServerFinder::server_found (string ip) const
+optional<list<EncodeServerDescription>::iterator>
+EncodeServerFinder::server_found (string ip)
 {
 	boost::mutex::scoped_lock lm (_servers_mutex);
-	list<EncodeServerDescription>::const_iterator i = _servers.begin();
+	list<EncodeServerDescription>::iterator i = _servers.begin();
 	while (i != _servers.end() && i->host_name() != ip) {
 		++i;
 	}
 
-	return i != _servers.end ();
+	if (i != _servers.end()) {
+		return i;
+	}
+
+	return optional<list<EncodeServerDescription>::iterator>();
 }
 
 EncodeServerFinder*