X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.cc;h=16c65dba76f6df8d62c3546d9105fea6ea8662a2;hb=26a4298fcd173a59dc94094df6058e7e96dfa786;hp=3f30a361a898a49587202cb1a2a7f8b512193a29;hpb=17df947ac256397311a11894062070f8069c7e75;p=dcpomatic.git diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc index 3f30a361a..16c65dba7 100644 --- a/src/lib/encode_server.cc +++ b/src/lib/encode_server.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic 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, + DCP-o-matic 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. + along with DCP-o-matic. If not, see . */ @@ -30,27 +31,26 @@ #include "config.h" #include "cross.h" #include "player_video.h" -#include "safe_stringstream.h" -#include "raw_convert.h" #include "compose.hpp" #include "log.h" +#include "dcpomatic_log.h" #include "encoded_log_entry.h" +#include "version.h" +#include #include #include #include #include #include +#ifdef HAVE_VALGRIND_H +#include +#endif #include #include #include #include "i18n.h" -#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::vector; using std::list; @@ -64,12 +64,16 @@ using boost::scoped_array; using boost::optional; using dcp::Size; using dcp::Data; - -EncodeServer::EncodeServer (shared_ptr log, bool verbose) - : _terminate (false) - , _log (log) +using dcp::raw_convert; + +EncodeServer::EncodeServer (bool verbose, int num_threads) +#if !defined(RUNNING_ON_VALGRIND) || RUNNING_ON_VALGRIND == 0 + : Server (ENCODE_FRAME_PORT) +#else + : Server (ENCODE_FRAME_PORT, 2400) +#endif , _verbose (verbose) - , _acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), Config::instance()->server_port_base())) + , _num_threads (num_threads) { } @@ -77,24 +81,40 @@ EncodeServer::EncodeServer (shared_ptr log, bool verbose) EncodeServer::~EncodeServer () { { - boost::mutex::scoped_lock lm (_worker_mutex); + boost::mutex::scoped_lock lm (_mutex); _terminate = true; _empty_condition.notify_all (); _full_condition.notify_all (); } BOOST_FOREACH (boost::thread* i, _worker_threads) { - DCPOMATIC_ASSERT (i->joinable ()); - i->join (); + /* Ideally this would be a DCPOMATIC_ASSERT(i->joinable()) but we + can't throw exceptions from a destructor. + */ + if (i->joinable ()) { + i->join (); + } delete i; } - _io_service.stop (); + { + boost::mutex::scoped_lock lm (_broadcast.mutex); + if (_broadcast.socket) { + _broadcast.socket->close (); + delete _broadcast.socket; + _broadcast.socket = 0; + } + } _broadcast.io_service.stop (); if (_broadcast.thread) { - DCPOMATIC_ASSERT (_broadcast.thread->joinable ()); - _broadcast.thread->join (); + /* Ideally this would be a DCPOMATIC_ASSERT(_broadcast.thread->joinable()) but we + can't throw exceptions from a destructor. + */ + if (_broadcast.thread->joinable ()) { + _broadcast.thread->join (); + } + delete _broadcast.thread; } } @@ -122,11 +142,11 @@ EncodeServer::process (shared_ptr socket, struct timeval& after_read, st shared_ptr pvf (new PlayerVideo (xml, socket)); - DCPVideo dcp_video_frame (pvf, xml, _log); + DCPVideo dcp_video_frame (pvf, xml); gettimeofday (&after_read, 0); - Data encoded = dcp_video_frame.encode_locally (boost::bind (&Log::dcp_log, _log.get(), _1, _2)); + Data encoded = dcp_video_frame.encode_locally (); gettimeofday (&after_encode, 0); @@ -146,7 +166,7 @@ void EncodeServer::worker_thread () { while (true) { - boost::mutex::scoped_lock lock (_worker_mutex); + boost::mutex::scoped_lock lock (_mutex); while (_queue.empty () && !_terminate) { _empty_condition.wait (lock); } @@ -201,7 +221,7 @@ EncodeServer::worker_thread () cout << e->get() << "\n"; } - _log->log (e); + dcpomatic_log->log (e); } _full_condition.notify_all (); @@ -209,21 +229,27 @@ EncodeServer::worker_thread () } void -EncodeServer::run (int num_threads) +EncodeServer::run () { - LOG_GENERAL ("Server starting with %1 threads", num_threads); + LOG_GENERAL ("Server %1 (%2) starting with %3 threads", dcpomatic_version, dcpomatic_git_commit, _num_threads); if (_verbose) { - cout << "DCP-o-matic server starting with " << num_threads << " threads.\n"; + 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 (&EncodeServer::worker_thread, this))); + for (int i = 0; i < _num_threads; ++i) { + thread* t = new thread (bind (&EncodeServer::worker_thread, this)); +#ifdef DCPOMATIC_LINUX + pthread_setname_np (t->native_handle(), "encode-server-worker"); +#endif + _worker_threads.push_back (t); } _broadcast.thread = new thread (bind (&EncodeServer::broadcast_thread, this)); +#ifdef DCPOMATIC_LINUX + pthread_setname_np (_broadcast.thread->native_handle(), "encode-server-broadcast"); +#endif - start_accept (); - _io_service.run (); + Server::run (); } void @@ -231,7 +257,7 @@ EncodeServer::broadcast_thread () try { 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); + boost::asio::ip::udp::endpoint listen_endpoint (address, HELLO_PORT); _broadcast.socket = new boost::asio::ip::udp::socket (_broadcast.io_service); _broadcast.socket->open (listen_endpoint.protocol ()); @@ -266,41 +292,39 @@ EncodeServer::broadcast_received () 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)); + shared_ptr socket (new Socket); + socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), MAIN_SERVER_PRESENCE_PORT)); 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 (&EncodeServer::broadcast_received, this) - ); -} + try { + shared_ptr socket (new Socket); + socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), BATCH_SERVER_PRESENCE_PORT)); + socket->write (xml.length() + 1); + socket->write ((uint8_t *) xml.c_str(), xml.length() + 1); + } catch (...) { -void -EncodeServer::start_accept () -{ - if (_terminate) { - return; + } } - shared_ptr socket (new Socket); - _acceptor.async_accept (socket->socket (), boost::bind (&EncodeServer::handle_accept, this, socket, boost::asio::placeholders::error)); + boost::mutex::scoped_lock lm (_broadcast.mutex); + if (_broadcast.socket) { + _broadcast.socket->async_receive_from ( + boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)), + _broadcast.send_endpoint, boost::bind (&EncodeServer::broadcast_received, this) + ); + } } void -EncodeServer::handle_accept (shared_ptr socket, boost::system::error_code const & error) +EncodeServer::handle (shared_ptr socket) { - if (error) { - return; - } - - boost::mutex::scoped_lock lock (_worker_mutex); + boost::mutex::scoped_lock lock (_mutex); /* Wait until the queue has gone down a bit */ while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) { @@ -309,6 +333,4 @@ EncodeServer::handle_accept (shared_ptr socket, boost::system::error_cod _queue.push_back (socket); _empty_condition.notify_all (); - - start_accept (); }