X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencode_server_finder.cc;h=52c8c89496bdec9b46bb5de1487b06d48907eed8;hp=7491d9ef7cc3d578ffd7ecbd8be7e80d87c7fb70;hb=ea6b2dae46caa1da829fbf499e83cd6ae3b3773a;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05 diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc index 7491d9ef7..52c8c8949 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 + Copyright (C) 2013-2018 Carl Hetherington 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 #include #include #include @@ -39,14 +39,13 @@ 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; EncodeServerFinder::EncodeServerFinder () - : _disabled (false) - , _search_thread (0) - , _listen_thread (0) - , _stop (false) + : _stop (false) { Config::instance()->Changed.connect (boost::bind (&EncodeServerFinder::config_changed, this, _1)); } @@ -54,25 +53,45 @@ 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 } + EncodeServerFinder::~EncodeServerFinder () +{ + stop (); +} + +void +EncodeServerFinder::stop () { _stop = true; _search_condition.notify_all (); - if (_search_thread) { - DCPOMATIC_ASSERT (_search_thread->joinable ()); - _search_thread->join (); + if (_search_thread.joinable()) { + try { + _search_thread.join(); + } catch (...) { + + } } _listen_io_service.stop (); - if (_listen_thread) { - DCPOMATIC_ASSERT (_listen_thread->joinable ()); - _listen_thread->join (); + if (_listen_thread.joinable()) { + try { + _listen_thread.join (); + } catch (...) { + + } } + + boost::mutex::scoped_lock lm (_servers_mutex); + _servers.clear (); } void @@ -91,12 +110,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 (...) { @@ -112,7 +132,7 @@ try } try { boost::asio::ip::udp::resolver resolver (io_service); - boost::asio::ip::udp::resolver::query query (*i, raw_convert (Config::instance()->server_port_base() + 1)); + boost::asio::ip::udp::resolver::query query (*i, raw_convert (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 (...) { @@ -120,8 +140,31 @@ try } } + /* Discard servers that we haven't seen for a while */ + bool removed = false; + { + boost::mutex::scoped_lock lm (_servers_mutex); + + list::iterator i = _servers.begin(); + while (i != _servers.end()) { + if (i->last_seen_seconds() > 2 * interval) { + list::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 (...) @@ -135,7 +178,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."))); } @@ -178,8 +223,11 @@ EncodeServerFinder::handle_accept (boost::system::error_code ec, shared_ptrread_string (s); string const ip = socket->socket().remote_endpoint().address().to_string (); - if (!server_found (ip) && xml->optional_number_child("Version").get_value_or (0) == SERVER_LINK_VERSION) { - EncodeServerDescription sd (ip, xml->number_child ("Threads")); + optional::iterator> found = server_found (ip); + if (found) { + (*found)->set_seen (); + } else { + EncodeServerDescription sd (ip, xml->number_child("Threads"), xml->optional_number_child("Version").get_value_or(0)); { boost::mutex::scoped_lock lm (_servers_mutex); _servers.push_back (sd); @@ -190,16 +238,20 @@ EncodeServerFinder::handle_accept (boost::system::error_code ec, shared_ptr::iterator> +EncodeServerFinder::server_found (string ip) { boost::mutex::scoped_lock lm (_servers_mutex); - list::const_iterator i = _servers.begin(); + list::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::iterator>(); } EncodeServerFinder*