X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.cc;h=c30fc8f30323ae52682682e2332c9fcb0e09300a;hb=6eba051dcbb8c56e3e2efea946ce0380d17a7b33;hp=26ef45d60786115e51c166b615c10a116c74e0d7;hpb=8e4a2e5ea578ac4f0f41edb6145d5c0040e33ec2;p=dcpomatic.git

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 26ef45d60..c30fc8f30 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -33,25 +33,27 @@
 #include "player_video.h"
 #include "compose.hpp"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "encoded_log_entry.h"
 #include "version.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/foreach.hpp>
+#ifdef HAVE_VALGRIND_H
+#include <valgrind/memcheck.h>
+#endif
 #include <string>
 #include <vector>
 #include <iostream>
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...)    _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) _log->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-#define LOG_ERROR(...)      _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR);
-#define LOG_ERROR_NC(...)   _log->log (__VA_ARGS__, LogEntry::TYPE_ERROR);
-
 using std::string;
 using std::vector;
 using std::list;
@@ -67,9 +69,12 @@ using dcp::Size;
 using dcp::Data;
 using dcp::raw_convert;
 
-EncodeServer::EncodeServer (shared_ptr<Log> log, bool verbose, int num_threads)
+EncodeServer::EncodeServer (bool verbose, int num_threads)
+#if !defined(RUNNING_ON_VALGRIND) || RUNNING_ON_VALGRIND == 0
 	: Server (ENCODE_FRAME_PORT)
-	, _log (log)
+#else
+	: Server (ENCODE_FRAME_PORT, 2400)
+#endif
 	, _verbose (verbose)
 	, _num_threads (num_threads)
 {
@@ -85,28 +90,26 @@ EncodeServer::~EncodeServer ()
 		_full_condition.notify_all ();
 	}
 
-	BOOST_FOREACH (boost::thread* i, _worker_threads) {
-		/* Ideally this would be a DCPOMATIC_ASSERT(i->joinable()) but we
-		   can't throw exceptions from a destructor.
-		*/
-		if (i->joinable ()) {
-			i->join ();
+	try {
+		_worker_threads.join_all ();
+	} catch (...) {}
+
+	{
+		boost::mutex::scoped_lock lm (_broadcast.mutex);
+		if (_broadcast.socket) {
+			_broadcast.socket->close ();
+			delete _broadcast.socket;
+			_broadcast.socket = 0;
 		}
-		delete i;
 	}
 
-	if (_broadcast.socket) {
-		_broadcast.socket->close ();
-	}
 	_broadcast.io_service.stop ();
-	if (_broadcast.thread) {
-		/* Ideally this would be a DCPOMATIC_ASSERT(_broadcast.thread->joinable()) but we
-		   can't throw exceptions from a destructor.
-		*/
-		if (_broadcast.thread->joinable ()) {
-			_broadcast.thread->join ();
+	if (_broadcast.thread.joinable()) {
+		try {
+			_broadcast.thread.join ();
+		} catch (...) {
+
 		}
-		delete _broadcast.thread;
 	}
 }
 
@@ -116,6 +119,8 @@ EncodeServer::~EncodeServer ()
 int
 EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, struct timeval& after_encode)
 {
+	Socket::ReadDigestScope ds (socket);
+
 	uint32_t length = socket->read_uint32 ();
 	scoped_array<char> buffer (new char[length]);
 	socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
@@ -134,15 +139,20 @@ EncodeServer::process (shared_ptr<Socket> socket, struct timeval& after_read, st
 
 	shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket));
 
-	DCPVideo dcp_video_frame (pvf, xml, _log);
+	if (!ds.check()) {
+		throw NetworkError ("Checksums do not match");
+	}
+
+	DCPVideo dcp_video_frame (pvf, xml);
 
 	gettimeofday (&after_read, 0);
 
-	Data encoded = dcp_video_frame.encode_locally (boost::bind (&Log::dcp_log, _log.get(), _1, _2));
+	Data encoded = dcp_video_frame.encode_locally ();
 
 	gettimeofday (&after_encode, 0);
 
 	try {
+		Socket::WriteDigestScope ds (socket);
 		socket->write (encoded.size());
 		socket->write (encoded.data().get(), encoded.size());
 	} catch (std::exception& e) {
@@ -213,7 +223,7 @@ EncodeServer::worker_thread ()
 				cout << e->get() << "\n";
 			}
 
-			_log->log (e);
+			dcpomatic_log->log (e);
 		}
 
 		_full_condition.notify_all ();
@@ -229,16 +239,17 @@ EncodeServer::run ()
 	}
 
 	for (int i = 0; i < _num_threads; ++i) {
-		thread* t = new thread (bind (&EncodeServer::worker_thread, this));
 #ifdef DCPOMATIC_LINUX
+		boost::thread* t = _worker_threads.create_thread (bind(&EncodeServer::worker_thread, this));
 		pthread_setname_np (t->native_handle(), "encode-server-worker");
+#else
+		_worker_threads.create_thread (bind(&EncodeServer::worker_thread, this));
 #endif
-		_worker_threads.push_back (t);
 	}
 
-	_broadcast.thread = new thread (bind (&EncodeServer::broadcast_thread, this));
+	_broadcast.thread = thread (bind(&EncodeServer::broadcast_thread, this));
 #ifdef DCPOMATIC_LINUX
-	pthread_setname_np (_broadcast.thread->native_handle(), "encode-server-broadcast");
+	pthread_setname_np (_broadcast.thread.native_handle(), "encode-server-broadcast");
 #endif
 
 	Server::run ();
@@ -304,10 +315,13 @@ EncodeServer::broadcast_received ()
 		}
 	}
 
-	_broadcast.socket->async_receive_from (
-		boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
-		_broadcast.send_endpoint, boost::bind (&EncodeServer::broadcast_received, this)
-		);
+	boost::mutex::scoped_lock lm (_broadcast.mutex);
+	if (_broadcast.socket) {
+		_broadcast.socket->async_receive_from (
+			boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
+			_broadcast.send_endpoint, boost::bind (&EncodeServer::broadcast_received, this)
+			);
+	}
 }
 
 void
@@ -315,6 +329,9 @@ EncodeServer::handle (shared_ptr<Socket> socket)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
+	Waker waker;
+	waker.nudge ();
+
 	/* Wait until the queue has gone down a bit */
 	while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) {
 		_full_condition.wait (lock);