Merge master; fix destruction of Server; some test cleanups.

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

diff --git a/src/lib/server.cc b/src/lib/server.cc
index d72b7e5025b84e57513a97864014137d5658eacd..66ee2b0e3cf2ca93eeb7512a03763c2598836dcc 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -41,6 +41,11 @@
 
 #include "i18n.h"
 
+#define LOG_GENERAL(...)    _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL_NC(...) _log->log (__VA_ARGS__, Log::TYPE_GENERAL);
+#define LOG_ERROR(...)      _log->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR);
+#define LOG_ERROR_NC(...)   _log->log (__VA_ARGS__, Log::TYPE_ERROR);
+
 using std::string;
 using std::stringstream;
 using std::multimap;
@@ -61,12 +66,33 @@ using dcp::Size;
 using dcp::raw_convert;
 
 Server::Server (shared_ptr<Log> log, bool verbose)
-       : _log (log)
+       : _terminate (false)
+       , _log (log)
        , _verbose (verbose)
+       , _acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), Config::instance()->server_port_base()))
 {
 
 }
 
+Server::~Server ()
+{
+       {
+               boost::mutex::scoped_lock lm (_worker_mutex);
+               _terminate = true;
+               _worker_condition.notify_all ();
+       }
+
+       for (vector<boost::thread*>::iterator i = _worker_threads.begin(); i != _worker_threads.end(); ++i) {
+               (*i)->join ();
+               delete *i;
+       }
+
+       _io_service.stop ();
+
+       _broadcast.io_service.stop ();
+       _broadcast.thread->join ();
+}
+
 /** @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.
  */
@@ -82,11 +108,11 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
        xml->read_stream (s);
        if (xml->number_child<int> ("Version") != SERVER_LINK_VERSION) {
                cerr << "Mismatched server/client versions\n";
-               _log->log ("Mismatched server/client versions");
+               LOG_ERROR_NC ("Mismatched server/client versions");
                return -1;
        }
 
-       shared_ptr<PlayerVideoFrame> pvf (new PlayerVideoFrame (xml, socket));
+       shared_ptr<PlayerVideoFrame> pvf (new PlayerVideoFrame (xml, socket, _log));
 
        DCPVideoFrame dcp_video_frame (pvf, xml, _log);
 
@@ -99,7 +125,8 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
        try {
                encoded->send (socket);
        } catch (std::exception& e) {
-               _log->log (String::compose ("Send failed; frame %1", dcp_video_frame.index()));
+               cerr << "Send failed; frame " << dcp_video_frame.index() << "\n";
+               LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index());
                throw;
        }
 
@@ -111,10 +138,14 @@ Server::worker_thread ()
 {
        while (1) {
                boost::mutex::scoped_lock lock (_worker_mutex);
-               while (_queue.empty ()) {
+               while (_queue.empty () && !_terminate) {
                        _worker_condition.wait (lock);
                }
 
+               if (_terminate) {
+                       return;
+               }
+
                shared_ptr<Socket> socket = _queue.front ();
                _queue.pop_front ();
                
@@ -134,7 +165,8 @@ Server::worker_thread ()
                        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()));
+                       cerr << "Error: " << e.what() << "\n";
+                       LOG_ERROR ("Error: %1", e.what());
                }
 
                gettimeofday (&end, 0);
@@ -159,7 +191,7 @@ Server::worker_thread ()
                                cout << message.str() << "\n";
                        }
 
-                       _log->log (message.str ());
+                       LOG_GENERAL_NC (message.str ());
                }
                
                _worker_condition.notify_all ();
@@ -169,7 +201,7 @@ Server::worker_thread ()
 void
 Server::run (int num_threads)
 {
-       _log->log (String::compose ("Server starting with %1 threads", num_threads));
+       LOG_GENERAL ("Server starting with %1 threads", num_threads);
        if (_verbose) {
                cout << "DCP-o-matic server starting with " << num_threads << " threads.\n";
        }
@@ -180,39 +212,18 @@ Server::run (int num_threads)
 
        _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_base ())
-               );
-       
-       while (1) {
-               shared_ptr<Socket> socket (new Socket);
-               acceptor.accept (socket->socket ());
-
-               boost::mutex::scoped_lock lock (_worker_mutex);
-               
-               /* Wait until the queue has gone down a bit */
-               while (int (_queue.size()) >= num_threads * 2) {
-                       _worker_condition.wait (lock);
-               }
-               
-               _queue.push_back (socket);
-               _worker_condition.notify_all ();
-       }
+       start_accept ();
+       _io_service.run ();
 }
 
 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 = new boost::asio::ip::udp::socket (_broadcast.io_service);
        _broadcast.socket->open (listen_endpoint.protocol ());
        _broadcast.socket->bind (listen_endpoint);
 
@@ -222,7 +233,7 @@ try
                boost::bind (&Server::broadcast_received, this)
                );
 
-       io_service.run ();
+       _broadcast.io_service.run ();
 }
 catch (...)
 {
@@ -257,3 +268,35 @@ Server::broadcast_received ()
                _broadcast.send_endpoint, boost::bind (&Server::broadcast_received, this)
                );
 }
+
+void
+Server::start_accept ()
+{
+       if (_terminate) {
+               return;
+       }
+
+       shared_ptr<Socket> socket (new Socket);
+       _acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error));
+}
+
+void
+Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code const & error)
+{
+       if (error) {
+               return;
+       }
+
+       boost::mutex::scoped_lock lock (_worker_mutex);
+       
+       /* Wait until the queue has gone down a bit */
+       while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) {
+               _worker_condition.wait (lock);
+       }
+       
+       _queue.push_back (socket);
+       _worker_condition.notify_all ();
+
+       start_accept ();
+}
+