X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=79840c25bb2701bebc57f010fe764ae6c08348b0;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=5598ef69f8388aae66098669ad9361e369691ab9;hpb=1f82930e73679d6aec5223caa255f564339a1a2a;p=dcpomatic.git diff --git a/src/lib/server.cc b/src/lib/server.cc index 5598ef69f..79840c25b 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -22,23 +22,22 @@ * encoding work, and a class to implement such a server. */ -#include -#include -#include -#include -#include -#include -#include -#include #include "server.h" -#include "util.h" -#include "scaler.h" +#include "dcpomatic_socket.h" #include "image.h" #include "dcp_video.h" #include "config.h" #include "cross.h" #include "player_video.h" -#include "encoded_data.h" +#include "data.h" +#include "safe_stringstream.h" +#include "raw_convert.h" +#include +#include +#include +#include +#include +#include #include "i18n.h" @@ -48,7 +47,6 @@ #define LOG_ERROR_NC(...) _log->log (__VA_ARGS__, Log::TYPE_ERROR); using std::string; -using std::stringstream; using std::multimap; using std::vector; using std::list; @@ -64,7 +62,6 @@ using boost::bind; using boost::scoped_array; using boost::optional; using dcp::Size; -using dcp::raw_convert; Server::Server (shared_ptr log, bool verbose) : _terminate (false) @@ -104,27 +101,31 @@ Server::process (shared_ptr socket, struct timeval& after_read, struct t scoped_array buffer (new char[length]); socket->read (reinterpret_cast (buffer.get()), length); - stringstream s (buffer.get()); + string s (buffer.get()); shared_ptr xml (new cxml::Document ("EncodingRequest")); - xml->read_stream (s); + 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. + */ if (xml->number_child ("Version") != SERVER_LINK_VERSION) { cerr << "Mismatched server/client versions\n"; LOG_ERROR_NC ("Mismatched server/client versions"); return -1; } - shared_ptr pvf (new PlayerVideo (xml, socket, _log)); + shared_ptr pvf (new PlayerVideo (xml, socket)); DCPVideo dcp_video_frame (pvf, xml, _log); gettimeofday (&after_read, 0); - - shared_ptr encoded = dcp_video_frame.encode_locally (); + + Data encoded = dcp_video_frame.encode_locally (boost::bind (&Log::dcp_log, _log.get(), _1, _2)); gettimeofday (&after_encode, 0); - + try { - encoded->send (socket); + socket->write (encoded.size ()); + socket->write (encoded.data ().get (), 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()); @@ -149,7 +150,7 @@ Server::worker_thread () shared_ptr socket = _queue.front (); _queue.pop_front (); - + lock.unlock (); int frame = -1; @@ -159,9 +160,9 @@ Server::worker_thread () struct timeval after_read; struct timeval after_encode; struct timeval end; - + gettimeofday (&start, 0); - + try { frame = process (socket, after_read, after_encode); ip = socket->socket().remote_endpoint().address().to_string(); @@ -173,28 +174,28 @@ Server::worker_thread () gettimeofday (&end, 0); socket.reset (); - + lock.lock (); if (frame >= 0) { struct timeval end; gettimeofday (&end, 0); - stringstream message; + SafeStringStream message; message.precision (2); message << fixed << "Encoded frame " << frame << " from " << ip << ": " << "receive " << (seconds(after_read) - seconds(start)) << "s " << "encode " << (seconds(after_encode) - seconds(after_read)) << "s " << "send " << (seconds(end) - seconds(after_encode)) << "s."; - + if (_verbose) { cout << message.str() << "\n"; } LOG_GENERAL_NC (message.str ()); } - + _full_condition.notify_all (); } } @@ -206,13 +207,13 @@ Server::run (int 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 (&Server::worker_thread, this))); } _broadcast.thread = new thread (bind (&Server::broadcast_thread, this)); - + start_accept (); _io_service.run (); } @@ -251,19 +252,22 @@ Server::broadcast_received () xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("ServerAvailable"); root->add_child("Threads")->add_child_text (raw_convert (_worker_threads.size ())); - stringstream xml; - doc.write_to_stream (xml, "UTF-8"); + root->add_child("Version")->add_child_text (raw_convert (SERVER_LINK_VERSION)); + string xml = doc.write_to_string ("UTF-8"); + 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)); - socket->write (xml.str().length() + 1); - socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1); + 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 (&Server::broadcast_received, this) @@ -289,15 +293,15 @@ Server::handle_accept (shared_ptr socket, boost::system::error_code cons } boost::mutex::scoped_lock lock (_worker_mutex); - + /* Wait until the queue has gone down a bit */ while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) { _full_condition.wait (lock); } - + _queue.push_back (socket); _empty_condition.notify_all (); start_accept (); } - +