X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.cc;h=a14578a6bd7774fbab8e7b365e9b3866e2bf4818;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=4f27ee42132ac244c45f22020a4bba6db6902d82;hpb=f80e2f7b370c3a6dfa8a78c9665a8eaf43a05f03;p=dcpomatic.git diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc index 4f27ee421..a14578a6b 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. @@ -33,42 +33,48 @@ #include "player_video.h" #include "compose.hpp" #include "log.h" +#include "dcpomatic_log.h" #include "encoded_log_entry.h" +#include "version.h" +#include "warnings.h" #include #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #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; using std::cout; using std::cerr; using std::fixed; -using boost::shared_ptr; +using std::shared_ptr; using boost::thread; using boost::bind; using boost::scoped_array; using boost::optional; +using dcp::ArrayData; using dcp::Size; -using dcp::Data; using dcp::raw_convert; -EncodeServer::EncodeServer (shared_ptr log, bool verbose, int num_threads) +EncodeServer::EncodeServer (bool verbose, int num_threads) +#if !defined(RUNNING_ON_VALGRIND) || RUNNING_ON_VALGRIND == 0 : Server (ENCODE_FRAME_PORT) - , _log (log) +#else + : Server (ENCODE_FRAME_PORT, 2400) +#endif , _verbose (verbose) , _num_threads (num_threads) { @@ -77,6 +83,8 @@ EncodeServer::EncodeServer (shared_ptr log, bool verbose, int num_threads) EncodeServer::~EncodeServer () { + boost::this_thread::disable_interruption dis; + { boost::mutex::scoped_lock lm (_mutex); _terminate = true; @@ -84,25 +92,23 @@ EncodeServer::~EncodeServer () _full_condition.notify_all (); } - 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 ()) { - i->join (); + try { + _worker_threads.join_all (); + } catch (...) {} + + { + boost::mutex::scoped_lock lm (_broadcast.mutex); + if (_broadcast.socket) { + _broadcast.socket->close (); + delete _broadcast.socket; + _broadcast.socket = 0; } - delete i; } _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 (); - } - } + try { + _broadcast.thread.join (); + } catch (...) {} } /** @param after_read Filled in with gettimeofday() after reading the input from the network. @@ -111,6 +117,8 @@ EncodeServer::~EncodeServer () int EncodeServer::process (shared_ptr socket, struct timeval& after_read, struct timeval& after_encode) { + Socket::ReadDigestScope ds (socket); + uint32_t length = socket->read_uint32 (); scoped_array buffer (new char[length]); socket->read (reinterpret_cast (buffer.get()), length); @@ -129,17 +137,22 @@ EncodeServer::process (shared_ptr socket, struct timeval& after_read, st shared_ptr pvf (new PlayerVideo (xml, socket)); - DCPVideo dcp_video_frame (pvf, xml, _log); + if (!ds.check()) { + throw NetworkError ("Checksums do not match"); + } + + 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)); + ArrayData encoded = dcp_video_frame.encode_locally (); gettimeofday (&after_encode, 0); try { + Socket::WriteDigestScope ds (socket); socket->write (encoded.size()); - socket->write (encoded.data().get(), encoded.size()); + socket->write (encoded.data(), 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()); @@ -208,7 +221,7 @@ EncodeServer::worker_thread () cout << e->get() << "\n"; } - _log->log (e); + dcpomatic_log->log (e); } _full_condition.notify_all (); @@ -218,16 +231,24 @@ 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))); +#ifdef DCPOMATIC_LINUX + boost::thread* t = _worker_threads.create_thread (bind(&EncodeServer::worker_thread, this)); + pthread_setname_np (t->native_handle(), "encode-server-worker"); +#else + _worker_threads.create_thread (bind(&EncodeServer::worker_thread, this)); +#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 (); } @@ -272,9 +293,19 @@ EncodeServer::broadcast_received () if (_verbose) { cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n"; } - shared_ptr socket (new Socket); + + try { + 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 { - socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), SERVER_PRESENCE_PORT)); + 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 (...) { @@ -282,10 +313,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 @@ -293,6 +327,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);