#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>
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));
}
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");
+ pthread_setname_np (_search_thread.native_handle(), "encode-server-search");
+ pthread_setname_np (_listen_thread.native_handle(), "encode-server-listen");
#endif
}
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);
- _good_servers.clear ();
- _bad_servers.clear ();
+ _servers.clear ();
}
void
EncodeServerFinder::search_thread ()
try
{
+ start_of_thread ("EncodeServerFinder-search");
+
boost::system::error_code error;
boost::asio::io_service io_service;
boost::asio::ip::udp::socket socket (io_service);
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 ()) {
}
/* 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;
- }
+ for (auto 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 (...) {
}
}
+ /* 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 (...)
void
EncodeServerFinder::listen_thread ()
try {
+ start_of_thread ("EncodeServerFinder-listen");
+
using namespace boost::asio::ip;
try {
xml->read_string (s);
string const ip = socket->socket().remote_endpoint().address().to_string ();
- if (!server_found (ip)) {
+ 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);
- _bad_servers.push_back (sd);
+ _servers.push_back (sd);
}
emit (boost::bind (boost::ref (ServersListChanged)));
}
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 = _good_servers.begin();
- while (i != _good_servers.end() && i->host_name() != ip) {
+ list<EncodeServerDescription>::iterator i = _servers.begin();
+ while (i != _servers.end() && i->host_name() != ip) {
++i;
}
- if (i != _good_servers.end()) {
- return true;
- }
-
- i = _bad_servers.begin();
- while (i != _bad_servers.end() && i->host_name() != ip) {
- ++i;
+ if (i != _servers.end()) {
+ return i;
}
- return i != _bad_servers.end ();
+ return optional<list<EncodeServerDescription>::iterator>();
}
EncodeServerFinder*
}
list<EncodeServerDescription>
-EncodeServerFinder::good_servers () const
-{
- boost::mutex::scoped_lock lm (_servers_mutex);
- return _good_servers;
-}
-
-list<EncodeServerDescription>
-EncodeServerFinder::bad_servers () const
+EncodeServerFinder::servers () const
{
boost::mutex::scoped_lock lm (_servers_mutex);
- return _bad_servers;
+ return _servers;
}
void
if (what == Config::USE_ANY_SERVERS || what == Config::SERVERS) {
{
boost::mutex::scoped_lock lm (_servers_mutex);
- _good_servers.clear ();
- _bad_servers.clear ();
+ _servers.clear ();
}
ServersListChanged ();
_search_condition.notify_all ();
projects / dcpomatic.git / blobdiff