From 93c3365a547fbb7467b6c47571c5a68e17b31e0c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 23 Sep 2012 14:02:01 +0100 Subject: Untested first cut. --- src/lib/dcp_video_frame.cc | 19 ++-- src/lib/server.cc | 14 +-- src/lib/server.h | 3 +- src/lib/util.cc | 242 +++++++++++++++++++++++++++++---------------- src/lib/util.h | 50 +++++----- 5 files changed, 205 insertions(+), 123 deletions(-) (limited to 'src/lib') diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index b128f6fa0..ade615bfb 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -293,11 +293,16 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv) { asio::io_service io_service; asio::ip::tcp::resolver resolver (io_service); + asio::ip::tcp::resolver::query query (serv->host_name(), boost::lexical_cast (Config::instance()->server_port ())); asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); shared_ptr socket (new asio::ip::tcp::socket (io_service)); - socket->connect (*endpoint_iterator); + + DeadlineWrapper wrapper (io_service); + wrapper.set_socket (socket); + + wrapper.connect (*endpoint_iterator, 30); #ifdef DEBUG_HASH _input->hash ("Input for remote encoding (before sending)"); @@ -320,21 +325,19 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv) s << _input->line_size()[i] << " "; } - asio::write (*socket, asio::buffer (s.str().c_str(), s.str().length() + 1)); + wrapper.write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 10); for (int i = 0; i < _input->components(); ++i) { - asio::write (*socket, asio::buffer (_input->data()[i], _input->line_size()[i] * _input->lines(i))); + wrapper.write (_input->data()[i], _input->line_size()[i] * _input->lines(i), 10); } - SocketReader reader (socket); - char buffer[32]; - reader.read_indefinite ((uint8_t *) buffer, sizeof (buffer)); - reader.consume (strlen (buffer) + 1); + wrapper.read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30); + wrapper.consume (strlen (buffer) + 1); shared_ptr e (new RemotelyEncodedData (atoi (buffer))); /* now read the rest */ - reader.read_definite_and_consume (e->data(), e->size()); + wrapper.read_definite_and_consume (e->data(), e->size(), 30); #ifdef DEBUG_HASH e->hash ("Encoded image (after receiving)"); diff --git a/src/lib/server.cc b/src/lib/server.cc index a62763447..395786b67 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -72,11 +72,12 @@ Server::Server (Log* log) int Server::process (shared_ptr socket) { - SocketReader reader (socket); + DeadlineWrapper wrapper (_io_service); + wrapper.set_socket (socket); char buffer[128]; - reader.read_indefinite ((uint8_t *) buffer, sizeof (buffer)); - reader.consume (strlen (buffer) + 1); + wrapper.read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30); + wrapper.consume (strlen (buffer) + 1); stringstream s (buffer); @@ -123,7 +124,7 @@ Server::process (shared_ptr socket) } for (int i = 0; i < image->components(); ++i) { - reader.read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i)); + wrapper.read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30); } #ifdef DEBUG_HASH @@ -189,10 +190,9 @@ Server::run (int num_threads) _worker_threads.push_back (new thread (bind (&Server::worker_thread, this))); } - asio::io_service io_service; - asio::ip::tcp::acceptor acceptor (io_service, asio::ip::tcp::endpoint (asio::ip::tcp::v4(), Config::instance()->server_port ())); + 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 asio::ip::tcp::socket (io_service)); + shared_ptr socket (new asio::ip::tcp::socket (_io_service)); acceptor.accept (*socket); mutex::scoped_lock lock (_worker_mutex); diff --git a/src/lib/server.h b/src/lib/server.h index fac440a76..747081443 100644 --- a/src/lib/server.h +++ b/src/lib/server.h @@ -81,7 +81,8 @@ public: private: void worker_thread (); int process (boost::shared_ptr socket); - + + boost::asio::io_service _io_service; std::vector _worker_threads; std::list > _queue; boost::mutex _worker_mutex; diff --git a/src/lib/util.cc b/src/lib/util.cc index e79c7cd1c..deab5d639 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -33,6 +33,8 @@ #include #include #include +#include +#include #include #include #include @@ -286,88 +288,6 @@ seconds (struct timeval t) return t.tv_sec + (double (t.tv_usec) / 1e6); } -/** @param socket Socket to read from */ -SocketReader::SocketReader (shared_ptr socket) - : _socket (socket) - , _buffer_data (0) -{ - -} - -/** Mark some data as being `consumed', so that it will not be returned - * as data again. - * @param size Amount of data to consume, in bytes. - */ -void -SocketReader::consume (int size) -{ - assert (_buffer_data >= size); - - _buffer_data -= size; - if (_buffer_data > 0) { - /* Shift still-valid data to the start of the buffer */ - memmove (_buffer, _buffer + size, _buffer_data); - } -} - -/** Read a definite amount of data from our socket, and mark - * it as consumed. - * @param data Where to put the data. - * @param size Number of bytes to read. - */ -void -SocketReader::read_definite_and_consume (uint8_t* data, int size) -{ - int const from_buffer = min (_buffer_data, size); - if (from_buffer > 0) { - /* Get data from our buffer */ - memcpy (data, _buffer, from_buffer); - consume (from_buffer); - /* Update our output state */ - data += from_buffer; - size -= from_buffer; - } - - /* read() the rest */ - while (size > 0) { - int const n = asio::read (*_socket, asio::buffer (data, size)); - if (n <= 0) { - throw NetworkError ("could not read"); - } - - data += n; - size -= n; - } -} - -/** Read as much data as is available, up to some limit. - * @param data Where to put the data. - * @param size Maximum amount of data to read. - */ -void -SocketReader::read_indefinite (uint8_t* data, int size) -{ - assert (size < int (sizeof (_buffer))); - - /* Amount of extra data we need to read () */ - int to_read = size - _buffer_data; - while (to_read > 0) { - /* read as much of it as we can (into our buffer) */ - int const n = asio::read (*_socket, asio::buffer (_buffer + _buffer_data, to_read)); - if (n <= 0) { - throw NetworkError ("could not read"); - } - - to_read -= n; - _buffer_data += n; - } - - assert (_buffer_data >= size); - - /* copy data into the output buffer */ - assert (size >= _buffer_data); - memcpy (data, _buffer, size); -} #ifdef DVDOMATIC_POSIX void @@ -518,9 +438,163 @@ colour_lut_index_to_name (int index) return ""; } +DeadlineWrapper::DeadlineWrapper (asio::io_service& io_service) + : _io_service (io_service) + , _deadline (io_service) + , _buffer_data (0) +{ + _deadline.expires_at (posix_time::pos_infin); + check (); +} + +void +DeadlineWrapper::set_socket (shared_ptr socket) +{ + _socket = socket; +} + +void +DeadlineWrapper::check () +{ + if (_deadline.expires_at() <= asio::deadline_timer::traits_type::now ()) { + if (_socket) { + _socket->close (); + } + _deadline.expires_at (posix_time::pos_infin); + } + + _deadline.async_wait (boost::bind (&DeadlineWrapper::check, this)); +} + +void +DeadlineWrapper::connect (asio::ip::basic_resolver_entry const & endpoint, int timeout) +{ + assert (_socket); + + system::error_code ec = asio::error::would_block; + _socket->async_connect (endpoint, lambda::var(ec) = lambda::_1); + do { + _io_service.run_one(); + } while (ec == asio::error::would_block); + + if (ec || !_socket->is_open ()) { + throw NetworkError ("connect timed out"); + } +} + +void +DeadlineWrapper::write (uint8_t const * data, int size, int timeout) +{ + assert (_socket); + + _deadline.expires_from_now (posix_time::seconds (timeout)); + system::error_code ec = asio::error::would_block; + + asio::async_write (*_socket, asio::buffer (data, size), lambda::var(ec) = lambda::_1); + do { + _io_service.run_one (); + } while (ec == asio::error::would_block); + + if (ec) { + throw NetworkError ("write timed out"); + } +} + int -read_with_timeout (boost::asio::ip::tcp::socket* socket, uint8_t* data, int size) +DeadlineWrapper::read (uint8_t* data, int size, int timeout) { + assert (_socket); + + _deadline.expires_from_now (posix_time::seconds (timeout)); + system::error_code ec = asio::error::would_block; + + int amount_read = 0; + + _socket->async_read_some ( + asio::buffer (data, size), + (lambda::var(ec) = lambda::_1, lambda::var(amount_read) = lambda::_2) + ); + + _io_service.run (); + + if (ec) { + amount_read = 0; + } + + return amount_read; +} + +/** Mark some data as being `consumed', so that it will not be returned + * as data again. + * @param size Amount of data to consume, in bytes. + */ +void +DeadlineWrapper::consume (int size) +{ + assert (_buffer_data >= size); - return asio::read (socket, asio::buffer (data, size)); + _buffer_data -= size; + if (_buffer_data > 0) { + /* Shift still-valid data to the start of the buffer */ + memmove (_buffer, _buffer + size, _buffer_data); + } +} + +/** Read a definite amount of data from our socket, and mark + * it as consumed. + * @param data Where to put the data. + * @param size Number of bytes to read. + */ +void +DeadlineWrapper::read_definite_and_consume (uint8_t* data, int size, int timeout) +{ + int const from_buffer = min (_buffer_data, size); + if (from_buffer > 0) { + /* Get data from our buffer */ + memcpy (data, _buffer, from_buffer); + consume (from_buffer); + /* Update our output state */ + data += from_buffer; + size -= from_buffer; + } + + /* read() the rest */ + while (size > 0) { + int const n = read (data, size, timeout); + if (n <= 0) { + throw NetworkError ("could not read"); + } + + data += n; + size -= n; + } +} + +/** Read as much data as is available, up to some limit. + * @param data Where to put the data. + * @param size Maximum amount of data to read. + */ +void +DeadlineWrapper::read_indefinite (uint8_t* data, int size, int timeout) +{ + assert (size < int (sizeof (_buffer))); + + /* Amount of extra data we need to read () */ + int to_read = size - _buffer_data; + while (to_read > 0) { + /* read as much of it as we can (into our buffer) */ + int const n = read (_buffer + _buffer_data, to_read, timeout); + if (n <= 0) { + throw NetworkError ("could not read"); + } + + to_read -= n; + _buffer_data += n; + } + + assert (_buffer_data >= size); + + /* copy data into the output buffer */ + assert (size >= _buffer_data); + memcpy (data, _buffer, size); } diff --git a/src/lib/util.h b/src/lib/util.h index 568fe05d0..c3a42e448 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -56,29 +56,6 @@ enum ContentType { extern void md5_data (std::string, void const *, int); #endif -/** @class SocketReader - * @brief A helper class from reading from sockets. - * - * You can probably do this stuff directly in boost, but I'm not sure how. - */ -class SocketReader -{ -public: - SocketReader (boost::shared_ptr); - - void read_definite_and_consume (uint8_t *, int); - void read_indefinite (uint8_t *, int); - void consume (int); - -private: - /** socket we are reading from */ - boost::shared_ptr _socket; - /** a buffer for small reads */ - uint8_t _buffer[256]; - /** amount of valid data in the buffer */ - int _buffer_data; -}; - /** @class Size * @brief Representation of the size of something */ struct Size @@ -136,4 +113,31 @@ extern std::string crop_string (Position, Size); extern int dcp_audio_sample_rate (int); extern std::string colour_lut_index_to_name (int index); +class DeadlineWrapper +{ +public: + DeadlineWrapper (boost::asio::io_service& io_service); + + void set_socket (boost::shared_ptr socket); + + void connect (boost::asio::ip::basic_resolver_entry const & endpoint, int timeout); + void write (uint8_t const * data, int size, int timeout); + int read (uint8_t* data, int size, int timeout); + + void read_definite_and_consume (uint8_t* data, int size, int timeout); + void read_indefinite (uint8_t* data, int size, int timeout); + void consume (int amount); + +private: + void check (); + + boost::asio::io_service& _io_service; + boost::asio::deadline_timer _deadline; + boost::shared_ptr _socket; + /** a buffer for small reads */ + uint8_t _buffer[256]; + /** amount of valid data in the buffer */ + int _buffer_data; +}; + #endif -- cgit v1.2.3 From 1fb3be8977e2300fd0ba30d6593bcb806e66cb9a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 23 Sep 2012 14:40:44 +0100 Subject: Fix up basic test to work. --- src/lib/util.cc | 8 +++++--- test/test.cc | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/lib') diff --git a/src/lib/util.cc b/src/lib/util.cc index deab5d639..3f48d696b 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -486,7 +486,7 @@ void DeadlineWrapper::write (uint8_t const * data, int size, int timeout) { assert (_socket); - + _deadline.expires_from_now (posix_time::seconds (timeout)); system::error_code ec = asio::error::would_block; @@ -515,8 +515,10 @@ DeadlineWrapper::read (uint8_t* data, int size, int timeout) (lambda::var(ec) = lambda::_1, lambda::var(amount_read) = lambda::_2) ); - _io_service.run (); - + do { + _io_service.run_one (); + } while (ec == asio::error::would_block); + if (ec) { amount_read = 0; } diff --git a/test/test.cc b/test/test.cc index 06954822d..6d5efa455 100644 --- a/test/test.cc +++ b/test/test.cc @@ -289,7 +289,7 @@ BOOST_AUTO_TEST_CASE (client_server_test) Config::instance()->set_server_port (61920); Server server (&log); - thread t (boost::bind (&Server::run, &server, 1)); + new thread (boost::bind (&Server::run, &server, 1)); ServerDescription description ("localhost", 1); shared_ptr remotely_encoded = frame.encode_remotely (&description); -- cgit v1.2.3 From 794e306a0f5b16cbb49ef9e75e1b9fb88c489b31 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 23 Sep 2012 14:47:45 +0100 Subject: Bump timeouts a bit. --- src/lib/dcp_video_frame.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index ade615bfb..d202109d0 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -325,10 +325,10 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv) s << _input->line_size()[i] << " "; } - wrapper.write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 10); + wrapper.write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30); for (int i = 0; i < _input->components(); ++i) { - wrapper.write (_input->data()[i], _input->line_size()[i] * _input->lines(i), 10); + wrapper.write (_input->data()[i], _input->line_size()[i] * _input->lines(i), 30); } char buffer[32]; -- cgit v1.2.3 From f62909cfe63e6a2e238e655ea0536a5f627e0ddf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 23 Sep 2012 14:48:58 +0100 Subject: Use log rather the cout in server. --- src/lib/server.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/server.cc b/src/lib/server.cc index 395786b67..d92fdf2b6 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -174,7 +174,9 @@ Server::worker_thread () 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 (); @@ -184,7 +186,9 @@ Server::worker_thread () 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))); -- cgit v1.2.3 From 46f1b3106ab959e21946fe1f035efc6dc1743b49 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 23 Sep 2012 15:07:30 +0100 Subject: Missing use of wrapper. --- src/lib/dcp_video_frame.cc | 6 +++--- src/lib/dcp_video_frame.h | 2 +- src/lib/server.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/lib') diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index d202109d0..ee29d8601 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -378,12 +378,12 @@ EncodedData::write (shared_ptr opt, int frame) * @param socket Socket */ void -EncodedData::send (shared_ptr socket) +EncodedData::send (DeadlineWrapper& wrapper) { stringstream s; s << _size; - asio::write (*socket, asio::buffer (s.str().c_str(), s.str().length() + 1)); - asio::write (*socket, asio::buffer (_data, _size)); + wrapper.write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30); + wrapper.write (_data, _size, 30); } #ifdef DEBUG_HASH diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h index ee54bc0f5..d82aee367 100644 --- a/src/lib/dcp_video_frame.h +++ b/src/lib/dcp_video_frame.h @@ -48,7 +48,7 @@ public: virtual ~EncodedData () {} - void send (boost::shared_ptr); + void send (DeadlineWrapper& wrapper); void write (boost::shared_ptr, int); #ifdef DEBUG_HASH diff --git a/src/lib/server.cc b/src/lib/server.cc index d92fdf2b6..9e61c2282 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -133,7 +133,7 @@ Server::process (shared_ptr socket) DCPVideoFrame dcp_video_frame (image, 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); + encoded->send (wrapper); #ifdef DEBUG_HASH encoded->hash ("Encoded image (as made by server and as sent back)"); -- cgit v1.2.3 From 6726393a4b186333b8e1080f3f1c5c4b77d4c2e6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 23 Sep 2012 16:51:10 +0100 Subject: Multi-thread test. --- src/lib/util.h | 2 ++ test/test.cc | 53 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 38 insertions(+), 17 deletions(-) (limited to 'src/lib') diff --git a/src/lib/util.h b/src/lib/util.h index c3a42e448..2785a5dc1 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -131,6 +131,8 @@ public: private: void check (); + DeadlineWrapper (DeadlineWrapper const &); + boost::asio::io_service& _io_service; boost::asio::deadline_timer _deadline; boost::shared_ptr _socket; diff --git a/test/test.cc b/test/test.cc index 2a99c862f..b77eb2b51 100644 --- a/test/test.cc +++ b/test/test.cc @@ -254,6 +254,17 @@ BOOST_AUTO_TEST_CASE (paths_test) BOOST_CHECK_EQUAL (s.content_path(), "build/test/a/b/c/d/e/foo/bar/baz"); } +void +do_remote_encode (shared_ptr frame, ServerDescription* description, shared_ptr locally_encoded) +{ + shared_ptr remotely_encoded; + BOOST_CHECK_NO_THROW (remotely_encoded = frame->encode_remotely (description)); + BOOST_CHECK (remotely_encoded); + + BOOST_CHECK_EQUAL (locally_encoded->size(), remotely_encoded->size()); + BOOST_CHECK (memcmp (locally_encoded->data(), remotely_encoded->data(), locally_encoded->size()) == 0); +} + BOOST_AUTO_TEST_CASE (client_server_test) { shared_ptr image (new SimpleImage (PIX_FMT_RGB24, Size (1998, 1080))); @@ -271,29 +282,37 @@ BOOST_AUTO_TEST_CASE (client_server_test) FileLog log ("build/test/client_server_test.log"); - DCPVideoFrame frame ( - image, - Size (1998, 1080), - 0, - Scaler::from_id ("bicubic"), - 0, - 24, - "", - 0, - 200000000, - &log + shared_ptr frame ( + new DCPVideoFrame ( + image, + Size (1998, 1080), + 0, + Scaler::from_id ("bicubic"), + 0, + 24, + "", + 0, + 200000000, + &log + ) ); - shared_ptr locally_encoded = frame.encode_locally (); + shared_ptr locally_encoded = frame->encode_locally (); Config::instance()->set_server_port (61920); Server* server = new Server (&log); - new thread (boost::bind (&Server::run, server, 1)); + new thread (boost::bind (&Server::run, server, 2)); - ServerDescription description ("localhost", 1); - shared_ptr remotely_encoded = frame.encode_remotely (&description); + ServerDescription description ("localhost", 2); - BOOST_CHECK_EQUAL (locally_encoded->size(), remotely_encoded->size()); - BOOST_CHECK (memcmp (locally_encoded->data(), remotely_encoded->data(), locally_encoded->size()) == 0); + thread* a = new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded)); + thread* b = new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded)); + thread* c = new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded)); + thread* d = new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded)); + + a->join (); + b->join (); + c->join (); + d->join (); } -- cgit v1.2.3 From e89fb9d81358b51ed0e231725f7fb6eb63f96c5b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 23 Sep 2012 17:50:31 +0100 Subject: Use io_service per thread. --- src/lib/dcp_video_frame.cc | 11 ++++------- src/lib/dcp_video_frame.h | 2 +- src/lib/server.cc | 28 +++++++++++++--------------- src/lib/server.h | 7 ++++--- src/lib/util.cc | 30 ++++++++---------------------- src/lib/util.h | 10 ++++++---- test/test.cc | 17 ++++++++--------- 7 files changed, 44 insertions(+), 61 deletions(-) (limited to 'src/lib') diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index ee29d8601..5c0ec6a6a 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -297,10 +297,7 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv) asio::ip::tcp::resolver::query query (serv->host_name(), boost::lexical_cast (Config::instance()->server_port ())); asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); - shared_ptr socket (new asio::ip::tcp::socket (io_service)); - - DeadlineWrapper wrapper (io_service); - wrapper.set_socket (socket); + DeadlineWrapper wrapper; wrapper.connect (*endpoint_iterator, 30); @@ -378,12 +375,12 @@ EncodedData::write (shared_ptr opt, int frame) * @param socket Socket */ void -EncodedData::send (DeadlineWrapper& wrapper) +EncodedData::send (shared_ptr wrapper) { stringstream s; s << _size; - wrapper.write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30); - wrapper.write (_data, _size, 30); + wrapper->write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30); + wrapper->write (_data, _size, 30); } #ifdef DEBUG_HASH diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h index d82aee367..752f0dda7 100644 --- a/src/lib/dcp_video_frame.h +++ b/src/lib/dcp_video_frame.h @@ -48,7 +48,7 @@ public: virtual ~EncodedData () {} - void send (DeadlineWrapper& wrapper); + void send (boost::shared_ptr wrapper); void write (boost::shared_ptr, int); #ifdef DEBUG_HASH diff --git a/src/lib/server.cc b/src/lib/server.cc index 9e61c2282..1f860d254 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -70,14 +70,11 @@ Server::Server (Log* log) } int -Server::process (shared_ptr socket) +Server::process (shared_ptr 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); @@ -124,7 +121,7 @@ Server::process (shared_ptr socket) } 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 @@ -151,7 +148,7 @@ Server::worker_thread () _worker_condition.wait (lock); } - shared_ptr socket = _queue.front (); + shared_ptr wrapper = _queue.front (); _queue.pop_front (); lock.unlock (); @@ -162,12 +159,12 @@ Server::worker_thread () 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 (); @@ -193,11 +190,12 @@ Server::run (int num_threads) 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 socket (new asio::ip::tcp::socket (_io_service)); - acceptor.accept (*socket); + shared_ptr wrapper (new DeadlineWrapper); + acceptor.accept (wrapper->socket ()); mutex::scoped_lock lock (_worker_mutex); @@ -206,7 +204,7 @@ Server::run (int num_threads) _worker_condition.wait (lock); } - _queue.push_back (socket); + _queue.push_back (wrapper); _worker_condition.notify_all (); } } diff --git a/src/lib/server.h b/src/lib/server.h index 747081443..4cb6f2563 100644 --- a/src/lib/server.h +++ b/src/lib/server.h @@ -28,6 +28,8 @@ #include #include "log.h" +class DeadlineWrapper; + /** @class ServerDescription * @brief Class to describe a server to which we can send encoding work. */ @@ -80,11 +82,10 @@ public: private: void worker_thread (); - int process (boost::shared_ptr socket); + int process (boost::shared_ptr wrapper); - boost::asio::io_service _io_service; std::vector _worker_threads; - std::list > _queue; + std::list > _queue; boost::mutex _worker_mutex; boost::condition _worker_condition; Log* _log; diff --git a/src/lib/util.cc b/src/lib/util.cc index 3f48d696b..8713c5922 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -438,28 +438,20 @@ colour_lut_index_to_name (int index) return ""; } -DeadlineWrapper::DeadlineWrapper (asio::io_service& io_service) - : _io_service (io_service) - , _deadline (io_service) +DeadlineWrapper::DeadlineWrapper () + : _deadline (_io_service) + , _socket (_io_service) , _buffer_data (0) { _deadline.expires_at (posix_time::pos_infin); check (); } -void -DeadlineWrapper::set_socket (shared_ptr socket) -{ - _socket = socket; -} - void DeadlineWrapper::check () { if (_deadline.expires_at() <= asio::deadline_timer::traits_type::now ()) { - if (_socket) { - _socket->close (); - } + _socket.close (); _deadline.expires_at (posix_time::pos_infin); } @@ -469,15 +461,13 @@ DeadlineWrapper::check () void DeadlineWrapper::connect (asio::ip::basic_resolver_entry const & endpoint, int timeout) { - assert (_socket); - system::error_code ec = asio::error::would_block; - _socket->async_connect (endpoint, lambda::var(ec) = lambda::_1); + _socket.async_connect (endpoint, lambda::var(ec) = lambda::_1); do { _io_service.run_one(); } while (ec == asio::error::would_block); - if (ec || !_socket->is_open ()) { + if (ec || !_socket.is_open ()) { throw NetworkError ("connect timed out"); } } @@ -485,12 +475,10 @@ DeadlineWrapper::connect (asio::ip::basic_resolver_entry const & void DeadlineWrapper::write (uint8_t const * data, int size, int timeout) { - assert (_socket); - _deadline.expires_from_now (posix_time::seconds (timeout)); system::error_code ec = asio::error::would_block; - asio::async_write (*_socket, asio::buffer (data, size), lambda::var(ec) = lambda::_1); + asio::async_write (_socket, asio::buffer (data, size), lambda::var(ec) = lambda::_1); do { _io_service.run_one (); } while (ec == asio::error::would_block); @@ -503,14 +491,12 @@ DeadlineWrapper::write (uint8_t const * data, int size, int timeout) int DeadlineWrapper::read (uint8_t* data, int size, int timeout) { - assert (_socket); - _deadline.expires_from_now (posix_time::seconds (timeout)); system::error_code ec = asio::error::would_block; int amount_read = 0; - _socket->async_read_some ( + _socket.async_read_some ( asio::buffer (data, size), (lambda::var(ec) = lambda::_1, lambda::var(amount_read) = lambda::_2) ); diff --git a/src/lib/util.h b/src/lib/util.h index 2785a5dc1..8d6e2f541 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -116,9 +116,11 @@ extern std::string colour_lut_index_to_name (int index); class DeadlineWrapper { public: - DeadlineWrapper (boost::asio::io_service& io_service); + DeadlineWrapper (); - void set_socket (boost::shared_ptr socket); + boost::asio::ip::tcp::socket& socket () { + return _socket; + } void connect (boost::asio::ip::basic_resolver_entry const & endpoint, int timeout); void write (uint8_t const * data, int size, int timeout); @@ -133,9 +135,9 @@ private: DeadlineWrapper (DeadlineWrapper const &); - boost::asio::io_service& _io_service; + boost::asio::io_service _io_service; boost::asio::deadline_timer _deadline; - boost::shared_ptr _socket; + boost::asio::ip::tcp::socket _socket; /** a buffer for small reads */ uint8_t _buffer[256]; /** amount of valid data in the buffer */ diff --git a/test/test.cc b/test/test.cc index b77eb2b51..638d526e0 100644 --- a/test/test.cc +++ b/test/test.cc @@ -306,13 +306,12 @@ BOOST_AUTO_TEST_CASE (client_server_test) ServerDescription description ("localhost", 2); - thread* a = new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded)); - thread* b = new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded)); - thread* c = new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded)); - thread* d = new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded)); - - a->join (); - b->join (); - c->join (); - d->join (); + list threads; + for (int i = 0; i < 8; ++i) { + threads.push_back (new thread (boost::bind (do_remote_encode, frame, &description, locally_encoded))); + } + + for (list::iterator i = threads.begin(); i != threads.end(); ++i) { + (*i)->join (); + } } -- cgit v1.2.3 From 737c3392039740f7a22a9ff922f8492905173b9c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 23 Sep 2012 17:56:08 +0100 Subject: Tidy up naming. --- src/lib/dcp_video_frame.cc | 21 ++++++++++----------- src/lib/dcp_video_frame.h | 2 +- src/lib/server.cc | 22 +++++++++++----------- src/lib/server.h | 6 +++--- src/lib/util.cc | 18 +++++++++--------- src/lib/util.h | 8 ++++---- 6 files changed, 38 insertions(+), 39 deletions(-) (limited to 'src/lib') diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc index 5c0ec6a6a..d8af3462d 100644 --- a/src/lib/dcp_video_frame.cc +++ b/src/lib/dcp_video_frame.cc @@ -293,13 +293,12 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv) { asio::io_service io_service; asio::ip::tcp::resolver resolver (io_service); - asio::ip::tcp::resolver::query query (serv->host_name(), boost::lexical_cast (Config::instance()->server_port ())); asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query); - DeadlineWrapper wrapper; + Socket socket; - wrapper.connect (*endpoint_iterator, 30); + socket.connect (*endpoint_iterator, 30); #ifdef DEBUG_HASH _input->hash ("Input for remote encoding (before sending)"); @@ -322,19 +321,19 @@ DCPVideoFrame::encode_remotely (ServerDescription const * serv) s << _input->line_size()[i] << " "; } - wrapper.write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30); + socket.write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30); for (int i = 0; i < _input->components(); ++i) { - wrapper.write (_input->data()[i], _input->line_size()[i] * _input->lines(i), 30); + socket.write (_input->data()[i], _input->line_size()[i] * _input->lines(i), 30); } char buffer[32]; - wrapper.read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30); - wrapper.consume (strlen (buffer) + 1); + socket.read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30); + socket.consume (strlen (buffer) + 1); shared_ptr e (new RemotelyEncodedData (atoi (buffer))); /* now read the rest */ - wrapper.read_definite_and_consume (e->data(), e->size(), 30); + socket.read_definite_and_consume (e->data(), e->size(), 30); #ifdef DEBUG_HASH e->hash ("Encoded image (after receiving)"); @@ -375,12 +374,12 @@ EncodedData::write (shared_ptr opt, int frame) * @param socket Socket */ void -EncodedData::send (shared_ptr wrapper) +EncodedData::send (shared_ptr socket) { stringstream s; s << _size; - wrapper->write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30); - wrapper->write (_data, _size, 30); + socket->write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30); + socket->write (_data, _size, 30); } #ifdef DEBUG_HASH diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h index 752f0dda7..da4e0c301 100644 --- a/src/lib/dcp_video_frame.h +++ b/src/lib/dcp_video_frame.h @@ -48,7 +48,7 @@ public: virtual ~EncodedData () {} - void send (boost::shared_ptr wrapper); + void send (boost::shared_ptr socket); void write (boost::shared_ptr, int); #ifdef DEBUG_HASH diff --git a/src/lib/server.cc b/src/lib/server.cc index 1f860d254..8ca426049 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -70,11 +70,11 @@ Server::Server (Log* log) } int -Server::process (shared_ptr wrapper) +Server::process (shared_ptr socket) { char buffer[128]; - wrapper->read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30); - wrapper->consume (strlen (buffer) + 1); + socket->read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30); + socket->consume (strlen (buffer) + 1); stringstream s (buffer); @@ -121,7 +121,7 @@ Server::process (shared_ptr wrapper) } for (int i = 0; i < image->components(); ++i) { - wrapper->read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30); + socket->read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i), 30); } #ifdef DEBUG_HASH @@ -130,7 +130,7 @@ Server::process (shared_ptr wrapper) DCPVideoFrame dcp_video_frame (image, 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 (wrapper); + encoded->send (socket); #ifdef DEBUG_HASH encoded->hash ("Encoded image (as made by server and as sent back)"); @@ -148,7 +148,7 @@ Server::worker_thread () _worker_condition.wait (lock); } - shared_ptr wrapper = _queue.front (); + shared_ptr socket = _queue.front (); _queue.pop_front (); lock.unlock (); @@ -159,12 +159,12 @@ Server::worker_thread () gettimeofday (&start, 0); try { - frame = process (wrapper); + frame = process (socket); } catch (std::exception& e) { cerr << "Error: " << e.what() << "\n"; } - wrapper.reset (); + socket.reset (); lock.lock (); @@ -194,8 +194,8 @@ Server::run (int num_threads) 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 wrapper (new DeadlineWrapper); - acceptor.accept (wrapper->socket ()); + shared_ptr socket (new Socket); + acceptor.accept (socket->socket ()); mutex::scoped_lock lock (_worker_mutex); @@ -204,7 +204,7 @@ Server::run (int num_threads) _worker_condition.wait (lock); } - _queue.push_back (wrapper); + _queue.push_back (socket); _worker_condition.notify_all (); } } diff --git a/src/lib/server.h b/src/lib/server.h index 4cb6f2563..32ba8dc4b 100644 --- a/src/lib/server.h +++ b/src/lib/server.h @@ -28,7 +28,7 @@ #include #include "log.h" -class DeadlineWrapper; +class Socket; /** @class ServerDescription * @brief Class to describe a server to which we can send encoding work. @@ -82,10 +82,10 @@ public: private: void worker_thread (); - int process (boost::shared_ptr wrapper); + int process (boost::shared_ptr socket); std::vector _worker_threads; - std::list > _queue; + std::list > _queue; boost::mutex _worker_mutex; boost::condition _worker_condition; Log* _log; diff --git a/src/lib/util.cc b/src/lib/util.cc index 8713c5922..d12bd3e77 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -438,7 +438,7 @@ colour_lut_index_to_name (int index) return ""; } -DeadlineWrapper::DeadlineWrapper () +Socket::Socket () : _deadline (_io_service) , _socket (_io_service) , _buffer_data (0) @@ -448,18 +448,18 @@ DeadlineWrapper::DeadlineWrapper () } void -DeadlineWrapper::check () +Socket::check () { if (_deadline.expires_at() <= asio::deadline_timer::traits_type::now ()) { _socket.close (); _deadline.expires_at (posix_time::pos_infin); } - _deadline.async_wait (boost::bind (&DeadlineWrapper::check, this)); + _deadline.async_wait (boost::bind (&Socket::check, this)); } void -DeadlineWrapper::connect (asio::ip::basic_resolver_entry const & endpoint, int timeout) +Socket::connect (asio::ip::basic_resolver_entry const & endpoint, int timeout) { system::error_code ec = asio::error::would_block; _socket.async_connect (endpoint, lambda::var(ec) = lambda::_1); @@ -473,7 +473,7 @@ DeadlineWrapper::connect (asio::ip::basic_resolver_entry const & } void -DeadlineWrapper::write (uint8_t const * data, int size, int timeout) +Socket::write (uint8_t const * data, int size, int timeout) { _deadline.expires_from_now (posix_time::seconds (timeout)); system::error_code ec = asio::error::would_block; @@ -489,7 +489,7 @@ DeadlineWrapper::write (uint8_t const * data, int size, int timeout) } int -DeadlineWrapper::read (uint8_t* data, int size, int timeout) +Socket::read (uint8_t* data, int size, int timeout) { _deadline.expires_from_now (posix_time::seconds (timeout)); system::error_code ec = asio::error::would_block; @@ -517,7 +517,7 @@ DeadlineWrapper::read (uint8_t* data, int size, int timeout) * @param size Amount of data to consume, in bytes. */ void -DeadlineWrapper::consume (int size) +Socket::consume (int size) { assert (_buffer_data >= size); @@ -534,7 +534,7 @@ DeadlineWrapper::consume (int size) * @param size Number of bytes to read. */ void -DeadlineWrapper::read_definite_and_consume (uint8_t* data, int size, int timeout) +Socket::read_definite_and_consume (uint8_t* data, int size, int timeout) { int const from_buffer = min (_buffer_data, size); if (from_buffer > 0) { @@ -563,7 +563,7 @@ DeadlineWrapper::read_definite_and_consume (uint8_t* data, int size, int timeout * @param size Maximum amount of data to read. */ void -DeadlineWrapper::read_indefinite (uint8_t* data, int size, int timeout) +Socket::read_indefinite (uint8_t* data, int size, int timeout) { assert (size < int (sizeof (_buffer))); diff --git a/src/lib/util.h b/src/lib/util.h index 8d6e2f541..d7f233003 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -113,10 +113,10 @@ extern std::string crop_string (Position, Size); extern int dcp_audio_sample_rate (int); extern std::string colour_lut_index_to_name (int index); -class DeadlineWrapper +class Socket { public: - DeadlineWrapper (); + Socket (); boost::asio::ip::tcp::socket& socket () { return _socket; @@ -124,7 +124,6 @@ public: void connect (boost::asio::ip::basic_resolver_entry const & endpoint, int timeout); void write (uint8_t const * data, int size, int timeout); - int read (uint8_t* data, int size, int timeout); void read_definite_and_consume (uint8_t* data, int size, int timeout); void read_indefinite (uint8_t* data, int size, int timeout); @@ -132,8 +131,9 @@ public: private: void check (); + int read (uint8_t* data, int size, int timeout); - DeadlineWrapper (DeadlineWrapper const &); + Socket (Socket const &); boost::asio::io_service _io_service; boost::asio::deadline_timer _deadline; -- cgit v1.2.3