X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.cc;h=314f8f68dcccda973d04ac683064fc2f25dec6de;hb=c967096b5061e4bbb3a275d4daf04a2b9c084468;hp=332c7ab46d34c858a5ee60e78415b6fe7abd293d;hpb=918124fb0b2fdf05bf98aee2c74c85387f1d8638;p=dcpomatic.git

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 332c7ab46..314f8f68d 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -33,6 +33,7 @@
 #include "player_video.h"
 #include "compose.hpp"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "encoded_log_entry.h"
 #include "version.h"
 #include <dcp/raw_convert.h>
@@ -41,17 +42,15 @@
 #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 +66,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)
 {
@@ -95,9 +97,15 @@ EncodeServer::~EncodeServer ()
 		delete i;
 	}
 
-	if (_broadcast.socket) {
-		_broadcast.socket->close ();
+	{
+		boost::mutex::scoped_lock lm (_broadcast.mutex);
+		if (_broadcast.socket) {
+			_broadcast.socket->close ();
+			delete _broadcast.socket;
+			_broadcast.socket = 0;
+		}
 	}
+
 	_broadcast.io_service.stop ();
 	if (_broadcast.thread) {
 		/* Ideally this would be a DCPOMATIC_ASSERT(_broadcast.thread->joinable()) but we
@@ -134,11 +142,11 @@ 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);
+	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);
 
@@ -213,7 +221,7 @@ EncodeServer::worker_thread ()
 				cout << e->get() << "\n";
 			}
 
-			_log->log (e);
+			dcpomatic_log->log (e);
 		}
 
 		_full_condition.notify_all ();
@@ -229,10 +237,17 @@ EncodeServer::run ()
 	}
 
 	for (int i = 0; i < _num_threads; ++i) {
-		_worker_threads.push_back (new thread (bind (&EncodeServer::worker_thread, this)));
+		thread* t = new thread (bind (&EncodeServer::worker_thread, this));
+#ifdef DCPOMATIC_LINUX
+		pthread_setname_np (t->native_handle(), "encode-server-worker");
+#endif
+		_worker_threads.push_back (t);
 	}
 
 	_broadcast.thread = new thread (bind (&EncodeServer::broadcast_thread, this));
+#ifdef DCPOMATIC_LINUX
+	pthread_setname_np (_broadcast.thread->native_handle(), "encode-server-broadcast");
+#endif
 
 	Server::run ();
 }
@@ -297,10 +312,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
@@ -308,6 +326,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);