X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fserver_finder.cc;h=642767e8bdda60f1c5e2f751619015da886c4382;hp=744a65f597300fcc809b6daab70e32f8ccd0f0a0;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=9a2b45caa81d8fb056802dfe3c25f214e808ffdf diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc index 744a65f59..642767e8b 100644 --- a/src/lib/server_finder.cc +++ b/src/lib/server_finder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,14 +17,19 @@ */ -#include -#include #include "server_finder.h" #include "exceptions.h" #include "util.h" #include "config.h" #include "cross.h" -#include "ui_signaller.h" +#include "server_description.h" +#include "dcpomatic_socket.h" +#include "raw_convert.h" +#include +#include +#include + +#include "i18n.h" using std::string; using std::list; @@ -32,21 +37,45 @@ using std::vector; using std::cout; using boost::shared_ptr; using boost::scoped_array; -using libdcp::raw_convert; +using boost::weak_ptr; ServerFinder* ServerFinder::_instance = 0; ServerFinder::ServerFinder () : _disabled (false) - , _broadcast_thread (0) + , _search_thread (0) , _listen_thread (0) + , _stop (false) +{ + Config::instance()->Changed.connect (boost::bind (&ServerFinder::config_changed, this, _1)); +} + +void +ServerFinder::start () { - _broadcast_thread = new boost::thread (boost::bind (&ServerFinder::broadcast_thread, this)); + _search_thread = new boost::thread (boost::bind (&ServerFinder::search_thread, this)); _listen_thread = new boost::thread (boost::bind (&ServerFinder::listen_thread, this)); } +ServerFinder::~ServerFinder () +{ + _stop = true; + + _search_condition.notify_all (); + if (_search_thread) { + DCPOMATIC_ASSERT (_search_thread->joinable ()); + _search_thread->join (); + } + + _listen_io_service.stop (); + if (_listen_thread) { + DCPOMATIC_ASSERT (_listen_thread->joinable ()); + _listen_thread->join (); + } +} + void -ServerFinder::broadcast_thread () +ServerFinder::search_thread () try { boost::system::error_code error; @@ -61,8 +90,8 @@ try socket.set_option (boost::asio::socket_base::broadcast (true)); string const data = DCPOMATIC_HELLO; - - while (true) { + + while (!_stop) { if (Config::instance()->use_any_servers ()) { /* Broadcast to look for servers */ try { @@ -89,8 +118,9 @@ try } } - - dcpomatic_sleep (10); + + boost::mutex::scoped_lock lm (_search_condition_mutex); + _search_condition.timed_wait (lm, boost::get_system_time() + boost::posix_time::seconds (10)); } } catch (...) @@ -100,65 +130,75 @@ catch (...) void ServerFinder::listen_thread () -try -{ - while (true) { - shared_ptr sock (new Socket (60)); - - try { - sock->accept (Config::instance()->server_port_base() + 1); - } catch (std::exception& e) { - continue; - } +try { + using namespace boost::asio::ip; - uint32_t length = sock->read_uint32 (); - scoped_array buffer (new char[length]); - sock->read (reinterpret_cast (buffer.get()), length); - - string s (buffer.get()); - shared_ptr xml (new cxml::Document ("ServerAvailable")); - xml->read_string (s); - - string const ip = sock->socket().remote_endpoint().address().to_string (); - if (!server_found (ip)) { - ServerDescription sd (ip, xml->number_child ("Threads")); - _servers.push_back (sd); - ui_signaller->emit (boost::bind (boost::ref (ServerFound), sd)); - } + try { + _listen_acceptor.reset (new tcp::acceptor (_listen_io_service, tcp::endpoint (tcp::v4(), Config::instance()->server_port_base() + 1))); + } catch (...) { + boost::throw_exception (NetworkError (_("Could not listen for remote encode servers. Perhaps another instance of DCP-o-matic is running."))); } + + start_accept (); + _listen_io_service.run (); } catch (...) { store_current (); } -bool -ServerFinder::server_found (string ip) const +void +ServerFinder::start_accept () { - boost::mutex::scoped_lock lm (_mutex); - list::const_iterator i = _servers.begin(); - while (i != _servers.end() && i->host_name() != ip) { - ++i; - } - - return i != _servers.end (); + shared_ptr socket (new Socket ()); + _listen_acceptor->async_accept ( + socket->socket(), + boost::bind (&ServerFinder::handle_accept, this, boost::asio::placeholders::error, socket) + ); } void -ServerFinder::connect (boost::function fn) +ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr socket) { - if (_disabled) { + if (ec) { + start_accept (); return; } - - boost::mutex::scoped_lock lm (_mutex); - /* Emit the current list of servers */ - for (list::iterator i = _servers.begin(); i != _servers.end(); ++i) { - fn (*i); + uint32_t length; + socket->read (reinterpret_cast (&length), sizeof (uint32_t)); + length = ntohl (length); + + scoped_array buffer (new char[length]); + socket->read (reinterpret_cast (buffer.get()), length); + + string s (buffer.get()); + shared_ptr xml (new cxml::Document ("ServerAvailable")); + xml->read_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) { + ServerDescription sd (ip, xml->number_child ("Threads")); + { + boost::mutex::scoped_lock lm (_servers_mutex); + _servers.push_back (sd); + } + emit (boost::bind (boost::ref (ServersListChanged))); + } + + start_accept (); +} + +bool +ServerFinder::server_found (string ip) const +{ + boost::mutex::scoped_lock lm (_servers_mutex); + list::const_iterator i = _servers.begin(); + while (i != _servers.end() && i->host_name() != ip) { + ++i; } - ServerFound.connect (fn); + return i != _servers.end (); } ServerFinder* @@ -166,10 +206,41 @@ ServerFinder::instance () { if (!_instance) { _instance = new ServerFinder (); + _instance->start (); } return _instance; } - - +void +ServerFinder::drop () +{ + delete _instance; + _instance = 0; +} + +list +ServerFinder::servers () const +{ + boost::mutex::scoped_lock lm (_servers_mutex); + return _servers; +} + +void +ServerFinder::config_changed (Config::Property what) +{ + if (what == Config::USE_ANY_SERVERS || what == Config::SERVERS) { + { + boost::mutex::scoped_lock lm (_servers_mutex); + _servers.clear (); + } + ServersListChanged (); + search_now (); + } +} + +void +ServerFinder::search_now () +{ + _search_condition.notify_all (); +}