From d1917e8fe2e60f39b44f7beb6a9af4879ad18b3d Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Sun, 30 Jun 2019 08:55:41 +0700 Subject: [PATCH] rename error to get_error. remove is_ready and is_running functions. --- README.md | 2 +- headers/curly.hpp/curly.hpp | 5 +---- sources/curly.cpp | 26 ++++---------------------- untests/curly_tests.cpp | 35 +++++++++-------------------------- 4 files changed, 15 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index efbd86f..3e55ebc 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ if ( request.wait() == net::request::statuses::done ) { // throws net::exception because a response is unavailable // auto response = request.get(); - std::cout << "Error message: " << request.error() << std::endl; + std::cout << "Error message: " << request.get_error() << std::endl; } // Error message: Couldn't resolve host name diff --git a/headers/curly.hpp/curly.hpp b/headers/curly.hpp/curly.hpp index ff0d99c..017d29e 100644 --- a/headers/curly.hpp/curly.hpp +++ b/headers/curly.hpp/curly.hpp @@ -137,11 +137,8 @@ namespace curly_hpp statuses wait() const noexcept; statuses status() const noexcept; - bool is_ready() const noexcept; - bool is_running() const noexcept; - response get(); - const std::string& error() const noexcept; + const std::string& get_error() const noexcept; private: internal_state_ptr state_; }; diff --git a/sources/curly.cpp b/sources/curly.cpp index ff6e5c0..a764aa1 100644 --- a/sources/curly.cpp +++ b/sources/curly.cpp @@ -513,16 +513,6 @@ namespace curly_hpp return status_; } - bool is_ready() const noexcept { - std::lock_guard guard(mutex_); - return status_ != statuses::pending; - } - - bool is_running() const noexcept { - std::lock_guard guard(mutex_); - return status_ == statuses::pending; - } - statuses status() const noexcept { std::lock_guard guard(mutex_); return status_; @@ -540,7 +530,7 @@ namespace curly_hpp return std::move(response_); } - const std::string& error() const noexcept { + const std::string& get_error() const noexcept { std::unique_lock lock(mutex_); cvar_.wait(lock, [this](){ return status_ != statuses::pending; @@ -663,20 +653,12 @@ namespace curly_hpp return state_->status(); } - bool request::is_ready() const noexcept { - return state_->is_ready(); - } - - bool request::is_running() const noexcept { - return state_->is_running(); - } - response request::get() { return state_->get(); } - const std::string& request::error() const noexcept { - return state_->error(); + const std::string& request::get_error() const noexcept { + return state_->get_error(); } } @@ -921,7 +903,7 @@ namespace curly_hpp curl_state::with([](CURLM* curlm){ for ( auto iter = active_handles.begin(); iter != active_handles.end(); ) { - if ( (*iter)->is_ready() ) { + if ( (*iter)->status() != request::statuses::pending ) { (*iter)->dequeue(curlm); iter = active_handles.erase(iter); } else { diff --git a/untests/curly_tests.cpp b/untests/curly_tests.cpp index 6946cb3..5d7d350 100644 --- a/untests/curly_tests.cpp +++ b/untests/curly_tests.cpp @@ -74,7 +74,7 @@ TEST_CASE("curly") { auto req = net::request_builder("|||").send(); REQUIRE(req.wait() == net::request::statuses::failed); REQUIRE(req.status() == net::request::statuses::failed); - REQUIRE_FALSE(req.error().empty()); + REQUIRE_FALSE(req.get_error().empty()); } SECTION("cancel") { @@ -82,31 +82,14 @@ TEST_CASE("curly") { auto req = net::request_builder("https://httpbin.org/delay/1").send(); REQUIRE(req.cancel()); REQUIRE(req.status() == net::request::statuses::canceled); - REQUIRE(req.error().empty()); + REQUIRE(req.get_error().empty()); } { auto req = net::request_builder("https://httpbin.org/status/200").send(); REQUIRE(req.wait() == net::request::statuses::done); REQUIRE_FALSE(req.cancel()); REQUIRE(req.status() == net::request::statuses::done); - REQUIRE(req.error().empty()); - } - } - - SECTION("is_ready/is_running") { - { - auto req = net::request_builder("https://httpbin.org/delay/1").send(); - REQUIRE(req.is_running()); - REQUIRE_FALSE(req.is_ready()); - REQUIRE(req.cancel()); - REQUIRE_FALSE(req.is_running()); - REQUIRE(req.is_ready()); - } - { - auto req = net::request_builder("https://httpbin.org/status/200").send(); - REQUIRE(req.wait() == net::request::statuses::done); - REQUIRE(req.is_ready()); - REQUIRE_FALSE(req.is_running()); + REQUIRE(req.get_error().empty()); } } @@ -286,7 +269,7 @@ TEST_CASE("curly") { .send(); const auto resp = req.get(); REQUIRE(resp.content.as_string_view() == "HTTPBIN is awesome"); - REQUIRE(req.error().empty()); + REQUIRE(req.get_error().empty()); } { auto req0 = net::request_builder() @@ -294,14 +277,14 @@ TEST_CASE("curly") { .request_timeout(net::time_sec_t(0)) .send(); REQUIRE(req0.wait() == net::request::statuses::timeout); - REQUIRE_FALSE(req0.error().empty()); + REQUIRE_FALSE(req0.get_error().empty()); auto req1 = net::request_builder() .url("https://httpbin.org/delay/10") .response_timeout(net::time_sec_t(0)) .send(); REQUIRE(req1.wait() == net::request::statuses::timeout); - REQUIRE_FALSE(req1.error().empty()); + REQUIRE_FALSE(req1.get_error().empty()); } { auto req0 = net::request_builder() @@ -309,14 +292,14 @@ TEST_CASE("curly") { .request_timeout(net::time_sec_t(1)) .send(); REQUIRE(req0.wait() == net::request::statuses::timeout); - REQUIRE_FALSE(req0.error().empty()); + REQUIRE_FALSE(req0.get_error().empty()); auto req1 = net::request_builder() .url("https://httpbin.org/delay/10") .response_timeout(net::time_sec_t(1)) .send(); REQUIRE(req1.wait() == net::request::statuses::timeout); - REQUIRE_FALSE(req1.error().empty()); + REQUIRE_FALSE(req1.get_error().empty()); } } @@ -593,7 +576,7 @@ TEST_CASE("curly_examples") { // throws net::exception because a response is unavailable // auto response = request.get(); - std::cout << "Error message: " << request.error() << std::endl; + std::cout << "Error message: " << request.get_error() << std::endl; } // Error message: Couldn't resolve host name