X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server.cc;h=2603732c890041ff45fb6a0b356d640427e74aca;hb=61a3f348c433ca4f8d2e7bb9758ad5d61bd35407;hp=4f27ee42132ac244c45f22020a4bba6db6902d82;hpb=f80e2f7b370c3a6dfa8a78c9665a8eaf43a05f03;p=dcpomatic.git

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 4f27ee421..2603732c8 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -34,12 +34,16 @@
 #include "compose.hpp"
 #include "log.h"
 #include "encoded_log_entry.h"
+#include "version.h"
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #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>
@@ -67,7 +71,11 @@ using dcp::Data;
 using dcp::raw_convert;
 
 EncodeServer::EncodeServer (shared_ptr<Log> log, bool verbose, int num_threads)
+#if !defined(RUNNING_ON_VALGRIND) || RUNNING_ON_VALGRIND == 0
 	: Server (ENCODE_FRAME_PORT)
+#else
+	: Server (ENCODE_FRAME_PORT, 2400)
+#endif
 	, _log (log)
 	, _verbose (verbose)
 	, _num_threads (num_threads)
@@ -94,6 +102,9 @@ EncodeServer::~EncodeServer ()
 		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
@@ -102,6 +113,7 @@ EncodeServer::~EncodeServer ()
 		if (_broadcast.thread->joinable ()) {
 			_broadcast.thread->join ();
 		}
+		delete _broadcast.thread;
 	}
 }
 
@@ -218,16 +230,23 @@ EncodeServer::worker_thread ()
 void
 EncodeServer::run ()
 {
-	LOG_GENERAL ("Server starting with %1 threads", _num_threads);
+	LOG_GENERAL ("Server %1 (%2) starting with %3 threads", dcpomatic_version, dcpomatic_git_commit, _num_threads);
 	if (_verbose) {
 		cout << "DCP-o-matic server starting with " << _num_threads << " threads.\n";
 	}
 
 	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 ();
 }
@@ -272,9 +291,19 @@ EncodeServer::broadcast_received ()
 		if (_verbose) {
 			cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n";
 		}
-		shared_ptr<Socket> socket (new Socket);
+
+		try {
+			shared_ptr<Socket> socket (new Socket);
+			socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), MAIN_SERVER_PRESENCE_PORT));
+			socket->write (xml.length() + 1);
+			socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
+		} catch (...) {
+
+		}
+
 		try {
-			socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), SERVER_PRESENCE_PORT));
+			shared_ptr<Socket> socket (new Socket);
+			socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), BATCH_SERVER_PRESENCE_PORT));
 			socket->write (xml.length() + 1);
 			socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
 		} catch (...) {