Skip to content

Commit

Permalink
fix format problem
Browse files Browse the repository at this point in the history
  • Loading branch information
xin.wang committed Aug 22, 2023
1 parent 1e1c633 commit c3a8e5e
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 13 deletions.
4 changes: 3 additions & 1 deletion include/server/connection.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ class RequestHandler;
class Connection : public std::enable_shared_from_this<Connection>
{
public:
explicit Connection(boost::asio::io_context &io_context, RequestHandler &handler, short keepalive_timeout);
explicit Connection(boost::asio::io_context &io_context,
RequestHandler &handler,
short keepalive_timeout);
Connection(const Connection &) = delete;
Connection &operator=(const Connection &) = delete;

Expand Down
19 changes: 13 additions & 6 deletions include/server/server.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,24 @@ class Server
{
public:
// Note: returns a shared instead of a unique ptr as it is captured in a lambda somewhere else
static std::shared_ptr<Server>
CreateServer(std::string &ip_address, int ip_port, unsigned requested_num_threads, short keepalive_timeout)
static std::shared_ptr<Server> CreateServer(std::string &ip_address,
int ip_port,
unsigned requested_num_threads,
short keepalive_timeout)
{
util::Log() << "http 1.1 compression handled by zlib version " << zlibVersion();
const unsigned hardware_threads = std::max(1u, std::thread::hardware_concurrency());
const unsigned real_num_threads = std::min(hardware_threads, requested_num_threads);
return std::make_shared<Server>(ip_address, ip_port, real_num_threads, keepalive_timeout);
}

explicit Server(const std::string &address, const int port, const unsigned thread_pool_size, const short keepalive_timeout)
: thread_pool_size(thread_pool_size), keepalive_timeout(keepalive_timeout), acceptor(io_context),
new_connection(std::make_shared<Connection>(io_context, request_handler, keepalive_timeout))
explicit Server(const std::string &address,
const int port,
const unsigned thread_pool_size,
const short keepalive_timeout)
: thread_pool_size(thread_pool_size), keepalive_timeout(keepalive_timeout),
acceptor(io_context), new_connection(std::make_shared<Connection>(
io_context, request_handler, keepalive_timeout))
{
const auto port_string = std::to_string(port);

Expand Down Expand Up @@ -94,7 +100,8 @@ class Server
if (!e)
{
new_connection->start();
new_connection = std::make_shared<Connection>(io_context, request_handler, keepalive_timeout);
new_connection =
std::make_shared<Connection>(io_context, request_handler, keepalive_timeout);
acceptor.async_accept(
new_connection->socket(),
boost::bind(&Server::HandleAccept, this, boost::asio::placeholders::error));
Expand Down
10 changes: 7 additions & 3 deletions src/server/connection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
#include <boost/iostreams/filter/gzip.hpp>
#include <boost/iostreams/filtering_stream.hpp>

#include <vector>
#include <fmt/format.h>
#include <vector>

namespace osrm::server
{

Connection::Connection(boost::asio::io_context &io_context, RequestHandler &handler, short keepalive_timeout)
Connection::Connection(boost::asio::io_context &io_context,
RequestHandler &handler,
short keepalive_timeout)
: strand(boost::asio::make_strand(io_context)), TCP_socket(strand), timer(strand),
request_handler(handler), keepalive_timeout(keepalive_timeout)
{
Expand Down Expand Up @@ -89,7 +91,9 @@ void Connection::handle_read(const boost::system::error_code &error, std::size_t
{
keep_alive = true;
current_reply.headers.emplace_back("Connection", "keep-alive");
current_reply.headers.emplace_back("Keep-Alive", "timeout="+ fmt::to_string(keepalive_timeout) + ", max=" + fmt::to_string(processed_requests));
current_reply.headers.emplace_back("Keep-Alive",
"timeout=" + fmt::to_string(keepalive_timeout) +
", max=" + fmt::to_string(processed_requests));
}

// compress the result w/ gzip/deflate if requested
Expand Down
14 changes: 11 additions & 3 deletions src/tools/routed.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,15 @@ try

int requested_thread_num = 1;
short keepalive_timeout = 5;
const unsigned init_result = generateServerProgramOptions(
argc, argv, base_path, ip_address, ip_port, trial_run, config, requested_thread_num, keepalive_timeout);
const unsigned init_result = generateServerProgramOptions(argc,
argv,
base_path,
ip_address,
ip_port,
trial_run,
config,
requested_thread_num,
keepalive_timeout);
if (init_result == INIT_OK_DO_NOT_START_ENGINE)
{
return EXIT_SUCCESS;
Expand Down Expand Up @@ -325,7 +332,8 @@ try
#endif

auto service_handler = std::make_unique<server::ServiceHandler>(config);
auto routing_server = server::Server::CreateServer(ip_address, ip_port, requested_thread_num, keepalive_timeout);
auto routing_server =
server::Server::CreateServer(ip_address, ip_port, requested_thread_num, keepalive_timeout);

routing_server->RegisterServiceHandler(std::move(service_handler));

Expand Down

0 comments on commit c3a8e5e

Please sign in to comment.