Mostly-merge master.

[dcpomatic.git] / src / lib / server.cc

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 69ca5b39aefe88c2f9c3ec14aaf622d69705daf6..bf7541c3379f1f294f735f4c130b06994b0311d8 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -47,6 +47,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;
@@ -55,37 +57,7 @@ using boost::bind;
 using boost::scoped_array;
 using boost::optional;
 using boost::lexical_cast;
-using libdcp::Size;
-
-ServerDescription::ServerDescription (shared_ptr<const cxml::Node> node)
-{
-       _host_name = node->string_child ("HostName");
-       _threads = node->number_child<int> ("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<string> (_threads));
-}
-
-/** Create a server description from a string of metadata returned from as_metadata().
- *  @param v Metadata.
- *  @return ServerDescription, or 0.
- */
-optional<ServerDescription>
-ServerDescription::create_from_metadata (string v)
-{
-       vector<string> b;
-       split (b, v, is_any_of (" "));
-
-       if (b.size() != 2) {
-               return optional<ServerDescription> ();
-       }
-
-       return ServerDescription (b[0], atoi (b[1].c_str ()));
-}
+using dcp::Size;
 
 Server::Server (shared_ptr<Log> log, bool verbose)
        : _log (log)
@@ -94,8 +66,11 @@ Server::Server (shared_ptr<Log> 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> socket)
+Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct timeval& after_encode)
 {
        uint32_t length = socket->read_uint32 ();
        scoped_array<char> buffer (new char[length]);
@@ -110,7 +85,7 @@ Server::process (shared_ptr<Socket> socket)
                return -1;
        }
 
-       libdcp::Size size (
+       dcp::Size size (
                xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
                );
 
@@ -118,8 +93,13 @@ Server::process (shared_ptr<Socket> socket)
 
        image->read_from_socket (socket);
        DCPVideoFrame dcp_video_frame (image, xml, _log);
+
+       gettimeofday (&after_read, 0);
        
        shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
+
+       gettimeofday (&after_encode, 0);
+       
        try {
                encoded->send (socket);
        } catch (std::exception& e) {
@@ -152,15 +132,21 @@ Server::worker_thread ()
                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 ();
@@ -169,15 +155,19 @@ Server::worker_thread ()
                        struct timeval end;
                        gettimeofday (&end, 0);
 
-                       string const message = String::compose (
-                               "Encoded frame %1 from %2 in %3s", frame, ip, 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 ();
@@ -189,7 +179,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) {
@@ -223,6 +213,7 @@ Server::run (int num_threads)
 
 void
 Server::broadcast_thread ()
+try
 {
        boost::asio::io_service io_service;
 
@@ -241,6 +232,10 @@ Server::broadcast_thread ()
 
        io_service.run ();
 }
+catch (...)
+{
+       store_current ();
+}
 
 void
 Server::broadcast_received ()