#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>
#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;
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)
{
}
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 ()) {
+ try {
i->join ();
+ } catch (...) {
+
}
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
- 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;
}
}
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);
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) {
cout << e->get() << "\n";
}
- _log->log (e);
+ dcpomatic_log->log (e);
}
_full_condition.notify_all ();
}
for (int i = 0; i < _num_threads; ++i) {
- _worker_threads.push_back (new thread (bind (&EncodeServer::worker_thread, this)));
+ boost::thread* t = new thread(bind(&EncodeServer::worker_thread, this));
+ _worker_threads.push_back (t);
+#ifdef DCPOMATIC_LINUX
+ pthread_setname_np (t->native_handle(), "encode-server-worker");
+#endif
}
- _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");
+#endif
Server::run ();
}
}
}
- _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
{
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);