X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=5598ef69f8388aae66098669ad9361e369691ab9;hb=a6c2aa6cad5872d27654553d447cb34185317974;hp=6b4064cd7ebae77fdca24040228c7a5169cf9505;hpb=2935d9d158cf35496a35107f9c4ab7d2929cf6c3;p=dcpomatic.git

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 6b4064cd7..5598ef69f 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -29,15 +29,16 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
 #include <libcxml/cxml.h>
-#include <libdcp/raw_convert.h>
+#include <dcp/raw_convert.h>
 #include "server.h"
 #include "util.h"
 #include "scaler.h"
 #include "image.h"
-#include "dcp_video_frame.h"
+#include "dcp_video.h"
 #include "config.h"
 #include "cross.h"
-#include "player_video_frame.h"
+#include "player_video.h"
+#include "encoded_data.h"
 
 #include "i18n.h"
 
@@ -62,16 +63,37 @@ using boost::thread;
 using boost::bind;
 using boost::scoped_array;
 using boost::optional;
-using libdcp::Size;
-using libdcp::raw_convert;
+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;
+		_empty_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.
  */
@@ -91,9 +113,9 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
 		return -1;
 	}
 
-	shared_ptr<PlayerVideoFrame> pvf (new PlayerVideoFrame (xml, socket, _log));
+	shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket, _log));
 
-	DCPVideoFrame dcp_video_frame (pvf, xml, _log);
+	DCPVideo dcp_video_frame (pvf, xml, _log);
 
 	gettimeofday (&after_read, 0);
 	
@@ -104,6 +126,7 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
 	try {
 		encoded->send (socket);
 	} catch (std::exception& e) {
+		cerr << "Send failed; frame " << dcp_video_frame.index() << "\n";
 		LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index());
 		throw;
 	}
@@ -114,10 +137,14 @@ Server::process (shared_ptr<Socket> socket, struct timeval& after_read, struct t
 void
 Server::worker_thread ()
 {
-	while (1) {
+	while (true) {
 		boost::mutex::scoped_lock lock (_worker_mutex);
-		while (_queue.empty ()) {
-			_worker_condition.wait (lock);
+		while (_queue.empty () && !_terminate) {
+			_empty_condition.wait (lock);
+		}
+
+		if (_terminate) {
+			return;
 		}
 
 		shared_ptr<Socket> socket = _queue.front ();
@@ -139,6 +166,7 @@ Server::worker_thread ()
 			frame = process (socket, after_read, after_encode);
 			ip = socket->socket().remote_endpoint().address().to_string();
 		} catch (std::exception& e) {
+			cerr << "Error: " << e.what() << "\n";
 			LOG_ERROR ("Error: %1", e.what());
 		}
 
@@ -167,7 +195,7 @@ Server::worker_thread ()
 			LOG_GENERAL_NC (message.str ());
 		}
 		
-		_worker_condition.notify_all ();
+		_full_condition.notify_all ();
 	}
 }
 
@@ -185,39 +213,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);
 
@@ -227,7 +234,7 @@ try
 		boost::bind (&Server::broadcast_received, this)
 		);
 
-	io_service.run ();
+	_broadcast.io_service.run ();
 }
 catch (...)
 {
@@ -262,3 +269,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) {
+		_full_condition.wait (lock);
+	}
+	
+	_queue.push_back (socket);
+	_empty_condition.notify_all ();
+
+	start_accept ();
+}
+