X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=0c5792ae0da6b8d07d678e5244b6b04b381645e6;hb=df085fc0ea4f1a3f009de5a7a5bf9f241173bcba;hp=de265dca430043fdb174e5f014f5a2ba94c14531;hpb=2499c41097f8410cb3016e095a85d68979485a7b;p=dcpomatic.git diff --git a/src/lib/server.cc b/src/lib/server.cc index de265dca4..0c5792ae0 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -27,15 +27,16 @@ #include #include #include -#include #include #include +#include #include "server.h" #include "util.h" #include "scaler.h" #include "image.h" #include "dcp_video_frame.h" #include "config.h" +#include "cross.h" #include "i18n.h" @@ -43,6 +44,11 @@ using std::string; using std::stringstream; using std::multimap; using std::vector; +using std::list; +using std::cout; +using std::cerr; +using std::setprecision; +using std::fixed; using boost::shared_ptr; using boost::algorithm::is_any_of; using boost::algorithm::split; @@ -51,84 +57,61 @@ using boost::bind; using boost::scoped_array; using boost::optional; using libdcp::Size; +using libdcp::raw_convert; -ServerDescription::ServerDescription (shared_ptr node) -{ - _host_name = node->string_child ("HostName"); - _threads = node->number_child ("Threads"); -} - -void -ServerDescription::as_xml (xmlpp::Node* root) const -{ - root->add_child("HostName")->add_child_text (_host_name); - root->add_child("Threads")->add_child_text (boost::lexical_cast (_threads)); -} - -/** Create a server description from a string of metadata returned from as_metadata(). - * @param v Metadata. - * @return ServerDescription, or 0. - */ -optional -ServerDescription::create_from_metadata (string v) -{ - vector b; - split (b, v, is_any_of (N_(" "))); - - if (b.size() != 2) { - return optional (); - } - - return ServerDescription (b[0], atoi (b[1].c_str ())); -} - -Server::Server (shared_ptr log) +Server::Server (shared_ptr log, bool verbose) : _log (log) + , _verbose (verbose) { } +/** @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 -Server::process (shared_ptr socket) +Server::process (shared_ptr socket, struct timeval& after_read, struct timeval& after_encode) { uint32_t length = socket->read_uint32 (); scoped_array buffer (new char[length]); socket->read (reinterpret_cast (buffer.get()), length); stringstream s (buffer.get()); - multimap kv = read_key_value (s); - - if (get_required_string (kv, "encode") != "please") { + shared_ptr xml (new cxml::Document ("EncodingRequest")); + xml->read_stream (s); + if (xml->number_child ("Version") != SERVER_LINK_VERSION) { + cerr << "Mismatched server/client versions\n"; + _log->log ("Mismatched server/client versions"); return -1; } - libdcp::Size size (get_required_int (kv, "width"), get_required_int (kv, "height")); - int frame = get_required_int (kv, "frame"); - int frames_per_second = get_required_int (kv, "frames_per_second"); - int j2k_bandwidth = get_required_int (kv, "j2k_bandwidth"); - Eyes eyes = static_cast (get_required_int (kv, "eyes")); + libdcp::Size size ( + xml->number_child ("Width"), xml->number_child ("Height") + ); shared_ptr image (new Image (PIX_FMT_RGB24, size, true)); image->read_from_socket (socket); + DCPVideoFrame dcp_video_frame (image, xml, _log); - DCPVideoFrame dcp_video_frame ( - image, frame, eyes, frames_per_second, j2k_bandwidth, _log - ); + gettimeofday (&after_read, 0); shared_ptr encoded = dcp_video_frame.encode_locally (); + + gettimeofday (&after_encode, 0); + try { encoded->send (socket); } catch (std::exception& e) { _log->log (String::compose ( - N_("Send failed; frame %1, data size %2, pixel format %3, image size %4x%5, %6 components"), - frame, encoded->size(), image->pixel_format(), image->size().width, image->size().height, image->components() + "Send failed; frame %1, data size %2, pixel format %3, image size %4x%5, %6 components", + dcp_video_frame.frame(), encoded->size(), image->pixel_format(), image->size().width, image->size().height, image->components() ) ); throw; } - return frame; + return dcp_video_frame.frame (); } void @@ -146,16 +129,24 @@ Server::worker_thread () lock.unlock (); int frame = -1; + string ip; struct timeval start; + struct timeval after_read; + struct timeval after_encode; + struct timeval end; + gettimeofday (&start, 0); try { - frame = process (socket); + frame = process (socket, after_read, after_encode); + ip = socket->socket().remote_endpoint().address().to_string(); } catch (std::exception& e) { - _log->log (String::compose (N_("Error: %1"), e.what())); + _log->log (String::compose ("Error: %1", e.what())); } - + + gettimeofday (&end, 0); + socket.reset (); lock.lock (); @@ -163,7 +154,20 @@ Server::worker_thread () if (frame >= 0) { struct timeval end; gettimeofday (&end, 0); - _log->log (String::compose (N_("Encoded frame %1 in %2"), frame, seconds (end) - seconds (start))); + + stringstream 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->log (message.str ()); } _worker_condition.notify_all (); @@ -173,14 +177,24 @@ Server::worker_thread () void Server::run (int num_threads) { - _log->log (String::compose (N_("Server starting with %1 threads"), num_threads)); + _log->log (String::compose ("Server starting with %1 threads", 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)); + boost::asio::io_service io_service; - boost::asio::ip::tcp::acceptor acceptor (io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), Config::instance()->server_port ())); + + boost::asio::ip::tcp::acceptor acceptor ( + io_service, + boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), Config::instance()->server_port_base ()) + ); + while (1) { shared_ptr socket (new Socket); acceptor.accept (socket->socket ()); @@ -196,3 +210,58 @@ Server::run (int num_threads) _worker_condition.notify_all (); } } + +void +Server::broadcast_thread () +try +{ + boost::asio::io_service io_service; + + 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); + + _broadcast.socket = new boost::asio::ip::udp::socket (io_service); + _broadcast.socket->open (listen_endpoint.protocol ()); + _broadcast.socket->bind (listen_endpoint); + + _broadcast.socket->async_receive_from ( + boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)), + _broadcast.send_endpoint, + boost::bind (&Server::broadcast_received, this) + ); + + io_service.run (); +} +catch (...) +{ + store_current (); +} + +void +Server::broadcast_received () +{ + _broadcast.buffer[sizeof(_broadcast.buffer) - 1] = '\0'; + + 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"); + root->add_child("Threads")->add_child_text (raw_convert (_worker_threads.size ())); + stringstream xml; + doc.write_to_stream (xml, "UTF-8"); + + 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); + } catch (...) { + + } + } + + _broadcast.socket->async_receive_from ( + boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)), + _broadcast.send_endpoint, boost::bind (&Server::broadcast_received, this) + ); +}