/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
* encoding work, and a class to implement such a server.
*/
-#include <string>
-#include <vector>
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include <boost/scoped_array.hpp>
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
#include "server.h"
#include "util.h"
-#include "scaler.h"
+#include "dcpomatic_socket.h"
#include "image.h"
#include "dcp_video.h"
#include "config.h"
#include "cross.h"
#include "player_video.h"
-#include "encoded_data.h"
#include "safe_stringstream.h"
+#include "raw_convert.h"
+#include "compose.hpp"
+#include "log.h"
+#include "encoded_log_entry.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/scoped_array.hpp>
+#include <boost/foreach.hpp>
+#include <string>
+#include <vector>
+#include <iostream>
#include "i18n.h"
-#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) _log->log (__VA_ARGS__, Log::TYPE_GENERAL);
-#define LOG_ERROR(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR);
-#define LOG_ERROR_NC(...) _log->log (__VA_ARGS__, Log::TYPE_ERROR);
+#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::multimap;
using std::vector;
using std::list;
using std::cout;
using std::cerr;
-using std::setprecision;
using std::fixed;
using boost::shared_ptr;
-using boost::algorithm::is_any_of;
-using boost::algorithm::split;
using boost::thread;
using boost::bind;
using boost::scoped_array;
using boost::optional;
using dcp::Size;
-using dcp::raw_convert;
+using dcp::Data;
Server::Server (shared_ptr<Log> log, bool verbose)
: _terminate (false)
boost::mutex::scoped_lock lm (_worker_mutex);
_terminate = true;
_empty_condition.notify_all ();
+ _full_condition.notify_all ();
}
- for (vector<boost::thread*>::iterator i = _worker_threads.begin(); i != _worker_threads.end(); ++i) {
- (*i)->join ();
- delete *i;
+ BOOST_FOREACH (boost::thread* i, _worker_threads) {
+ DCPOMATIC_ASSERT (i->joinable ());
+ i->join ();
+ delete i;
}
_io_service.stop ();
_broadcast.io_service.stop ();
- _broadcast.thread->join ();
+ if (_broadcast.thread) {
+ DCPOMATIC_ASSERT (_broadcast.thread->joinable ());
+ _broadcast.thread->join ();
+ }
}
/** @param after_read Filled in with gettimeofday() after reading the input from the network.
string s (buffer.get());
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.
+ */
if (xml->number_child<int> ("Version") != SERVER_LINK_VERSION) {
cerr << "Mismatched server/client versions\n";
LOG_ERROR_NC ("Mismatched server/client versions");
return -1;
}
- shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket, _log));
+ shared_ptr<PlayerVideo> pvf (new PlayerVideo (xml, socket));
DCPVideo dcp_video_frame (pvf, xml, _log);
gettimeofday (&after_read, 0);
-
- shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
+
+ Data encoded = dcp_video_frame.encode_locally (boost::bind (&Log::dcp_log, _log.get(), _1, _2));
gettimeofday (&after_encode, 0);
-
+
try {
- encoded->send (socket);
+ socket->write (encoded.size());
+ socket->write (encoded.data().get(), encoded.size());
} catch (std::exception& e) {
cerr << "Send failed; frame " << dcp_video_frame.index() << "\n";
LOG_ERROR ("Send failed; frame %1", dcp_video_frame.index());
shared_ptr<Socket> socket = _queue.front ();
_queue.pop_front ();
-
+
lock.unlock ();
int frame = -1;
struct timeval after_read;
struct timeval after_encode;
struct timeval end;
-
+
gettimeofday (&start, 0);
-
+
try {
frame = process (socket, after_read, after_encode);
ip = socket->socket().remote_endpoint().address().to_string();
gettimeofday (&end, 0);
socket.reset ();
-
+
lock.lock ();
if (frame >= 0) {
struct timeval end;
gettimeofday (&end, 0);
- SafeStringStream message;
- message.precision (2);
- message << fixed
- << "Encoded frame " << frame << " from " << ip << ": "
- << "receive " << (seconds(after_read) - seconds(start)) << "s "
- << "encode " << (seconds(after_encode) - seconds(after_read)) << "s "
- << "send " << (seconds(end) - seconds(after_encode)) << "s.";
-
+ shared_ptr<EncodedLogEntry> e (
+ new EncodedLogEntry (
+ frame, ip,
+ seconds(after_read) - seconds(start),
+ seconds(after_encode) - seconds(after_read),
+ seconds(end) - seconds(after_encode)
+ )
+ );
+
if (_verbose) {
- cout << message.str() << "\n";
+ cout << e->get() << "\n";
}
- LOG_GENERAL_NC (message.str ());
+ _log->log (e);
}
-
+
_full_condition.notify_all ();
}
}
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 (&Server::worker_thread, this)));
}
_broadcast.thread = new thread (bind (&Server::broadcast_thread, this));
-
+
start_accept ();
_io_service.run ();
}
xmlpp::Document doc;
xmlpp::Element* root = doc.create_root_node ("ServerAvailable");
root->add_child("Threads")->add_child_text (raw_convert<string> (_worker_threads.size ()));
+ root->add_child("Version")->add_child_text (raw_convert<string> (SERVER_LINK_VERSION));
string xml = doc.write_to_string ("UTF-8");
+ if (_verbose) {
+ cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n";
+ }
shared_ptr<Socket> socket (new Socket);
try {
socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1));
}
}
-
+
_broadcast.socket->async_receive_from (
boost::asio::buffer (_broadcast.buffer, sizeof (_broadcast.buffer)),
_broadcast.send_endpoint, boost::bind (&Server::broadcast_received, this)
}
boost::mutex::scoped_lock lock (_worker_mutex);
-
+
/* Wait until the queue has gone down a bit */
while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) {
_full_condition.wait (lock);
}
-
+
_queue.push_back (socket);
_empty_condition.notify_all ();
start_accept ();
}
-
projects / dcpomatic.git / blobdiff