X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=9a633c861064d776de263743058d7c6c481084e7;hb=8872a0a0028048e277a623fa08e8242dd43f4824;hp=76989d078d3c07eb53030d41f32f06001b1702e6;hpb=cc4a67b7eb8ecaed076e261960848f70e3e741af;p=dcpomatic.git diff --git a/src/lib/server.cc b/src/lib/server.cc index 76989d078..9a633c861 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -1,196 +1,83 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -/** @file src/server.cc - * @brief Class to describe a server to which we can send - * encoding work, and a class to implement such a server. - */ - -#include -#include -#include -#include -#include #include "server.h" -#include "util.h" -#include "scaler.h" -#include "image.h" -#include "dcp_video_frame.h" -#include "config.h" - -using namespace std; -using namespace boost; - -/** Create a server description from a string of metadata returned from as_metadata(). - * @param v Metadata. - * @return ServerDescription, or 0. - */ -ServerDescription * -ServerDescription::create_from_metadata (string v) -{ - vector b; - split (b, v, is_any_of (" ")); +#include "dcpomatic_socket.h" - if (b.size() != 2) { - return 0; - } - - return new ServerDescription (b[0], atoi (b[1].c_str ())); -} +#include "i18n.h" -/** @return Description of this server as text */ -string -ServerDescription::as_metadata () const -{ - stringstream s; - s << _host_name << " " << _threads; - return s.str (); -} +using boost::shared_ptr; -Server::Server (Log* log) - : _log (log) +Server::Server (int port, int timeout) + : _terminate (false) + , _acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port)) + , _timeout (timeout) { } -int -Server::process (shared_ptr socket) +Server::~Server () { - char buffer[128]; - socket->read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30); - socket->consume (strlen (buffer) + 1); - - stringstream s (buffer); - - string command; - s >> command; - if (command != "encode") { - return -1; - } - - Size in_size; - int pixel_format_int; - Size out_size; - int padding; - string scaler_id; - int frame; - float frames_per_second; - string post_process; - int colour_lut_index; - int j2k_bandwidth; - - s >> in_size.width >> in_size.height - >> pixel_format_int - >> out_size.width >> out_size.height - >> padding - >> scaler_id - >> frame - >> frames_per_second - >> post_process - >> colour_lut_index - >> j2k_bandwidth; - - PixelFormat pixel_format = (PixelFormat) pixel_format_int; - Scaler const * scaler = Scaler::from_id (scaler_id); - if (post_process == "none") { - post_process = ""; - } - - shared_ptr image (new SimpleImage (pixel_format, in_size)); - - for (int i = 0; i < image->components(); ++i) { - socket->read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30); + { + boost::mutex::scoped_lock lm (_mutex); + _terminate = true; } - /* XXX: subtitle */ - DCPVideoFrame dcp_video_frame ( - image, shared_ptr (), out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, _log - ); - - shared_ptr encoded = dcp_video_frame.encode_locally (); - encoded->send (socket); - - return frame; + _acceptor.close (); + stop (); } void -Server::worker_thread () +Server::run () { - while (1) { - mutex::scoped_lock lock (_worker_mutex); - while (_queue.empty ()) { - _worker_condition.wait (lock); - } - - shared_ptr socket = _queue.front (); - _queue.pop_front (); - - lock.unlock (); - - int frame = -1; + start_accept (); + _io_service.run (); +} - struct timeval start; - gettimeofday (&start, 0); - - try { - frame = process (socket); - } catch (std::exception& e) { - cerr << "Error: " << e.what() << "\n"; - } - - socket.reset (); - - lock.lock (); - - if (frame >= 0) { - struct timeval end; - gettimeofday (&end, 0); - _log->log (String::compose ("Encoded frame %1 in %2", frame, seconds (end) - seconds (start))); +void +Server::start_accept () +{ + { + boost::mutex::scoped_lock lm (_mutex); + if (_terminate) { + return; } - - _worker_condition.notify_all (); } + + shared_ptr socket (new Socket(_timeout)); + _acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error)); } void -Server::run (int num_threads) +Server::handle_accept (shared_ptr socket, boost::system::error_code const & error) { - _log->log (String::compose ("Server starting with %1 threads", num_threads)); - - for (int i = 0; i < num_threads; ++i) { - _worker_threads.push_back (new thread (bind (&Server::worker_thread, this))); + if (error) { + return; } - 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 socket (new Socket); - acceptor.accept (socket->socket ()); - - mutex::scoped_lock lock (_worker_mutex); - - /* Wait until the queue has gone down a bit */ - while (int (_queue.size()) >= num_threads * 2) { - _worker_condition.wait (lock); - } - - _queue.push_back (socket); - _worker_condition.notify_all (); - } + handle (socket); + start_accept (); +} + +void +Server::stop () +{ + _io_service.stop (); }