yuzu/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib synced 2024-11-21 14:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplified scope_exit

Browse source
This commit is contained in:
yhirose 2023-03-25 21:52:39 -04:00
parent a66a013ed7
commit 76230db97f
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
httplib.h
View file

@ -314,8 +314,8 @@ struct ci {
// This is based on // This is based on
// "http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189". // "http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189".
template <typename EF> struct scope_exit { struct scope_exit {
explicit scope_exit(EF &&f) explicit scope_exit(std::function<void(void)> &&f)
: exit_function(std::move(f)), execute_on_destruction{true} {} : exit_function(std::move(f)), execute_on_destruction{true} {}
scope_exit(scope_exit &&rhs) scope_exit(scope_exit &&rhs)
@ -335,7 +335,7 @@ private:
void operator=(const scope_exit &) = delete; void operator=(const scope_exit &) = delete;
scope_exit &operator=(scope_exit &&) = delete; scope_exit &operator=(scope_exit &&) = delete;
EF exit_function; std::function<void(void)> exit_function;
bool execute_on_destruction; bool execute_on_destruction;
}; };
@ -6410,7 +6410,7 @@ inline bool ClientImpl::send_(Request &req, Response &res, Error &error) {
auto ret = false; auto ret = false;
auto close_connection = !keep_alive_; auto close_connection = !keep_alive_;
auto se = detail::scope_exit<std::function<void(void)>>([&]() { auto se = detail::scope_exit([&]() {
// Briefly lock mutex in order to mark that a request is no longer ongoing // Briefly lock mutex in order to mark that a request is no longer ongoing
std::lock_guard<std::mutex> guard(socket_mutex_); std::lock_guard<std::mutex> guard(socket_mutex_);
socket_requests_in_flight_ -= 1; socket_requests_in_flight_ -= 1;

12
test/test.cc
View file

@ -1220,7 +1220,7 @@ TEST(PathUrlEncodeTest, PathUrlEncode) {
ASSERT_FALSE(svr.is_running()); ASSERT_FALSE(svr.is_running());
} }
TEST(BindServerTest, BindDualStack) { TEST(BindServerTest, DISABLED_BindDualStack) {
Server svr; Server svr;
svr.Get("/1", [&](const Request & /*req*/, Response &res) { svr.Get("/1", [&](const Request & /*req*/, Response &res) {
@ -6026,6 +6026,12 @@ TEST(RedirectTest, RedirectToUrlWithQueryParameters) {
auto thread = std::thread([&]() { svr.listen(HOST, PORT); }); auto thread = std::thread([&]() { svr.listen(HOST, PORT); });
auto se = detail::scope_exit([&](void) {
svr.stop();
thread.join();
ASSERT_FALSE(svr.is_running());
});
std::this_thread::sleep_for(std::chrono::seconds(1)); std::this_thread::sleep_for(std::chrono::seconds(1));
{ {
@ -6037,9 +6043,5 @@ TEST(RedirectTest, RedirectToUrlWithQueryParameters) {
EXPECT_EQ(200, res->status); EXPECT_EQ(200, res->status);
EXPECT_EQ("val&key2=val2", res->body); EXPECT_EQ("val&key2=val2", res->body);
} }
svr.stop();
thread.join();
ASSERT_FALSE(svr.is_running());
} }