X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencode_server_finder.cc;h=06a6a396b1ae75161d6cbe940b585ae18b335083;hp=2796df8f55e85417b37478e1d8dcf860245d3c68;hb=6dd6676700f830547e9e7c38781f09de5f2a1a00;hpb=f80e2f7b370c3a6dfa8a78c9665a8eaf43a05f03

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 2796df8f5..06a6a396b 100644
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -39,6 +39,7 @@ using std::cout;
 using boost::shared_ptr;
 using boost::scoped_array;
 using boost::weak_ptr;
+using boost::optional;
 using dcp::raw_convert;
 
 EncodeServerFinder* EncodeServerFinder::_instance = 0;
@@ -56,6 +57,10 @@ EncodeServerFinder::start ()
 {
 	_search_thread = new boost::thread (boost::bind (&EncodeServerFinder::search_thread, this));
 	_listen_thread = new 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
 }
 
 
@@ -94,7 +99,27 @@ EncodeServerFinder::stop ()
 	_listen_thread = 0;
 
 	boost::mutex::scoped_lock lm (_servers_mutex);
-	_servers.clear ();
+	_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;
 }
 
 void
@@ -113,6 +138,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 ()) {
@@ -142,8 +168,18 @@ try
 			}
 		}
 
+		/* Discard servers that we haven't seen for a while */
+		{
+			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)));
+			}
+		}
+
 		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 (...)
@@ -157,7 +193,9 @@ try {
 	using namespace boost::asio::ip;
 
 	try {
-		_listen_acceptor.reset (new tcp::acceptor (_listen_io_service, tcp::endpoint (tcp::v4(), SERVER_PRESENCE_PORT)));
+		_listen_acceptor.reset (
+			new tcp::acceptor (_listen_io_service, tcp::endpoint (tcp::v4(), is_batch_converter ? BATCH_SERVER_PRESENCE_PORT : MAIN_SERVER_PRESENCE_PORT))
+			);
 	} catch (...) {
 		boost::throw_exception (NetworkError (_("Could not listen for remote encode servers.  Perhaps another instance of DCP-o-matic is running.")));
 	}
@@ -200,11 +238,17 @@ 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));
+		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);
-			_servers.push_back (sd);
+			_bad_servers.push_back (sd);
 		}
 		emit (boost::bind (boost::ref (ServersListChanged)));
 	}
@@ -212,16 +256,29 @@ 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();
-	while (i != _servers.end() && i->host_name() != ip) {
+	list<EncodeServerDescription>::iterator i = _good_servers.begin();
+	while (i != _good_servers.end() && i->host_name() != ip) {
 		++i;
 	}
 
-	return i != _servers.end ();
+	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()) {
+		return i;
+	}
+
+	return optional<list<EncodeServerDescription>::iterator>();
 }
 
 EncodeServerFinder*
@@ -243,10 +300,17 @@ EncodeServerFinder::drop ()
 }
 
 list<EncodeServerDescription>
-EncodeServerFinder::servers () const
+EncodeServerFinder::good_servers () const
+{
+	boost::mutex::scoped_lock lm (_servers_mutex);
+	return _good_servers;
+}
+
+list<EncodeServerDescription>
+EncodeServerFinder::bad_servers () const
 {
 	boost::mutex::scoped_lock lm (_servers_mutex);
-	return _servers;
+	return _bad_servers;
 }
 
 void
@@ -255,7 +319,8 @@ EncodeServerFinder::config_changed (Config::Property what)
 	if (what == Config::USE_ANY_SERVERS || what == Config::SERVERS) {
 		{
 			boost::mutex::scoped_lock lm (_servers_mutex);
-			_servers.clear ();
+			_good_servers.clear ();
+			_bad_servers.clear ();
 		}
 		ServersListChanged ();
 		_search_condition.notify_all ();