X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencode_server_finder.cc;h=6cdd8ce3cc11adb05062c9fd8fdc8744588e33b5;hp=135a8bce8219539f676e37f18b3e05079f38b46c;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hpb=57d00c880094b1dfebaee18f4ecafb1dd44b0afb

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 135a8bce8..6cdd8ce3c 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.
 
@@ -25,7 +25,7 @@
 #include "cross.h"
 #include "encode_server_description.h"
 #include "dcpomatic_socket.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <boost/lambda/lambda.hpp>
 #include <iostream>
@@ -39,6 +39,8 @@ 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;
 
@@ -55,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
 }
 
 
@@ -112,12 +118,13 @@ 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 ()) {
 			/* Broadcast to look for servers */
 			try {
-				boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1);
+				boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), HELLO_PORT);
 				socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
 			} catch (...) {
 
@@ -133,7 +140,7 @@ try
 			}
 			try {
 				boost::asio::ip::udp::resolver resolver (io_service);
-				boost::asio::ip::udp::resolver::query query (*i, raw_convert<string> (Config::instance()->server_port_base() + 1));
+				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 (...) {
@@ -141,8 +148,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 (...)
@@ -156,7 +186,9 @@ try {
 	using namespace boost::asio::ip;
 
 	try {
-		_listen_acceptor.reset (new tcp::acceptor (_listen_io_service, tcp::endpoint (tcp::v4(), Config::instance()->server_port_base() + 1)));
+		_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.")));
 	}
@@ -199,8 +231,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);
@@ -211,16 +246,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*