/*
- 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.
#include "config.h"
#include "cross.h"
#include "player_video.h"
-#include "safe_stringstream.h"
-#include "raw_convert.h"
#include "compose.hpp"
#include "log.h"
+#include "dcpomatic_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>
-#include <boost/make_shared.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;
using boost::bind;
using boost::scoped_array;
using boost::optional;
-using boost::make_shared;
using dcp::Size;
using dcp::Data;
-
-EncodeServer::EncodeServer (shared_ptr<Log> log, bool verbose, int num_threads)
- : Server (Config::instance()->server_port_base())
- , _log (log)
+using dcp::raw_convert;
+
+EncodeServer::EncodeServer (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
, _verbose (verbose)
, _num_threads (num_threads)
{
}
BOOST_FOREACH (boost::thread* i, _worker_threads) {
- DCPOMATIC_ASSERT (i->joinable ());
- i->join ();
+ /* Ideally this would be a DCPOMATIC_ASSERT(i->joinable()) but we
+ can't throw exceptions from a destructor.
+ */
+ if (i->joinable ()) {
+ i->join ();
+ }
delete i;
}
+ {
+ 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) {
- DCPOMATIC_ASSERT (_broadcast.thread->joinable ());
- _broadcast.thread->join ();
+ /* 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 ();
+ }
+ delete _broadcast.thread;
}
}
socket->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
string s (buffer.get());
- shared_ptr<cxml::Document> xml = make_shared<cxml::Document> ("EncodingRequest");
+ shared_ptr<cxml::Document> xml (new cxml::Document ("EncodingRequest"));
xml->read_string (s);
/* This is a double-check; the server shouldn't even be on the candidate list
if it is the wrong version, but it doesn't hurt to make sure here.
return -1;
}
- shared_ptr<PlayerVideo> pvf = make_shared<PlayerVideo> (xml, socket);
+ 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);
cout << e->get() << "\n";
}
- _log->log (e);
+ dcpomatic_log->log (e);
}
_full_condition.notify_all ();
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 ();
}
try
{
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);
+ boost::asio::ip::udp::endpoint listen_endpoint (address, HELLO_PORT);
_broadcast.socket = new boost::asio::ip::udp::socket (_broadcast.io_service);
_broadcast.socket->open (listen_endpoint.protocol ());
if (_verbose) {
cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n";
}
- shared_ptr<Socket> socket = make_shared<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(), Config::instance()->server_port_base() + 1));
+ 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 (...) {
}
}
- _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