jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Client: now lets socket destructor close itself

Browse source
This commit is contained in:
eidheim 2017-07-15 10:57:12 +02:00
commit 35ea8a950e
2 changed files with 36 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

74
client_http.hpp
View file

@ -126,19 +126,11 @@ namespace SimpleWeb {
long timeout; long timeout;
std::unique_ptr<socket_type> socket; // Socket must be unique_ptr since asio::ssl::stream<asio::ip::tcp::socket> is not movable std::unique_ptr<socket_type> socket; // Socket must be unique_ptr since asio::ssl::stream<asio::ip::tcp::socket> is not movable
std::mutex socket_close_mutex;
bool in_use = false; bool in_use = false;
bool attempt_reconnect = true; bool attempt_reconnect = true;
std::unique_ptr<asio::deadline_timer> timer; std::unique_ptr<asio::deadline_timer> timer;
void close() {
error_code ec;
std::unique_lock<std::mutex> lock(socket_close_mutex); // The following operations seems to be needed to run sequentially
socket->lowest_layer().shutdown(asio::ip::tcp::socket::shutdown_both, ec);
socket->lowest_layer().close(ec);
}
void set_timeout(long seconds = 0) { void set_timeout(long seconds = 0) {
if(seconds == 0) if(seconds == 0)
seconds = timeout; seconds = timeout;
@ -150,8 +142,10 @@ namespace SimpleWeb {
timer->expires_from_now(boost::posix_time::seconds(seconds)); timer->expires_from_now(boost::posix_time::seconds(seconds));
auto self = this->shared_from_this(); auto self = this->shared_from_this();
timer->async_wait([self](const error_code &ec) { timer->async_wait([self](const error_code &ec) {
if(!ec) if(!ec) {
self->close(); error_code ec;
self->socket->lowest_layer().cancel(ec);
}
}); });
} }
@ -176,7 +170,7 @@ namespace SimpleWeb {
std::shared_ptr<Connection> connection; std::shared_ptr<Connection> connection;
std::unique_ptr<asio::streambuf> request_buffer; std::unique_ptr<asio::streambuf> request_buffer;
std::shared_ptr<Response> response; std::shared_ptr<Response> response;
std::function<void(const error_code &)> callback; std::function<void(const std::shared_ptr<Connection> &, const error_code &)> callback;
}; };
public: public:
@ -252,10 +246,9 @@ namespace SimpleWeb {
void request(const std::string &method, const std::string &path, string_view content, const CaseInsensitiveMultimap &header, void request(const std::string &method, const std::string &path, string_view content, const CaseInsensitiveMultimap &header,
std::function<void(std::shared_ptr<Response>, const error_code &)> &&request_callback_) { std::function<void(std::shared_ptr<Response>, const error_code &)> &&request_callback_) {
auto session = std::make_shared<Session>(get_connection(), create_request_header(method, path, header)); auto session = std::make_shared<Session>(get_connection(), create_request_header(method, path, header));
auto connection = session->connection;
auto response = session->response; auto response = session->response;
auto request_callback = std::make_shared<std::function<void(std::shared_ptr<Response>, const error_code &)>>(std::move(request_callback_)); auto request_callback = std::make_shared<std::function<void(std::shared_ptr<Response>, const error_code &)>>(std::move(request_callback_));
session->callback = [this, connection, response, request_callback](const error_code &ec) { session->callback = [this, response, request_callback](const std::shared_ptr<Connection> &connection, const error_code &ec) {
{ {
std::unique_lock<std::mutex> lock(this->connections_mutex); std::unique_lock<std::mutex> lock(this->connections_mutex);
connection->in_use = false; connection->in_use = false;
@ -263,7 +256,9 @@ namespace SimpleWeb {
// Remove unused connections, but keep one open for HTTP persistent connection: // Remove unused connections, but keep one open for HTTP persistent connection:
size_t unused_connections = 0; size_t unused_connections = 0;
for(auto it = this->connections.begin(); it != this->connections.end();) { for(auto it = this->connections.begin(); it != this->connections.end();) {
if((*it)->in_use) if(ec && connection == *it)
it = this->connections.erase(it);
else if((*it)->in_use)
++it; ++it;
else { else {
++unused_connections; ++unused_connections;
@ -310,10 +305,9 @@ namespace SimpleWeb {
void request(const std::string &method, const std::string &path, std::istream &content, const CaseInsensitiveMultimap &header, void request(const std::string &method, const std::string &path, std::istream &content, const CaseInsensitiveMultimap &header,
std::function<void(std::shared_ptr<Response>, const error_code &)> &&request_callback_) { std::function<void(std::shared_ptr<Response>, const error_code &)> &&request_callback_) {
auto session = std::make_shared<Session>(get_connection(), create_request_header(method, path, header)); auto session = std::make_shared<Session>(get_connection(), create_request_header(method, path, header));
auto connection = session->connection;
auto response = session->response; auto response = session->response;
auto request_callback = std::make_shared<std::function<void(std::shared_ptr<Response>, const error_code &)>>(std::move(request_callback_)); auto request_callback = std::make_shared<std::function<void(std::shared_ptr<Response>, const error_code &)>>(std::move(request_callback_));
session->callback = [this, connection, response, request_callback](const error_code &ec) { session->callback = [this, response, request_callback](const std::shared_ptr<Connection> &connection, const error_code &ec) {
{ {
std::unique_lock<std::mutex> lock(this->connections_mutex); std::unique_lock<std::mutex> lock(this->connections_mutex);
connection->in_use = false; connection->in_use = false;
@ -321,7 +315,9 @@ namespace SimpleWeb {
// Remove unused connections, but keep one open for HTTP persistent connection: // Remove unused connections, but keep one open for HTTP persistent connection:
size_t unused_connections = 0; size_t unused_connections = 0;
for(auto it = this->connections.begin(); it != this->connections.end();) { for(auto it = this->connections.begin(); it != this->connections.end();) {
if((*it)->in_use) if(ec && connection == *it)
it = this->connections.erase(it);
else if((*it)->in_use)
++it; ++it;
else { else {
++unused_connections; ++unused_connections;
@ -360,8 +356,8 @@ namespace SimpleWeb {
void stop() { void stop() {
std::unique_lock<std::mutex> lock(connections_mutex); std::unique_lock<std::mutex> lock(connections_mutex);
for(auto it = connections.begin(); it != connections.end();) { for(auto it = connections.begin(); it != connections.end();) {
(*it)->attempt_reconnect = false; error_code ec;
(*it)->close(); (*it)->socket->lowest_layer().cancel(ec);
it = connections.erase(it); it = connections.erase(it);
} }
} }
@ -478,7 +474,7 @@ namespace SimpleWeb {
if(!ec) if(!ec)
this->read(session); this->read(session);
else else
this->close(session, ec); session->callback(session->connection, ec);
}); });
} }
@ -507,13 +503,13 @@ namespace SimpleWeb {
if(cancel_pair.first) if(cancel_pair.first)
return; return;
if(!ec) if(!ec)
session->callback(ec); session->callback(session->connection, ec);
else else
this->close(session, ec); session->callback(session->connection, ec);
}); });
} }
else else
session->callback(ec); session->callback(session->connection, ec);
} }
else if((header_it = session->response->header.find("Transfer-Encoding")) != session->response->header.end() && header_it->second == "chunked") { else if((header_it = session->response->header.find("Transfer-Encoding")) != session->response->header.end() && header_it->second == "chunked") {
auto tmp_streambuf = std::make_shared<asio::streambuf>(); auto tmp_streambuf = std::make_shared<asio::streambuf>();
@ -527,21 +523,20 @@ namespace SimpleWeb {
if(cancel_pair.first) if(cancel_pair.first)
return; return;
if(!ec) if(!ec)
session->callback(ec); session->callback(session->connection, ec);
else else
close(session, ec == asio::error::eof ? error_code() : ec); session->callback(session->connection, ec == asio::error::eof ? error_code() : ec);
}); });
} }
else else
session->callback(ec); session->callback(session->connection, ec);
} }
else { else {
if(session->connection->attempt_reconnect) { if(session->connection->attempt_reconnect && ec != asio::error::operation_aborted) {
std::unique_lock<std::mutex> lock(connections_mutex); std::unique_lock<std::mutex> lock(connections_mutex);
auto it = connections.find(session->connection); auto it = connections.find(session->connection);
if(it != connections.end()) { if(it != connections.end()) {
connections.erase(it); connections.erase(it);
session->connection->close();
session->connection = create_connection(); session->connection = create_connection();
session->connection->attempt_reconnect = false; session->connection->attempt_reconnect = false;
session->connection->in_use = true; session->connection->in_use = true;
@ -549,10 +544,10 @@ namespace SimpleWeb {
this->connect(session); this->connect(session);
} }
else else
this->close(session, ec); session->callback(session->connection, ec);
} }
else else
this->close(session, ec); session->callback(session->connection, ec);
} }
}); });
} }
@ -591,7 +586,7 @@ namespace SimpleWeb {
std::ostream response_stream(&session->response->content_buffer); std::ostream response_stream(&session->response->content_buffer);
response_stream << tmp_stream.rdbuf(); response_stream << tmp_stream.rdbuf();
error_code ec; error_code ec;
session->callback(ec); session->callback(session->connection, ec);
} }
}; };
@ -605,25 +600,16 @@ namespace SimpleWeb {
if(!ec) if(!ec)
post_process(); post_process();
else else
this->close(session, ec); session->callback(session->connection, ec);
}); });
} }
else else
post_process(); post_process();
} }
else else
this->close(session, ec); session->callback(session->connection, ec);
}); });
} }
void close(const std::shared_ptr<Session> &session, const error_code &ec) {
session->connection->close();
{
std::lock_guard<std::mutex> lock(connections_mutex);
connections.erase(session->connection);
}
session->callback(ec);
}
}; };
template <class socket_type> template <class socket_type>
@ -664,11 +650,11 @@ namespace SimpleWeb {
this->write(session); this->write(session);
} }
else else
this->close(session, ec); session->callback(session->connection, ec);
}); });
} }
else else
this->close(session, ec); session->callback(session->connection, ec);
}); });
} }
else else

12
client_https.hpp
View file

@ -86,27 +86,27 @@ namespace SimpleWeb {
if(!ec) { if(!ec) {
response->parse_header(); response->parse_header();
if(response->status_code.empty() || response->status_code.compare(0, 3, "200") != 0) if(response->status_code.empty() || response->status_code.compare(0, 3, "200") != 0)
this->close(session, make_error_code::make_error_code(errc::permission_denied)); session->callback(session->connection, make_error_code::make_error_code(errc::permission_denied));
else else
this->handshake(session); this->handshake(session);
} }
else else
this->close(session, ec); session->callback(session->connection, ec);
}); });
} }
else else
this->close(session, ec); session->callback(session->connection, ec);
}); });
} }
else else
this->handshake(session); this->handshake(session);
} }
else else
this->close(session, ec); session->callback(session->connection, ec);
}); });
} }
else else
this->close(session, ec); session->callback(session->connection, ec);
}); });
} }
else else
@ -123,7 +123,7 @@ namespace SimpleWeb {
if(!ec) if(!ec)
this->write(session); this->write(session);
else else
this->close(session, ec); session->callback(session->connection, ec);
}); });
} }
}; };