X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.cc;h=24ba5bc451449bc59ab63d2c71d8ed182eb56a13;hb=a5a71d047e9ebe7db34c27457cf178c541fe9147;hp=26ef45d60786115e51c166b615c10a116c74e0d7;hpb=8e4a2e5ea578ac4f0f41edb6145d5c0040e33ec2;p=dcpomatic.git diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc index 26ef45d60..24ba5bc45 100644 --- a/src/lib/encode_server.cc +++ b/src/lib/encode_server.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,11 +18,13 @@ */ + /** @file src/encode_server.cc * @brief Class to describe a server to which we can send * encoding work, and a class to implement such a server. */ + #include "encode_server.h" #include "util.h" #include "dcpomatic_socket.h" @@ -33,24 +35,26 @@ #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; @@ -58,26 +62,34 @@ using std::list; using std::cout; using std::cerr; using std::fixed; -using boost::shared_ptr; +using std::shared_ptr; +using std::make_shared; 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) { } + EncodeServer::~EncodeServer () { + boost::this_thread::disable_interruption dis; + { boost::mutex::scoped_lock lm (_mutex); _terminate = true; @@ -85,43 +97,40 @@ 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; } - if (_broadcast.socket) { - _broadcast.socket->close (); - } _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 (); - } - delete _broadcast.thread; - } + try { + _broadcast.thread.join (); + } catch (...) {} } + /** @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. */ int EncodeServer::process (shared_ptr socket, struct timeval& after_read, struct timeval& after_encode) { - uint32_t length = socket->read_uint32 (); + Socket::ReadDigestScope ds (socket); + + auto length = socket->read_uint32 (); scoped_array buffer (new char[length]); - socket->read (reinterpret_cast (buffer.get()), length); + socket->read (reinterpret_cast(buffer.get()), length); string s (buffer.get()); - shared_ptr xml (new cxml::Document ("EncodingRequest")); + auto xml = make_shared("EncodingRequest"); 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. @@ -132,19 +141,24 @@ EncodeServer::process (shared_ptr socket, struct timeval& after_read, st return -1; } - shared_ptr pvf (new PlayerVideo (xml, socket)); + auto pvf = make_shared(xml, socket); + + if (!ds.check()) { + throw NetworkError ("Checksums do not match"); + } - 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)); + auto 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()); @@ -154,6 +168,7 @@ EncodeServer::process (shared_ptr socket, struct timeval& after_read, st return dcp_video_frame.index (); } + void EncodeServer::worker_thread () { @@ -167,7 +182,7 @@ EncodeServer::worker_thread () return; } - shared_ptr socket = _queue.front (); + auto socket = _queue.front (); _queue.pop_front (); lock.unlock (); @@ -200,26 +215,25 @@ EncodeServer::worker_thread () struct timeval end; gettimeofday (&end, 0); - shared_ptr e ( - new EncodedLogEntry ( - frame, ip, - seconds(after_read) - seconds(start), - seconds(after_encode) - seconds(after_read), - seconds(end) - seconds(after_encode) - ) + auto e = make_shared( + frame, ip, + seconds(after_read) - seconds(start), + seconds(after_encode) - seconds(after_read), + seconds(end) - seconds(after_encode) ); if (_verbose) { cout << e->get() << "\n"; } - _log->log (e); + dcpomatic_log->log (e); } _full_condition.notify_all (); } } + void EncodeServer::run () { @@ -229,26 +243,28 @@ EncodeServer::run () } for (int i = 0; i < _num_threads; ++i) { - thread* t = 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 - _worker_threads.push_back (t); } - _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"); + pthread_setname_np (_broadcast.thread.native_handle(), "encode-server-broadcast"); #endif Server::run (); } + void EncodeServer::broadcast_thread () try { - boost::asio::ip::address address = boost::asio::ip::address_v4::any (); + auto address = boost::asio::ip::address_v4::any (); boost::asio::ip::udp::endpoint listen_endpoint (address, HELLO_PORT); _broadcast.socket = new boost::asio::ip::udp::socket (_broadcast.io_service); @@ -268,6 +284,7 @@ catch (...) store_current (); } + void EncodeServer::broadcast_received () { @@ -276,45 +293,52 @@ EncodeServer::broadcast_received () if (strcmp (_broadcast.buffer, DCPOMATIC_HELLO) == 0) { /* Reply to the client saying what we can do */ xmlpp::Document doc; - xmlpp::Element* root = doc.create_root_node ("ServerAvailable"); + auto root = doc.create_root_node ("ServerAvailable"); root->add_child("Threads")->add_child_text (raw_convert (_worker_threads.size ())); root->add_child("Version")->add_child_text (raw_convert (SERVER_LINK_VERSION)); - string xml = doc.write_to_string ("UTF-8"); + auto xml = doc.write_to_string ("UTF-8"); if (_verbose) { cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n"; } try { - shared_ptr socket (new Socket); + auto socket = make_shared(); 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); + socket->write (xml.bytes() + 1); + socket->write ((uint8_t *) xml.c_str(), xml.bytes() + 1); } catch (...) { } try { - shared_ptr socket (new Socket); + auto socket = make_shared(); 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); + socket->write (xml.bytes() + 1); + socket->write ((uint8_t *) xml.c_str(), xml.bytes() + 1); } catch (...) { } } - _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 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);