From f213fd833a840fc97e3875979ae7dc7cbbc883b1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 29 Jan 2015 00:37:06 +0000 Subject: Move Socket to dcpomatic_socket.{cc,h}. --- src/lib/dcpomatic_socket.h | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 src/lib/dcpomatic_socket.h (limited to 'src/lib/dcpomatic_socket.h') diff --git a/src/lib/dcpomatic_socket.h b/src/lib/dcpomatic_socket.h new file mode 100644 index 000000000..d2ee6d555 --- /dev/null +++ b/src/lib/dcpomatic_socket.h @@ -0,0 +1,59 @@ +/* + Copyright (C) 2012-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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include + +/** @class Socket + * @brief A class to wrap a boost::asio::ip::tcp::socket with some things + * that are useful for DCP-o-matic. + * + * This class wraps some things that I could not work out how to do with boost; + * most notably, sync read/write calls with timeouts. + */ +class Socket +{ +public: + Socket (int timeout = 30); + ~Socket (); + + /** @return Our underlying socket */ + boost::asio::ip::tcp::socket& socket () { + return _socket; + } + + void connect (boost::asio::ip::tcp::endpoint); + void accept (int); + + void write (uint32_t n); + void write (uint8_t const * data, int size); + + void read (uint8_t* data, int size); + uint32_t read_uint32 (); + +private: + void check (); + + Socket (Socket const &); + + boost::asio::io_service _io_service; + boost::asio::deadline_timer _deadline; + boost::asio::ip::tcp::socket _socket; + boost::asio::ip::tcp::acceptor* _acceptor; + int _timeout; +}; -- cgit v1.2.3 From 00ee110ef1de083759c4f74bdfeff78752b6198f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 29 Jan 2015 19:54:07 +0000 Subject: Make ServerFinder stop nicely when dcpomatic_cli quits. --- src/lib/cinema.cc | 2 +- src/lib/dcpomatic_socket.h | 4 +- src/lib/server_finder.cc | 119 +++++++++++++++++++++++++++++---------------- src/lib/server_finder.h | 8 +++ src/tools/dcpomatic_cli.cc | 2 + 5 files changed, 90 insertions(+), 45 deletions(-) (limited to 'src/lib/dcpomatic_socket.h') diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc index f06db3543..ce3077b2a 100644 --- a/src/lib/cinema.cc +++ b/src/lib/cinema.cc @@ -68,7 +68,7 @@ Cinema::remove_screen (shared_ptr s) } Screen::Screen (cxml::ConstNodePtr node) - : name (node->string_child ("name")) + : name (node->string_child ("Name")) { if (node->optional_string_child ("Certificate")) { certificate = dcp::Certificate (node->string_child ("Certificate")); diff --git a/src/lib/dcpomatic_socket.h b/src/lib/dcpomatic_socket.h index d2ee6d555..b9859f600 100644 --- a/src/lib/dcpomatic_socket.h +++ b/src/lib/dcpomatic_socket.h @@ -23,10 +23,10 @@ * @brief A class to wrap a boost::asio::ip::tcp::socket with some things * that are useful for DCP-o-matic. * - * This class wraps some things that I could not work out how to do with boost; + * This class wraps some things that I could not work out how to do easily with boost; * most notably, sync read/write calls with timeouts. */ -class Socket +class Socket : public boost::noncopyable { public: Socket (int timeout = 30); diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc index ffc2d42df..bef00702f 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,16 @@ */ -#include -#include #include "server_finder.h" #include "exceptions.h" #include "util.h" #include "config.h" #include "cross.h" #include "ui_signaller.h" +#include "dcpomatic_socket.h" +#include +#include +#include #include "i18n.h" @@ -34,6 +36,7 @@ using std::vector; using std::cout; using boost::shared_ptr; using boost::scoped_array; +using boost::weak_ptr; using dcp::raw_convert; ServerFinder* ServerFinder::_instance = 0; @@ -42,11 +45,23 @@ ServerFinder::ServerFinder () : _disabled (false) , _broadcast_thread (0) , _listen_thread (0) + , _stop (false) { _broadcast_thread = new boost::thread (boost::bind (&ServerFinder::broadcast_thread, this)); _listen_thread = new boost::thread (boost::bind (&ServerFinder::listen_thread, this)); } +ServerFinder::~ServerFinder () +{ + _stop = true; + + _broadcast_thread->interrupt (); + _broadcast_thread->join (); + + _listen_io_service.stop (); + _listen_thread->join (); +} + void ServerFinder::broadcast_thread () try @@ -64,7 +79,7 @@ try string const data = DCPOMATIC_HELLO; - while (true) { + while (!_stop) { if (Config::instance()->use_any_servers ()) { /* Broadcast to look for servers */ try { @@ -91,8 +106,12 @@ try } } - - dcpomatic_sleep (10); + + try { + boost::thread::sleep (boost::get_system_time() + boost::posix_time::seconds (10)); + } catch (boost::thread_interrupted& e) { + return; + } } } catch (...) @@ -102,53 +121,65 @@ catch (...) void ServerFinder::listen_thread () -try -{ +try { using namespace boost::asio::ip; - boost::asio::io_service io_service; - boost::scoped_ptr acceptor; try { - acceptor.reset (new tcp::acceptor (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(), 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."))); } - while (true) { - tcp::socket socket (io_service); - acceptor->accept (socket); - - /* XXX: these reads should have timeouts, otherwise we will stop finding servers - if one dies during this conversation - */ - - uint32_t length = 0; - boost::asio::read (socket, boost::asio::buffer (&length, sizeof (uint32_t))); - length = ntohl (length); - - scoped_array buffer (new char[length]); - boost::asio::read (socket, boost::asio::buffer (reinterpret_cast (buffer.get ()), length)); - - string s (buffer.get()); - shared_ptr xml (new cxml::Document ("ServerAvailable")); - xml->read_string (s); - - string const ip = socket.remote_endpoint().address().to_string (); - if (!server_found (ip)) { - ServerDescription sd (ip, xml->number_child ("Threads")); - { - boost::mutex::scoped_lock lm (_mutex); - _servers.push_back (sd); - } - ui_signaller->emit (boost::bind (boost::ref (ServerFound), sd)); - } - } + start_accept (); + _listen_io_service.run (); } catch (...) { store_current (); } +void +ServerFinder::start_accept () +{ + shared_ptr socket (new Socket ()); + _listen_acceptor->async_accept ( + socket->socket(), + boost::bind (&ServerFinder::handle_accept, this, boost::asio::placeholders::error, socket) + ); +} + +void +ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr socket) +{ + if (ec) { + start_accept (); + return; + } + + 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)) { + ServerDescription sd (ip, xml->number_child ("Threads")); + { + boost::mutex::scoped_lock lm (_mutex); + _servers.push_back (sd); + } + ui_signaller->emit (boost::bind (boost::ref (ServerFound), sd)); + } + + start_accept (); +} + bool ServerFinder::server_found (string ip) const { @@ -188,5 +219,9 @@ ServerFinder::instance () return _instance; } - - +void +ServerFinder::drop () +{ + delete _instance; + _instance = 0; +} diff --git a/src/lib/server_finder.h b/src/lib/server_finder.h index 6f02042ce..c0f1feb66 100644 --- a/src/lib/server_finder.h +++ b/src/lib/server_finder.h @@ -26,6 +26,7 @@ public: void connect (boost::function); static ServerFinder* instance (); + static void drop (); void disable () { _disabled = true; @@ -33,11 +34,14 @@ public: private: ServerFinder (); + ~ServerFinder (); void broadcast_thread (); void listen_thread (); bool server_found (std::string) const; + void start_accept (); + void handle_accept (boost::system::error_code ec, boost::shared_ptr socket); boost::signals2::signal ServerFound; @@ -51,5 +55,9 @@ private: std::list _servers; mutable boost::mutex _mutex; + boost::asio::io_service _listen_io_service; + boost::shared_ptr _listen_acceptor; + bool _stop; + static ServerFinder* _instance; }; diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 0b946181a..44abf4116 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -216,6 +216,8 @@ main (int argc, char* argv[]) indirectly holding onto codecs. */ JobManager::drop (); + + ServerFinder::drop (); return error ? EXIT_FAILURE : EXIT_SUCCESS; } -- cgit v1.2.3 From 27867be66579551018c926ed3339624e463c1b08 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 29 Jan 2015 20:00:59 +0000 Subject: Remove unused socket stuff. --- src/lib/dcpomatic_socket.cc | 32 +------------------------------- src/lib/dcpomatic_socket.h | 3 --- 2 files changed, 1 insertion(+), 34 deletions(-) (limited to 'src/lib/dcpomatic_socket.h') diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc index bc8f596a7..d575e3230 100644 --- a/src/lib/dcpomatic_socket.cc +++ b/src/lib/dcpomatic_socket.cc @@ -28,27 +28,17 @@ Socket::Socket (int timeout) : _deadline (_io_service) , _socket (_io_service) - , _acceptor (0) , _timeout (timeout) { _deadline.expires_at (boost::posix_time::pos_infin); check (); } -Socket::~Socket () -{ - delete _acceptor; -} - void Socket::check () { if (_deadline.expires_at() <= boost::asio::deadline_timer::traits_type::now ()) { - if (_acceptor) { - _acceptor->cancel (); - } else { - _socket.close (); - } + _socket.close (); _deadline.expires_at (boost::posix_time::pos_infin); } @@ -77,26 +67,6 @@ Socket::connect (boost::asio::ip::tcp::endpoint endpoint) } } -void -Socket::accept (int port) -{ - _acceptor = new boost::asio::ip::tcp::acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port)); - - _deadline.expires_from_now (boost::posix_time::seconds (_timeout)); - boost::system::error_code ec = boost::asio::error::would_block; - _acceptor->async_accept (_socket, boost::lambda::var(ec) = boost::lambda::_1); - do { - _io_service.run_one (); - } while (ec == boost::asio::error::would_block); - - delete _acceptor; - _acceptor = 0; - - if (ec) { - throw NetworkError (String::compose (_("error during async_accept (%1)"), ec.value ())); - } -} - /** Blocking write. * @param data Buffer to write. * @param size Number of bytes to write. diff --git a/src/lib/dcpomatic_socket.h b/src/lib/dcpomatic_socket.h index b9859f600..82ca5ff69 100644 --- a/src/lib/dcpomatic_socket.h +++ b/src/lib/dcpomatic_socket.h @@ -30,7 +30,6 @@ class Socket : public boost::noncopyable { public: Socket (int timeout = 30); - ~Socket (); /** @return Our underlying socket */ boost::asio::ip::tcp::socket& socket () { @@ -38,7 +37,6 @@ public: } void connect (boost::asio::ip::tcp::endpoint); - void accept (int); void write (uint32_t n); void write (uint8_t const * data, int size); @@ -54,6 +52,5 @@ private: boost::asio::io_service _io_service; boost::asio::deadline_timer _deadline; boost::asio::ip::tcp::socket _socket; - boost::asio::ip::tcp::acceptor* _acceptor; int _timeout; }; -- cgit v1.2.3