}
int
-Server::process (shared_ptr<asio::ip::tcp::socket> socket)
+Server::process (shared_ptr<DeadlineWrapper> wrapper)
{
- DeadlineWrapper wrapper (_io_service);
- wrapper.set_socket (socket);
-
char buffer[128];
- wrapper.read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30);
- wrapper.consume (strlen (buffer) + 1);
+ wrapper->read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30);
+ wrapper->consume (strlen (buffer) + 1);
stringstream s (buffer);
}
for (int i = 0; i < image->components(); ++i) {
- wrapper.read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30);
+ wrapper->read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30);
}
#ifdef DEBUG_HASH
DCPVideoFrame dcp_video_frame (image, out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log);
shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
- encoded->send (socket);
+ encoded->send (wrapper);
#ifdef DEBUG_HASH
encoded->hash ("Encoded image (as made by server and as sent back)");
_worker_condition.wait (lock);
}
- shared_ptr<asio::ip::tcp::socket> socket = _queue.front ();
+ shared_ptr<DeadlineWrapper> wrapper = _queue.front ();
_queue.pop_front ();
lock.unlock ();
gettimeofday (&start, 0);
try {
- frame = process (socket);
+ frame = process (wrapper);
} catch (std::exception& e) {
cerr << "Error: " << e.what() << "\n";
}
- socket.reset ();
+ wrapper.reset ();
lock.lock ();
if (frame >= 0) {
struct timeval end;
gettimeofday (&end, 0);
- cout << "Encoded frame " << frame << " in " << (seconds (end) - seconds (start)) << "\n";
+ stringstream s;
+ s << "Encoded frame " << frame << " in " << (seconds (end) - seconds (start));
+ _log->log (s.str ());
}
_worker_condition.notify_all ();
void
Server::run (int num_threads)
{
- cout << "Server starting with " << num_threads << " threads.\n";
+ stringstream s;
+ s << "Server starting with " << num_threads << " threads.";
+ _log->log (s.str ());
for (int i = 0; i < num_threads; ++i) {
_worker_threads.push_back (new thread (bind (&Server::worker_thread, this)));
}
-
- asio::ip::tcp::acceptor acceptor (_io_service, asio::ip::tcp::endpoint (asio::ip::tcp::v4(), Config::instance()->server_port ()));
+
+ asio::io_service io_service;
+ asio::ip::tcp::acceptor acceptor (io_service, asio::ip::tcp::endpoint (asio::ip::tcp::v4(), Config::instance()->server_port ()));
while (1) {
- shared_ptr<asio::ip::tcp::socket> socket (new asio::ip::tcp::socket (_io_service));
- acceptor.accept (*socket);
+ shared_ptr<DeadlineWrapper> wrapper (new DeadlineWrapper);
+ acceptor.accept (wrapper->socket ());
mutex::scoped_lock lock (_worker_mutex);
_worker_condition.wait (lock);
}
- _queue.push_back (socket);
+ _queue.push_back (wrapper);
_worker_condition.notify_all ();
}
}