X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=fe792e307424501b2c8a6df845c4b202f01d1504;hb=4616b19fb5241a54c9d57f7a91bb975f41aed14b;hp=bad7ad89310d95ccb8619488e13ae873771de31f;hpb=4782e1c0beec98560950a616902669f09a98faae;p=dcpomatic.git diff --git a/src/lib/server.cc b/src/lib/server.cc index bad7ad893..fe792e307 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 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 @@ -27,9 +27,9 @@ #include #include #include -#include #include #include +#include #include "server.h" #include "util.h" #include "scaler.h" @@ -37,9 +37,15 @@ #include "dcp_video_frame.h" #include "config.h" #include "cross.h" +#include "player_video_frame.h" #include "i18n.h" +#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); +#define LOG_GENERAL_NC(...) _log->log (__VA_ARGS__, Log::TYPE_GENERAL); +#define LOG_ERROR(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR); +#define LOG_ERROR_NC(...) _log->log (__VA_ARGS__, Log::TYPE_ERROR); + using std::string; using std::stringstream; using std::multimap; @@ -56,44 +62,35 @@ using boost::thread; using boost::bind; using boost::scoped_array; using boost::optional; -using boost::lexical_cast; -using libdcp::Size; +using dcp::Size; +using dcp::raw_convert; -ServerDescription::ServerDescription (shared_ptr node) +Server::Server (shared_ptr log, bool verbose) + : _terminate (false) + , _log (log) + , _verbose (verbose) + , _acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), Config::instance()->server_port_base())) { - _host_name = node->string_child ("HostName"); - _threads = node->number_child ("Threads"); -} -void -ServerDescription::as_xml (xmlpp::Node* root) const -{ - root->add_child("HostName")->add_child_text (_host_name); - root->add_child("Threads")->add_child_text (boost::lexical_cast (_threads)); } -/** Create a server description from a string of metadata returned from as_metadata(). - * @param v Metadata. - * @return ServerDescription, or 0. - */ -optional -ServerDescription::create_from_metadata (string v) +Server::~Server () { - vector b; - split (b, v, is_any_of (" ")); - - if (b.size() != 2) { - return optional (); + { + boost::mutex::scoped_lock lm (_worker_mutex); + _terminate = true; + _empty_condition.notify_all (); } - return ServerDescription (b[0], atoi (b[1].c_str ())); -} + for (vector::iterator i = _worker_threads.begin(); i != _worker_threads.end(); ++i) { + (*i)->join (); + delete *i; + } -Server::Server (shared_ptr log, bool verbose) - : _log (log) - , _verbose (verbose) -{ + _io_service.stop (); + _broadcast.io_service.stop (); + _broadcast.thread->join (); } /** @param after_read Filled in with gettimeofday() after reading the input from the network. @@ -105,24 +102,19 @@ Server::process (shared_ptr socket, struct timeval& after_read, struct t uint32_t length = socket->read_uint32 (); scoped_array buffer (new char[length]); socket->read (reinterpret_cast (buffer.get()), length); - + stringstream s (buffer.get()); shared_ptr xml (new cxml::Document ("EncodingRequest")); xml->read_stream (s); if (xml->number_child ("Version") != SERVER_LINK_VERSION) { cerr << "Mismatched server/client versions\n"; - _log->log ("Mismatched server/client versions"); + LOG_ERROR_NC ("Mismatched server/client versions"); return -1; } - libdcp::Size size ( - xml->number_child ("Width"), xml->number_child ("Height") - ); - - shared_ptr image (new Image (PIX_FMT_RGB24, size, true)); + shared_ptr pvf (new PlayerVideoFrame (xml, socket, _log)); - image->read_from_socket (socket); - DCPVideoFrame dcp_video_frame (image, xml, _log); + DCPVideoFrame dcp_video_frame (pvf, xml, _log); gettimeofday (&after_read, 0); @@ -133,15 +125,12 @@ Server::process (shared_ptr socket, struct timeval& after_read, struct t try { encoded->send (socket); } catch (std::exception& e) { - _log->log (String::compose ( - "Send failed; frame %1, data size %2, pixel format %3, image size %4x%5, %6 components", - dcp_video_frame.frame(), encoded->size(), image->pixel_format(), image->size().width, image->size().height, image->components() - ) - ); + cerr << "Send failed; frame " << dcp_video_frame.index() << "\n"; + LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index()); throw; } - return dcp_video_frame.frame (); + return dcp_video_frame.index (); } void @@ -149,8 +138,12 @@ Server::worker_thread () { while (1) { boost::mutex::scoped_lock lock (_worker_mutex); - while (_queue.empty ()) { - _worker_condition.wait (lock); + while (_queue.empty () && !_terminate) { + _empty_condition.wait (lock); + } + + if (_terminate) { + return; } shared_ptr socket = _queue.front (); @@ -172,7 +165,8 @@ Server::worker_thread () frame = process (socket, after_read, after_encode); ip = socket->socket().remote_endpoint().address().to_string(); } catch (std::exception& e) { - _log->log (String::compose ("Error: %1", e.what())); + cerr << "Error: " << e.what() << "\n"; + LOG_ERROR ("Error: %1", e.what()); } gettimeofday (&end, 0); @@ -197,19 +191,19 @@ Server::worker_thread () cout << message.str() << "\n"; } - _log->log (message.str ()); + LOG_GENERAL_NC (message.str ()); } - _worker_condition.notify_all (); + _full_condition.notify_all (); } } void Server::run (int num_threads) { - _log->log (String::compose ("Server starting with %1 threads", num_threads)); + LOG_GENERAL ("Server starting with %1 threads", num_threads); if (_verbose) { - cout << "DCP-o-matic server started with " << num_threads << " threads.\n"; + cout << "DCP-o-matic server starting with " << num_threads << " threads.\n"; } for (int i = 0; i < num_threads; ++i) { @@ -218,38 +212,18 @@ Server::run (int num_threads) _broadcast.thread = new thread (bind (&Server::broadcast_thread, this)); - boost::asio::io_service io_service; - - boost::asio::ip::tcp::acceptor acceptor ( - io_service, - boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), Config::instance()->server_port_base ()) - ); - - while (1) { - shared_ptr socket (new Socket); - acceptor.accept (socket->socket ()); - - boost::mutex::scoped_lock lock (_worker_mutex); - - /* Wait until the queue has gone down a bit */ - while (int (_queue.size()) >= num_threads * 2) { - _worker_condition.wait (lock); - } - - _queue.push_back (socket); - _worker_condition.notify_all (); - } + start_accept (); + _io_service.run (); } void Server::broadcast_thread () +try { - boost::asio::io_service io_service; - boost::asio::ip::address address = boost::asio::ip::address_v4::any (); boost::asio::ip::udp::endpoint listen_endpoint (address, Config::instance()->server_port_base() + 1); - _broadcast.socket = new boost::asio::ip::udp::socket (io_service); + _broadcast.socket = new boost::asio::ip::udp::socket (_broadcast.io_service); _broadcast.socket->open (listen_endpoint.protocol ()); _broadcast.socket->bind (listen_endpoint); @@ -259,7 +233,11 @@ Server::broadcast_thread () boost::bind (&Server::broadcast_received, this) ); - io_service.run (); + _broadcast.io_service.run (); +} +catch (...) +{ + store_current (); } void @@ -271,7 +249,7 @@ Server::broadcast_received () /* Reply to the client saying what we can do */ xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("ServerAvailable"); - root->add_child("Threads")->add_child_text (lexical_cast (_worker_threads.size ())); + root->add_child("Threads")->add_child_text (raw_convert (_worker_threads.size ())); stringstream xml; doc.write_to_stream (xml, "UTF-8"); @@ -290,3 +268,35 @@ Server::broadcast_received () _broadcast.send_endpoint, boost::bind (&Server::broadcast_received, this) ); } + +void +Server::start_accept () +{ + if (_terminate) { + return; + } + + shared_ptr socket (new Socket); + _acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error)); +} + +void +Server::handle_accept (shared_ptr socket, boost::system::error_code const & error) +{ + if (error) { + return; + } + + boost::mutex::scoped_lock lock (_worker_mutex); + + /* Wait until the queue has gone down a bit */ + while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) { + _full_condition.wait (lock); + } + + _queue.push_back (socket); + _empty_condition.notify_all (); + + start_accept (); +} +