X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.cc;h=24ba5bc451449bc59ab63d2c71d8ed182eb56a13;hb=9a97c1b4116d7fb80e8ab145c0cc738dbf14d617;hp=8db3f867cc09f34fe97e4f040c1e576f123070a0;hpb=1201f316347d2ea8b09aa89b0c5edaebfaa64c93;p=dcpomatic.git diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc index 8db3f867c..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" @@ -36,12 +38,14 @@ #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 @@ -51,21 +55,24 @@ #include "i18n.h" + 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 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 (bool verbose, int num_threads) #if !defined(RUNNING_ON_VALGRIND) || RUNNING_ON_VALGRIND == 0 : Server (ENCODE_FRAME_PORT) @@ -78,8 +85,11 @@ EncodeServer::EncodeServer (bool verbose, int num_threads) } + EncodeServer::~EncodeServer () { + boost::this_thread::disable_interruption dis; + { boost::mutex::scoped_lock lm (_mutex); _terminate = true; @@ -87,14 +97,9 @@ EncodeServer::~EncodeServer () _full_condition.notify_all (); } - BOOST_FOREACH (boost::thread* i, _worker_threads) { - try { - i->join (); - } catch (...) { - - } - delete i; - } + try { + _worker_threads.join_all (); + } catch (...) {} { boost::mutex::scoped_lock lm (_broadcast.mutex); @@ -106,15 +111,12 @@ EncodeServer::~EncodeServer () } _broadcast.io_service.stop (); - if (_broadcast.thread.joinable()) { - try { - _broadcast.thread.join (); - } catch (...) { - - } - } + 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. */ @@ -123,12 +125,12 @@ EncodeServer::process (shared_ptr socket, struct timeval& after_read, st { Socket::ReadDigestScope ds (socket); - uint32_t length = socket->read_uint32 (); + 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. @@ -139,7 +141,7 @@ 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"); @@ -149,14 +151,14 @@ EncodeServer::process (shared_ptr socket, struct timeval& after_read, st gettimeofday (&after_read, 0); - Data encoded = dcp_video_frame.encode_locally (); + 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()); @@ -166,6 +168,7 @@ EncodeServer::process (shared_ptr socket, struct timeval& after_read, st return dcp_video_frame.index (); } + void EncodeServer::worker_thread () { @@ -179,7 +182,7 @@ EncodeServer::worker_thread () return; } - shared_ptr socket = _queue.front (); + auto socket = _queue.front (); _queue.pop_front (); lock.unlock (); @@ -212,13 +215,11 @@ 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) { @@ -232,6 +233,7 @@ EncodeServer::worker_thread () } } + void EncodeServer::run () { @@ -241,10 +243,11 @@ EncodeServer::run () } for (int i = 0; i < _num_threads; ++i) { - boost::thread* t = new thread(bind(&EncodeServer::worker_thread, this)); - _worker_threads.push_back (t); #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 } @@ -256,11 +259,12 @@ EncodeServer::run () 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); @@ -280,6 +284,7 @@ catch (...) store_current (); } + void EncodeServer::broadcast_received () { @@ -288,29 +293,29 @@ 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 (...) { } @@ -325,6 +330,7 @@ EncodeServer::broadcast_received () } } + void EncodeServer::handle (shared_ptr socket) {