/*
- 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.
#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 <boost/make_shared.hpp>
#include <iostream>
#include "i18n.h"
using boost::shared_ptr;
using boost::scoped_array;
using boost::weak_ptr;
-using boost::make_shared;
+using dcp::raw_convert;
EncodeServerFinder* EncodeServerFinder::_instance = 0;
EncodeServerFinder::EncodeServerFinder ()
- : _disabled (false)
- , _search_thread (0)
+ : _search_thread (0)
, _listen_thread (0)
, _stop (false)
{
{
_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
}
+
EncodeServerFinder::~EncodeServerFinder ()
+{
+ stop ();
+}
+
+void
+EncodeServerFinder::stop ()
{
_stop = true;
_search_condition.notify_all ();
if (_search_thread) {
- DCPOMATIC_ASSERT (_search_thread->joinable ());
- _search_thread->join ();
+ /* 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;
_listen_io_service.stop ();
if (_listen_thread) {
- DCPOMATIC_ASSERT (_listen_thread->joinable ());
- _listen_thread->join ();
+ /* 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;
+
+ boost::mutex::scoped_lock lm (_servers_mutex);
+ _servers.clear ();
}
void
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 (...) {
}
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 (...) {
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.")));
}
void
EncodeServerFinder::start_accept ()
{
- shared_ptr<Socket> socket = make_shared<Socket> ();
+ shared_ptr<Socket> socket (new Socket ());
_listen_acceptor->async_accept (
socket->socket(),
boost::bind (&EncodeServerFinder::handle_accept, this, boost::asio::placeholders::error, socket)
socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
string s (buffer.get());
- shared_ptr<cxml::Document> xml = make_shared<cxml::Document> ("ServerAvailable");
+ shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
xml->read_string (s);
string const ip = socket->socket().remote_endpoint().address().to_string ();