X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=5d85d8800054ea83a4434385d5cced9016061fb5;hp=f1c6d6c44afd0e34d6eb3436a1a493042a6a52c8;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=6bc83f72f12c8513a1e9e9b6fd880697a73f968f diff --git a/src/lib/server.cc b/src/lib/server.cc index f1c6d6c44..5d85d8800 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + 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 @@ -22,56 +22,82 @@ * encoding work, and a class to implement such a server. */ -#include -#include -#include -#include -#include -#include -#include -#include #include "server.h" #include "util.h" -#include "scaler.h" +#include "dcpomatic_socket.h" #include "image.h" -#include "dcp_video_frame.h" +#include "dcp_video.h" #include "config.h" #include "cross.h" -#include "player_video_frame.h" +#include "player_video.h" +#include "data.h" +#include "safe_stringstream.h" +#include "raw_convert.h" +#include "compose.hpp" +#include "log.h" +#include "encoded_log_entry.h" +#include +#include +#include +#include +#include +#include +#include +#include #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); +#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); +#define LOG_GENERAL_NC(...) _log->log (__VA_ARGS__, LogEntry::TYPE_GENERAL); +#define LOG_ERROR(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR); +#define LOG_ERROR_NC(...) _log->log (__VA_ARGS__, LogEntry::TYPE_ERROR); using std::string; -using std::stringstream; -using std::multimap; using std::vector; using std::list; using std::cout; using std::cerr; -using std::setprecision; using std::fixed; using boost::shared_ptr; -using boost::algorithm::is_any_of; -using boost::algorithm::split; using boost::thread; using boost::bind; using boost::scoped_array; using boost::optional; -using libdcp::Size; -using libdcp::raw_convert; +using dcp::Size; Server::Server (shared_ptr log, bool verbose) - : _log (log) + : _terminate (false) + , _log (log) , _verbose (verbose) + , _acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), Config::instance()->server_port_base())) { } +Server::~Server () +{ + { + boost::mutex::scoped_lock lm (_worker_mutex); + _terminate = true; + _empty_condition.notify_all (); + _full_condition.notify_all (); + } + + BOOST_FOREACH (boost::thread* i, _worker_threads) { + DCPOMATIC_ASSERT (i->joinable ()); + i->join (); + delete i; + } + + _io_service.stop (); + + _broadcast.io_service.stop (); + if (_broadcast.thread) { + DCPOMATIC_ASSERT (_broadcast.thread->joinable ()); + _broadcast.thread->join (); + } +} + /** @param after_read Filled in with gettimeofday() after reading the input from the network. * @param after_encode Filled in with gettimeofday() after encoding the image. */ @@ -82,27 +108,31 @@ Server::process (shared_ptr socket, struct timeval& after_read, struct t scoped_array buffer (new char[length]); socket->read (reinterpret_cast (buffer.get()), length); - stringstream s (buffer.get()); + string s (buffer.get()); shared_ptr xml (new cxml::Document ("EncodingRequest")); - xml->read_stream (s); + xml->read_string (s); + /* This is a double-check; the server shouldn't even be on the candidate list + if it is the wrong version, but it doesn't hurt to make sure here. + */ if (xml->number_child ("Version") != SERVER_LINK_VERSION) { cerr << "Mismatched server/client versions\n"; LOG_ERROR_NC ("Mismatched server/client versions"); return -1; } - shared_ptr pvf (new PlayerVideoFrame (xml, socket, _log)); + shared_ptr pvf (new PlayerVideo (xml, socket)); - DCPVideoFrame dcp_video_frame (pvf, xml, _log); + DCPVideo dcp_video_frame (pvf, xml, _log); gettimeofday (&after_read, 0); - - shared_ptr encoded = dcp_video_frame.encode_locally (); + + Data encoded = dcp_video_frame.encode_locally (boost::bind (&Log::dcp_log, _log.get(), _1, _2)); gettimeofday (&after_encode, 0); - + try { - encoded->send (socket); + socket->write (encoded.size ()); + socket->write (encoded.data ().get (), encoded.size ()); } catch (std::exception& e) { cerr << "Send failed; frame " << dcp_video_frame.index() << "\n"; LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index()); @@ -117,13 +147,17 @@ Server::worker_thread () { while (true) { boost::mutex::scoped_lock lock (_worker_mutex); - while (_queue.empty ()) { + while (_queue.empty () && !_terminate) { _empty_condition.wait (lock); } + if (_terminate) { + return; + } + shared_ptr socket = _queue.front (); _queue.pop_front (); - + lock.unlock (); int frame = -1; @@ -133,9 +167,9 @@ Server::worker_thread () struct timeval after_read; struct timeval after_encode; struct timeval end; - + gettimeofday (&start, 0); - + try { frame = process (socket, after_read, after_encode); ip = socket->socket().remote_endpoint().address().to_string(); @@ -147,28 +181,29 @@ Server::worker_thread () gettimeofday (&end, 0); socket.reset (); - + lock.lock (); if (frame >= 0) { struct timeval end; gettimeofday (&end, 0); - stringstream message; - message.precision (2); - message << fixed - << "Encoded frame " << frame << " from " << ip << ": " - << "receive " << (seconds(after_read) - seconds(start)) << "s " - << "encode " << (seconds(after_encode) - seconds(after_read)) << "s " - << "send " << (seconds(end) - seconds(after_encode)) << "s."; - + shared_ptr e ( + new EncodedLogEntry ( + frame, ip, + seconds(after_read) - seconds(start), + seconds(after_encode) - seconds(after_read), + seconds(end) - seconds(after_encode) + ) + ); + if (_verbose) { - cout << message.str() << "\n"; + cout << e->get() << "\n"; } - LOG_GENERAL_NC (message.str ()); + _log->log (e); } - + _full_condition.notify_all (); } } @@ -180,46 +215,25 @@ Server::run (int num_threads) if (_verbose) { cout << "DCP-o-matic server starting with " << num_threads << " threads.\n"; } - + for (int i = 0; i < num_threads; ++i) { _worker_threads.push_back (new thread (bind (&Server::worker_thread, this))); } _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 (true) { - 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) { - _full_condition.wait (lock); - } - - _queue.push_back (socket); - _empty_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); @@ -229,7 +243,7 @@ try boost::bind (&Server::broadcast_received, this) ); - io_service.run (); + _broadcast.io_service.run (); } catch (...) { @@ -246,21 +260,55 @@ Server::broadcast_received () xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("ServerAvailable"); root->add_child("Threads")->add_child_text (raw_convert (_worker_threads.size ())); - stringstream xml; - doc.write_to_stream (xml, "UTF-8"); + root->add_child("Version")->add_child_text (raw_convert (SERVER_LINK_VERSION)); + string xml = doc.write_to_string ("UTF-8"); + if (_verbose) { + cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n"; + } shared_ptr socket (new Socket); try { socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1)); - socket->write (xml.str().length() + 1); - socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1); + socket->write (xml.length() + 1); + socket->write ((uint8_t *) xml.c_str(), xml.length() + 1); } catch (...) { } } - + _broadcast.socket->async_receive_from ( boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)), _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 (); +}