X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=d72b7e5025b84e57513a97864014137d5658eacd;hp=ff77f8e8feba3e6d70161cf61c4f297f884196ba;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hpb=2fabfde079641001d0968ca2fee8e70a0b929e27 diff --git a/src/lib/server.cc b/src/lib/server.cc index ff77f8e8f..d72b7e502 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,9 +27,9 @@ #include #include #include -#include #include #include +#include #include "server.h" #include "util.h" #include "scaler.h" @@ -37,6 +37,7 @@ #include "dcp_video_frame.h" #include "config.h" #include "cross.h" +#include "player_video_frame.h" #include "i18n.h" @@ -47,6 +48,8 @@ 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; @@ -54,38 +57,8 @@ using boost::thread; using boost::bind; using boost::scoped_array; using boost::optional; -using boost::lexical_cast; -using libdcp::Size; - -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 (" ")); - - if (b.size() != 2) { - return optional (); - } - - return ServerDescription (b[0], atoi (b[1].c_str ())); -} +using dcp::Size; +using dcp::raw_convert; Server::Server (shared_ptr log, bool verbose) : _log (log) @@ -94,13 +67,16 @@ Server::Server (shared_ptr log, bool 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()); shared_ptr xml (new cxml::Document ("EncodingRequest")); xml->read_stream (s); @@ -110,28 +86,24 @@ Server::process (shared_ptr socket) return -1; } - libdcp::Size size ( - xml->number_child ("Width"), xml->number_child ("Height") - ); + shared_ptr pvf (new PlayerVideoFrame (xml, socket)); - shared_ptr image (new Image (PIX_FMT_RGB24, size, true)); + DCPVideoFrame dcp_video_frame (pvf, xml, _log); - image->read_from_socket (socket); - DCPVideoFrame dcp_video_frame (image, xml, _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 ( - "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() - ) - ); + _log->log (String::compose ("Send failed; frame %1", dcp_video_frame.index())); throw; } - return dcp_video_frame.frame (); + return dcp_video_frame.index (); } void @@ -149,16 +121,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 ("Error: %1", e.what())); } - + + gettimeofday (&end, 0); + socket.reset (); lock.lock (); @@ -167,15 +147,19 @@ Server::worker_thread () struct timeval end; gettimeofday (&end, 0); - string const message = String::compose ( - "Encoded frame %1 from %2 in %3s", frame, socket->socket().remote_endpoint().address().to_string(), 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 << "\n"; + cout << message.str() << "\n"; } - _log->log (message); + _log->log (message.str ()); } _worker_condition.notify_all (); @@ -187,7 +171,7 @@ Server::run (int num_threads) { _log->log (String::compose ("Server starting with %1 threads", num_threads)); if (_verbose) { - cout << "DCP-o-matic server started with " << num_threads << " threads.\n"; + cout << "DCP-o-matic server starting with " << num_threads << " threads.\n"; } for (int i = 0; i < num_threads; ++i) { @@ -221,6 +205,7 @@ Server::run (int num_threads) void Server::broadcast_thread () +try { boost::asio::io_service io_service; @@ -239,6 +224,10 @@ Server::broadcast_thread () io_service.run (); } +catch (...) +{ + store_current (); +} void Server::broadcast_received () @@ -249,7 +238,7 @@ Server::broadcast_received () /* 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 (lexical_cast (_worker_threads.size ())); + root->add_child("Threads")->add_child_text (raw_convert (_worker_threads.size ())); stringstream xml; doc.write_to_stream (xml, "UTF-8");