Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

remove one fwd decl, add more comments to Connection

Browse Source
This commit is contained in:
Dennis Luxen 2014-06-12 13:46:07 +02:00
parent 44c6a64bf4
commit d27ac27bc7
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Server/Connection.cpp
View File

@ -41,13 +41,10 @@ namespace http
{ {
Connection::Connection(boost::asio::io_service &io_service, RequestHandler &handler) Connection::Connection(boost::asio::io_service &io_service, RequestHandler &handler)
: strand(io_service), TCP_socket(io_service), request_handler(handler), : strand(io_service), TCP_socket(io_service), request_handler(handler)
request_parser(new RequestParser())
{ {
} }
Connection::~Connection() { delete request_parser; }
boost::asio::ip::tcp::socket &Connection::socket() { return TCP_socket; } boost::asio::ip::tcp::socket &Connection::socket() { return TCP_socket; }
/// Start the first asynchronous operation for the connection. /// Start the first asynchronous operation for the connection.
@ -61,9 +58,9 @@ void Connection::start()
boost::asio::placeholders::bytes_transferred))); boost::asio::placeholders::bytes_transferred)));
} }
void Connection::handle_read(const boost::system::error_code &e, std::size_t bytes_transferred) void Connection::handle_read(const boost::system::error_code &error, std::size_t bytes_transferred)
{ {
if (e) if (error)
{ {
return; return;
} }
@ -72,7 +69,7 @@ void Connection::handle_read(const boost::system::error_code &e, std::size_t byt
CompressionType compression_type(noCompression); CompressionType compression_type(noCompression);
boost::tribool result; boost::tribool result;
boost::tie(result, boost::tuples::ignore) = boost::tie(result, boost::tuples::ignore) =
request_parser->Parse(request, request_parser.Parse(request,
incoming_data_buffer.data(), incoming_data_buffer.data(),
incoming_data_buffer.data() + bytes_transferred, incoming_data_buffer.data() + bytes_transferred,
&compression_type); &compression_type);
@ -93,7 +90,7 @@ void Connection::handle_read(const boost::system::error_code &e, std::size_t byt
case deflateRFC1951: case deflateRFC1951:
// use deflate for compression // use deflate for compression
reply.headers.insert(reply.headers.begin(), {"Content-Encoding", "deflate"}); reply.headers.insert(reply.headers.begin(), {"Content-Encoding", "deflate"});
compressBufferCollection(reply.content, compression_type, compressed_output); CompressBufferCollection(reply.content, compression_type, compressed_output);
reply.SetSize(compressed_output.size()); reply.SetSize(compressed_output.size());
output_buffer = reply.HeaderstoBuffers(); output_buffer = reply.HeaderstoBuffers();
output_buffer.push_back(boost::asio::buffer(compressed_output)); output_buffer.push_back(boost::asio::buffer(compressed_output));
@ -101,7 +98,7 @@ void Connection::handle_read(const boost::system::error_code &e, std::size_t byt
case gzipRFC1952: case gzipRFC1952:
// use gzip for compression // use gzip for compression
reply.headers.insert(reply.headers.begin(), {"Content-Encoding", "gzip"}); reply.headers.insert(reply.headers.begin(), {"Content-Encoding", "gzip"});
compressBufferCollection(reply.content, compression_type, compressed_output); CompressBufferCollection(reply.content, compression_type, compressed_output);
reply.SetSize(compressed_output.size()); reply.SetSize(compressed_output.size());
output_buffer = reply.HeaderstoBuffers(); output_buffer = reply.HeaderstoBuffers();
output_buffer.push_back(boost::asio::buffer(compressed_output)); output_buffer.push_back(boost::asio::buffer(compressed_output));
@ -112,6 +109,7 @@ void Connection::handle_read(const boost::system::error_code &e, std::size_t byt
output_buffer = reply.ToBuffers(); output_buffer = reply.ToBuffers();
break; break;
} }
// write result to stream
boost::asio::async_write(TCP_socket, boost::asio::async_write(TCP_socket,
output_buffer, output_buffer,
strand.wrap(boost::bind(&Connection::handle_write, strand.wrap(boost::bind(&Connection::handle_write,
@ -141,29 +139,32 @@ void Connection::handle_read(const boost::system::error_code &e, std::size_t byt
} }
/// Handle completion of a write operation. /// Handle completion of a write operation.
void Connection::handle_write(const boost::system::error_code &e) void Connection::handle_write(const boost::system::error_code &error)
{ {
if (!e) if (!error)
{ {
// Initiate graceful connection closure. // Initiate graceful connection closure.
boost::system::error_code ignoredEC; boost::system::error_code ignore_error;
TCP_socket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignoredEC); TCP_socket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignore_error);
} }
} }
void Connection::compressBufferCollection(std::vector<char> uncompressed_data, void Connection::CompressBufferCollection(std::vector<char> uncompressed_data,
CompressionType compression_type, CompressionType compression_type,
std::vector<char> &compressed_data) std::vector<char> &compressed_data)
{ {
boost::iostreams::gzip_params compression_parameters; boost::iostreams::gzip_params compression_parameters;
// there's a trade-off between speed and size. speed wins
compression_parameters.level = boost::iostreams::zlib::best_speed; compression_parameters.level = boost::iostreams::zlib::best_speed;
// check which compression flavor is used
if (deflateRFC1951 == compression_type) if (deflateRFC1951 == compression_type)
{ {
compression_parameters.noheader = true; compression_parameters.noheader = true;
} }
BOOST_ASSERT(compressed_data.empty()); BOOST_ASSERT(compressed_data.empty());
// plug data into boost's compression stream
boost::iostreams::filtering_ostream gzip_stream; boost::iostreams::filtering_ostream gzip_stream;
gzip_stream.push(boost::iostreams::gzip_compressor(compression_parameters)); gzip_stream.push(boost::iostreams::gzip_compressor(compression_parameters));
gzip_stream.push(boost::iostreams::back_inserter(compressed_data)); gzip_stream.push(boost::iostreams::back_inserter(compressed_data));

9
Server/Connection.h
View File

@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef CONNECTION_H #ifndef CONNECTION_H
#define CONNECTION_H #define CONNECTION_H
#include "RequestParser.h"
#include "Http/CompressionType.h" #include "Http/CompressionType.h"
#include "Http/Request.h" #include "Http/Request.h"
@ -68,15 +69,13 @@ class RequestHandler;
namespace http namespace http
{ {
class RequestParser;
/// Represents a single connection from a client. /// Represents a single connection from a client.
class Connection : public std::enable_shared_from_this<Connection> class Connection : public std::enable_shared_from_this<Connection>
{ {
public: public:
explicit Connection(boost::asio::io_service &io_service, RequestHandler &handler); explicit Connection(boost::asio::io_service &io_service, RequestHandler &handler);
Connection(const Connection &) = delete; Connection(const Connection &) = delete;
~Connection(); Connection() = delete;
boost::asio::ip::tcp::socket &socket(); boost::asio::ip::tcp::socket &socket();
@ -89,7 +88,7 @@ class Connection : public std::enable_shared_from_this<Connection>
/// Handle completion of a write operation. /// Handle completion of a write operation.
void handle_write(const boost::system::error_code &e); void handle_write(const boost::system::error_code &e);
void compressBufferCollection(std::vector<char> uncompressed_data, void CompressBufferCollection(std::vector<char> uncompressed_data,
CompressionType compression_type, CompressionType compression_type,
std::vector<char> &compressed_data); std::vector<char> &compressed_data);
@ -98,7 +97,7 @@ class Connection : public std::enable_shared_from_this<Connection>
RequestHandler &request_handler; RequestHandler &request_handler;
boost::array<char, 8192> incoming_data_buffer; boost::array<char, 8192> incoming_data_buffer;
Request request; Request request;
RequestParser *request_parser; RequestParser request_parser;
Reply reply; Reply reply;
}; };