Replaced Server/Client::shared_from_this with asio callback checks if the Server/Client has been destroyed. Also added SharedMutex to utility.hpp.
This commit is contained in:
eidheim
parent
53c9ff64c0
commit
9b5063f422
9 changed files with 500 additions and 163 deletions
|
|
@ -5,35 +5,69 @@
|
|||
|
||||
using namespace std;
|
||||
|
||||
#ifndef USE_STANDALONE_ASIO
|
||||
namespace asio = boost::asio;
|
||||
#endif
|
||||
|
||||
typedef SimpleWeb::Server<SimpleWeb::HTTP> HttpServer;
|
||||
typedef SimpleWeb::Client<SimpleWeb::HTTP> HttpClient;
|
||||
|
||||
int main() {
|
||||
auto server = HttpServer::create();
|
||||
server->config.port = 8080;
|
||||
{
|
||||
SimpleWeb::SharedMutex mutex;
|
||||
int count = 0;
|
||||
{
|
||||
thread t([&] {
|
||||
auto lock = mutex.shared_lock();
|
||||
{
|
||||
auto lock = mutex.shared_lock();
|
||||
++count;
|
||||
}
|
||||
});
|
||||
this_thread::sleep_for(chrono::milliseconds(100));
|
||||
t.detach();
|
||||
assert(count == 1);
|
||||
}
|
||||
thread t;
|
||||
{
|
||||
auto lock = mutex.unique_lock();
|
||||
t = thread([&] {
|
||||
auto lock = mutex.unique_lock();
|
||||
++count;
|
||||
});
|
||||
this_thread::sleep_for(chrono::milliseconds(100));
|
||||
assert(count == 1);
|
||||
}
|
||||
t.join();
|
||||
assert(count == 2);
|
||||
}
|
||||
|
||||
server->resource["^/string$"]["POST"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
|
||||
HttpServer server;
|
||||
server.config.port = 8080;
|
||||
|
||||
server.resource["^/string$"]["POST"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
auto content = request->content.string();
|
||||
|
||||
*response << "HTTP/1.1 200 OK\r\nContent-Length: " << content.length() << "\r\n\r\n"
|
||||
<< content;
|
||||
};
|
||||
|
||||
server->resource["^/string2$"]["POST"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
server.resource["^/string2$"]["POST"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
response->write(request->content.string());
|
||||
};
|
||||
|
||||
server->resource["^/string3$"]["POST"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
std::stringstream stream;
|
||||
server.resource["^/string3$"]["POST"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
stringstream stream;
|
||||
stream << request->content.rdbuf();
|
||||
response->write(stream);
|
||||
};
|
||||
|
||||
server->resource["^/string4$"]["POST"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> /*request*/) {
|
||||
server.resource["^/string4$"]["POST"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> /*request*/) {
|
||||
response->write(SimpleWeb::StatusCode::client_error_forbidden, {{"Test1", "test2"}, {"tesT3", "test4"}});
|
||||
};
|
||||
|
||||
server->resource["^/info$"]["GET"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
server.resource["^/info$"]["GET"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
stringstream content_stream;
|
||||
content_stream << request->method << " " << request->path << " " << request->http_version << " ";
|
||||
content_stream << request->header.find("test parameter")->second;
|
||||
|
|
@ -44,20 +78,28 @@ int main() {
|
|||
<< content_stream.rdbuf();
|
||||
};
|
||||
|
||||
server->resource["^/match/([0-9]+)$"]["GET"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
server.resource["^/work$"]["GET"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> /*request*/) {
|
||||
thread work_thread([response] {
|
||||
this_thread::sleep_for(chrono::seconds(5));
|
||||
response->write("Work done");
|
||||
});
|
||||
work_thread.detach();
|
||||
};
|
||||
|
||||
server.resource["^/match/([0-9]+)$"]["GET"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
string number = request->path_match[1];
|
||||
*response << "HTTP/1.1 200 OK\r\nContent-Length: " << number.length() << "\r\n\r\n"
|
||||
<< number;
|
||||
};
|
||||
|
||||
server->resource["^/header$"]["GET"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
server.resource["^/header$"]["GET"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
auto content = request->header.find("test1")->second + request->header.find("test2")->second;
|
||||
|
||||
*response << "HTTP/1.1 200 OK\r\nContent-Length: " << content.length() << "\r\n\r\n"
|
||||
<< content;
|
||||
};
|
||||
|
||||
server->resource["^/query_string$"]["GET"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
server.resource["^/query_string$"]["GET"] = [](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> request) {
|
||||
assert(request->path == "/query_string");
|
||||
assert(request->query_string == "testing");
|
||||
auto queries = request->parse_query_string();
|
||||
|
|
@ -68,16 +110,16 @@ int main() {
|
|||
|
||||
thread server_thread([&server]() {
|
||||
//Start server
|
||||
server->start();
|
||||
server.start();
|
||||
});
|
||||
|
||||
this_thread::sleep_for(chrono::seconds(1));
|
||||
{
|
||||
auto client = HttpClient::create("localhost:8080");
|
||||
HttpClient client("localhost:8080");
|
||||
|
||||
{
|
||||
stringstream output;
|
||||
auto r = client->request("POST", "/string", "A string");
|
||||
auto r = client.request("POST", "/string", "A string");
|
||||
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::success_ok);
|
||||
output << r->content.rdbuf();
|
||||
assert(output.str() == "A string");
|
||||
|
|
@ -85,14 +127,14 @@ int main() {
|
|||
|
||||
{
|
||||
stringstream output;
|
||||
auto r = client->request("POST", "/string", "A string");
|
||||
auto r = client.request("POST", "/string", "A string");
|
||||
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::success_ok);
|
||||
assert(r->content.string() == "A string");
|
||||
}
|
||||
|
||||
{
|
||||
stringstream output;
|
||||
auto r = client->request("POST", "/string2", "A string");
|
||||
auto r = client.request("POST", "/string2", "A string");
|
||||
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::success_ok);
|
||||
output << r->content.rdbuf();
|
||||
assert(output.str() == "A string");
|
||||
|
|
@ -100,7 +142,7 @@ int main() {
|
|||
|
||||
{
|
||||
stringstream output;
|
||||
auto r = client->request("POST", "/string3", "A string");
|
||||
auto r = client.request("POST", "/string3", "A string");
|
||||
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::success_ok);
|
||||
output << r->content.rdbuf();
|
||||
assert(output.str() == "A string");
|
||||
|
|
@ -108,7 +150,7 @@ int main() {
|
|||
|
||||
{
|
||||
stringstream output;
|
||||
auto r = client->request("POST", "/string4", "A string");
|
||||
auto r = client.request("POST", "/string4", "A string");
|
||||
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::client_error_forbidden);
|
||||
assert(r->header.size() == 3);
|
||||
assert(r->header.find("test1")->second == "test2");
|
||||
|
|
@ -121,78 +163,78 @@ int main() {
|
|||
{
|
||||
stringstream output;
|
||||
stringstream content("A string");
|
||||
auto r = client->request("POST", "/string", content);
|
||||
auto r = client.request("POST", "/string", content);
|
||||
output << r->content.rdbuf();
|
||||
assert(output.str() == "A string");
|
||||
}
|
||||
|
||||
{
|
||||
stringstream output;
|
||||
auto r = client->request("GET", "/info", "", {{"Test Parameter", "test value"}});
|
||||
auto r = client.request("GET", "/info", "", {{"Test Parameter", "test value"}});
|
||||
output << r->content.rdbuf();
|
||||
assert(output.str() == "GET /info 1.1 test value");
|
||||
}
|
||||
|
||||
{
|
||||
stringstream output;
|
||||
auto r = client->request("GET", "/match/123");
|
||||
auto r = client.request("GET", "/match/123");
|
||||
output << r->content.rdbuf();
|
||||
assert(output.str() == "123");
|
||||
}
|
||||
}
|
||||
{
|
||||
auto client = HttpClient::create("localhost:8080");
|
||||
HttpClient client("localhost:8080");
|
||||
|
||||
HttpClient::Connection *connection;
|
||||
{
|
||||
// test performing the stream version of the request methods first
|
||||
stringstream output;
|
||||
stringstream content("A string");
|
||||
auto r = client->request("POST", "/string", content);
|
||||
auto r = client.request("POST", "/string", content);
|
||||
output << r->content.rdbuf();
|
||||
assert(output.str() == "A string");
|
||||
assert(client->connections.size() == 1);
|
||||
connection = client->connections.front().get();
|
||||
assert(client.connections.size() == 1);
|
||||
connection = client.connections.front().get();
|
||||
}
|
||||
|
||||
{
|
||||
stringstream output;
|
||||
auto r = client->request("POST", "/string", "A string");
|
||||
auto r = client.request("POST", "/string", "A string");
|
||||
output << r->content.rdbuf();
|
||||
assert(output.str() == "A string");
|
||||
assert(client->connections.size() == 1);
|
||||
assert(connection == client->connections.front().get());
|
||||
assert(client.connections.size() == 1);
|
||||
assert(connection == client.connections.front().get());
|
||||
}
|
||||
|
||||
{
|
||||
stringstream output;
|
||||
auto r = client->request("GET", "/header", "", {{"test1", "test"}, {"test2", "ing"}});
|
||||
auto r = client.request("GET", "/header", "", {{"test1", "test"}, {"test2", "ing"}});
|
||||
output << r->content.rdbuf();
|
||||
assert(output.str() == "testing");
|
||||
assert(client->connections.size() == 1);
|
||||
assert(connection == client->connections.front().get());
|
||||
assert(client.connections.size() == 1);
|
||||
assert(connection == client.connections.front().get());
|
||||
}
|
||||
|
||||
{
|
||||
stringstream output;
|
||||
auto r = client->request("GET", "/query_string?testing");
|
||||
auto r = client.request("GET", "/query_string?testing");
|
||||
assert(r->content.string() == "testing");
|
||||
assert(client->connections.size() == 1);
|
||||
assert(connection == client->connections.front().get());
|
||||
assert(client.connections.size() == 1);
|
||||
assert(connection == client.connections.front().get());
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
auto client = HttpClient::create("localhost:8080");
|
||||
HttpClient client("localhost:8080");
|
||||
bool call = false;
|
||||
client->request("GET", "/match/123", [&call](shared_ptr<HttpClient::Response> response, const SimpleWeb::error_code &ec) {
|
||||
client.request("GET", "/match/123", [&call](shared_ptr<HttpClient::Response> response, const SimpleWeb::error_code &ec) {
|
||||
assert(!ec);
|
||||
stringstream output;
|
||||
output << response->content.rdbuf();
|
||||
assert(output.str() == "123");
|
||||
call = true;
|
||||
});
|
||||
client->io_service->run();
|
||||
client.io_service->run();
|
||||
assert(call);
|
||||
|
||||
{
|
||||
|
|
@ -201,7 +243,7 @@ int main() {
|
|||
for(size_t c = 0; c < 100; ++c) {
|
||||
calls[c] = 0;
|
||||
threads.emplace_back([c, &client, &calls] {
|
||||
client->request("GET", "/match/123", [c, &calls](shared_ptr<HttpClient::Response> response, const SimpleWeb::error_code &ec) {
|
||||
client.request("GET", "/match/123", [c, &calls](shared_ptr<HttpClient::Response> response, const SimpleWeb::error_code &ec) {
|
||||
assert(!ec);
|
||||
stringstream output;
|
||||
output << response->content.rdbuf();
|
||||
|
|
@ -212,53 +254,136 @@ int main() {
|
|||
}
|
||||
for(auto &thread : threads)
|
||||
thread.join();
|
||||
assert(client->connections.size() == 100);
|
||||
client->io_service->reset();
|
||||
client->io_service->run();
|
||||
assert(client->connections.size() == 1);
|
||||
assert(client.connections.size() == 100);
|
||||
client.io_service->reset();
|
||||
client.io_service->run();
|
||||
assert(client.connections.size() == 1);
|
||||
for(auto call : calls)
|
||||
assert(call);
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
auto client = HttpClient::create("localhost:8080");
|
||||
assert(client->connections.size() == 0);
|
||||
HttpClient client("localhost:8080");
|
||||
assert(client.connections.size() == 0);
|
||||
for(size_t c = 0; c < 5000; ++c) {
|
||||
auto r1 = client->request("POST", "/string", "A string");
|
||||
auto r1 = client.request("POST", "/string", "A string");
|
||||
assert(SimpleWeb::status_code(r1->status_code) == SimpleWeb::StatusCode::success_ok);
|
||||
assert(r1->content.string() == "A string");
|
||||
assert(client->connections.size() == 1);
|
||||
assert(client.connections.size() == 1);
|
||||
|
||||
stringstream content("A string");
|
||||
auto r2 = client->request("POST", "/string", content);
|
||||
auto r2 = client.request("POST", "/string", content);
|
||||
assert(SimpleWeb::status_code(r2->status_code) == SimpleWeb::StatusCode::success_ok);
|
||||
assert(r2->content.string() == "A string");
|
||||
assert(client->connections.size() == 1);
|
||||
assert(client.connections.size() == 1);
|
||||
}
|
||||
}
|
||||
|
||||
for(size_t c = 0; c < 500; ++c) {
|
||||
for(size_t c = 0; c < 100; ++c) {
|
||||
{
|
||||
auto client = HttpClient::create("localhost:8080");
|
||||
auto r = client->request("POST", "/string", "A string");
|
||||
HttpClient client("localhost:8080");
|
||||
auto r = client.request("POST", "/string", "A string");
|
||||
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::success_ok);
|
||||
assert(r->content.string() == "A string");
|
||||
assert(client->connections.size() == 1);
|
||||
assert(client.connections.size() == 1);
|
||||
}
|
||||
|
||||
{
|
||||
auto client = HttpClient::create("localhost:8080");
|
||||
HttpClient client("localhost:8080");
|
||||
stringstream content("A string");
|
||||
auto r = client->request("POST", "/string", content);
|
||||
auto r = client.request("POST", "/string", content);
|
||||
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::success_ok);
|
||||
assert(r->content.string() == "A string");
|
||||
assert(client->connections.size() == 1);
|
||||
assert(client.connections.size() == 1);
|
||||
}
|
||||
}
|
||||
|
||||
server->stop();
|
||||
// Test Client client's stop()
|
||||
for(size_t c = 0; c < 40; ++c) {
|
||||
auto io_service = make_shared<asio::io_service>();
|
||||
bool call = false;
|
||||
HttpClient client("localhost:8080");
|
||||
client.io_service = io_service;
|
||||
client.request("GET", "/work", [&call](shared_ptr<HttpClient::Response> /*response*/, const SimpleWeb::error_code &ec) {
|
||||
call = true;
|
||||
assert(ec);
|
||||
});
|
||||
thread thread([io_service] {
|
||||
io_service->run();
|
||||
});
|
||||
this_thread::sleep_for(chrono::milliseconds(100));
|
||||
client.close();
|
||||
this_thread::sleep_for(chrono::milliseconds(100));
|
||||
thread.join();
|
||||
assert(call);
|
||||
}
|
||||
|
||||
// Test Client destructor that should cancel the client's request
|
||||
for(size_t c = 0; c < 40; ++c) {
|
||||
auto io_service = make_shared<asio::io_service>();
|
||||
{
|
||||
HttpClient client("localhost:8080");
|
||||
client.io_service = io_service;
|
||||
client.request("GET", "/work", [](shared_ptr<HttpClient::Response> /*response*/, const SimpleWeb::error_code & /*ec*/) {
|
||||
assert(false);
|
||||
});
|
||||
thread thread([io_service] {
|
||||
io_service->run();
|
||||
});
|
||||
thread.detach();
|
||||
this_thread::sleep_for(chrono::milliseconds(100));
|
||||
}
|
||||
this_thread::sleep_for(chrono::milliseconds(100));
|
||||
}
|
||||
|
||||
server.stop();
|
||||
server_thread.join();
|
||||
|
||||
// Test server destructor
|
||||
{
|
||||
auto io_service = make_shared<asio::io_service>();
|
||||
bool call = false;
|
||||
bool client_catch = false;
|
||||
{
|
||||
HttpServer server;
|
||||
server.config.port = 8081;
|
||||
server.io_service = io_service;
|
||||
server.resource["^/test$"]["GET"] = [&call](shared_ptr<HttpServer::Response> response, shared_ptr<HttpServer::Request> /*request*/) {
|
||||
call = true;
|
||||
thread sleep_thread([response] {
|
||||
this_thread::sleep_for(chrono::seconds(5));
|
||||
response->write(SimpleWeb::StatusCode::success_ok, "test");
|
||||
response->send([](const SimpleWeb::error_code & /*ec*/) {
|
||||
assert(false);
|
||||
});
|
||||
});
|
||||
sleep_thread.detach();
|
||||
};
|
||||
server.start();
|
||||
thread server_thread([io_service] {
|
||||
io_service->run();
|
||||
});
|
||||
server_thread.detach();
|
||||
this_thread::sleep_for(chrono::seconds(1));
|
||||
thread client_thread([&client_catch] {
|
||||
HttpClient client("localhost:8081");
|
||||
try {
|
||||
auto r = client.request("GET", "/test");
|
||||
assert(false);
|
||||
}
|
||||
catch(...) {
|
||||
client_catch = true;
|
||||
}
|
||||
});
|
||||
client_thread.detach();
|
||||
this_thread::sleep_for(chrono::seconds(1));
|
||||
}
|
||||
this_thread::sleep_for(chrono::seconds(5));
|
||||
assert(call);
|
||||
assert(client_catch);
|
||||
io_service->stop();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ public:
|
|||
void accept() override {}
|
||||
|
||||
void parse_request_test() {
|
||||
auto session = std::make_shared<Session>(this->shared_from_this(), std::make_shared<HTTP>(*io_service));
|
||||
auto session = std::make_shared<Session>(this, std::make_shared<HTTP>(*io_service));
|
||||
|
||||
std::ostream stream(&session->request->content.streambuf);
|
||||
stream << "GET /test/ HTTP/1.1\r\n";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue