X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencode_server.cc;h=5884df09aae9642ccea356b640a9d4491ef4fa3e;hp=abd8537c01786475c927ad1a09ac1ba9cb40a063;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc index abd8537c0..5884df09a 100644 --- a/src/lib/encode_server.cc +++ b/src/lib/encode_server.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -31,26 +31,26 @@ #include "config.h" #include "cross.h" #include "player_video.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,10 +64,14 @@ using boost::scoped_array; using boost::optional; using dcp::Size; using dcp::Data; - -EncodeServer::EncodeServer (shared_ptr log, bool verbose, int num_threads) - : Server (Config::instance()->server_port_base()) - , _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) , _num_threads (num_threads) { @@ -84,22 +88,29 @@ EncodeServer::~EncodeServer () } BOOST_FOREACH (boost::thread* i, _worker_threads) { - /* Ideally this would be a DCPOMATIC_ASSERT(i->joinable()) but we - can't throw exceptions from a destructor. - */ - if (i->joinable ()) { + try { i->join (); + } catch (...) { + } delete i; } + { + 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) { - /* 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 (); + if (_broadcast.thread.joinable()) { + try { + _broadcast.thread.join (); + } catch (...) { + } } } @@ -128,11 +139,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); @@ -207,7 +218,7 @@ EncodeServer::worker_thread () cout << e->get() << "\n"; } - _log->log (e); + dcpomatic_log->log (e); } _full_condition.notify_all (); @@ -217,16 +228,23 @@ EncodeServer::worker_thread () void 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"; } for (int i = 0; i < _num_threads; ++i) { - _worker_threads.push_back (new thread (bind (&EncodeServer::worker_thread, this))); + boost::thread* t = new thread(bind(&EncodeServer::worker_thread, this)); + _worker_threads.push_back (t); +#ifdef DCPOMATIC_LINUX + pthread_setname_np (t->native_handle(), "encode-server-worker"); +#endif } - _broadcast.thread = new thread (bind (&EncodeServer::broadcast_thread, this)); + _broadcast.thread = thread (bind(&EncodeServer::broadcast_thread, this)); +#ifdef DCPOMATIC_LINUX + pthread_setname_np (_broadcast.thread.native_handle(), "encode-server-broadcast"); +#endif Server::run (); } @@ -236,7 +254,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 ()); @@ -271,9 +289,19 @@ 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 (...) { + + } + + 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 (...) { @@ -281,10 +309,13 @@ EncodeServer::broadcast_received () } } - _broadcast.socket->async_receive_from ( - boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)), - _broadcast.send_endpoint, boost::bind (&EncodeServer::broadcast_received, this) - ); + 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 @@ -292,6 +323,9 @@ EncodeServer::handle (shared_ptr socket) { boost::mutex::scoped_lock lock (_mutex); + Waker waker; + waker.nudge (); + /* Wait until the queue has gone down a bit */ while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) { _full_condition.wait (lock);