Merge pull request #7

Made ResponserHandler in requester get response data by copy
kamchatka-volcano · Aug 27, 2022 · d9509d6 · d9509d6
2 parents 66a81e0 + e8e4962
commit d9509d6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.18)
 
-project(fcgi_responder VERSION 1.3.1 DESCRIPTION "FastCGI protocol responder role implementation library")
+project(fcgi_responder VERSION 1.4.0 DESCRIPTION "FastCGI protocol responder role implementation library")
 
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     set(FCGI_RESPONDER_SUBPROJECT OFF)

diff --git a/include/fcgi_responder/requester.h b/include/fcgi_responder/requester.h
@@ -41,7 +41,7 @@ class Requester{
     ///
     std::optional<RequestHandle> sendRequest(
             std::map<std::string, std::string> params, std::string data,
-            std::function<void(const std::optional<ResponseData>&)> responseHandler,
+            const std::function<void(std::optional<ResponseData>)>& responseHandler,
             bool keepConnection = false);
     ///
     /// \brief setErrorInfoHandler

diff --git a/src/requester.cpp b/src/requester.cpp
@@ -40,10 +40,10 @@ const RequesterImpl& Requester::impl() const
 std::optional<RequestHandle> Requester::sendRequest(
         std::map<std::string, std::string> params,
         std::string data,
-        std::function<void(const std::optional<ResponseData>&)> responseHandler,
+        const std::function<void(std::optional<ResponseData>)>& responseHandler,
         bool keepConnection)
 {
-    return impl().sendRequest(std::move(params), std::move(data), std::move(responseHandler), keepConnection);
+    return impl().sendRequest(std::move(params), std::move(data), responseHandler, keepConnection);
 }
 
 int Requester::availableRequestsNumber() const

diff --git a/src/requesterimpl.cpp b/src/requesterimpl.cpp
@@ -40,7 +40,7 @@ RequesterImpl::RequesterImpl(
 std::optional<RequestHandle> RequesterImpl::sendRequest(
         std::map<std::string, std::string> params,
         std::string data,
-        std::function<void(const std::optional<ResponseData>&)> responseHandler,
+        const std::function<void(std::optional<ResponseData>)>& responseHandler,
         bool keepConnection)
 {
     if (connectionState_ == ConnectionState::NotConnected) {
@@ -76,7 +76,7 @@ int RequesterImpl::availableRequestsNumber() const
 void RequesterImpl::initConnection(
         std::map<std::string, std::string> params,
         std::string data,
-        std::function<void(const std::optional<ResponseData>&)> responseHandler,
+        std::function<void(std::optional<ResponseData>)> responseHandler,
         bool keepConnection)
 {
     connectionState_ = ConnectionState::ConnectionInProgress;
@@ -104,7 +104,7 @@ void RequesterImpl::initConnection(
 std::optional<RequestHandle> RequesterImpl::doSendRequest(
         const std::map<std::string, std::string>& params,
         const std::string& data,
-        const std::function<void(const std::optional<ResponseData>&)>& responseHandler,
+        std::function<void(std::optional<ResponseData>)> responseHandler,
         bool keepConnection)
 {
     if (requestIdPool_.empty()){
@@ -116,7 +116,7 @@ std::optional<RequestHandle> RequesterImpl::doSendRequest(
     auto requestId = *requestIdPool_.begin();
     requestIdPool_.erase(requestId);
     responseMap_.emplace(requestId,
-                         ResponseContext{responseHandler, ResponseData{}, keepConnection,
+                         ResponseContext{std::move(responseHandler), ResponseData{}, keepConnection,
                                          std::make_shared<std::function<void()>>([=] {
                                              doEndRequest(requestId, ResponseStatus::Cancelled);
                                          })
@@ -140,9 +140,9 @@ std::optional<RequestHandle> RequesterImpl::doSendRequest(
 
 void RequesterImpl::doEndRequest(uint16_t requestId, ResponseStatus responseStatus)
 {
-    const auto& responseContext = responseMap_.at(requestId);
+    auto& responseContext = responseMap_.at(requestId);
     if (responseStatus == ResponseStatus::Successful)
-        responseContext.responseHandler(responseContext.responseData);
+        responseContext.responseHandler(std::move(responseContext.responseData));
     else
         responseContext.responseHandler(std::nullopt);
 

diff --git a/src/requesterimpl.h b/src/requesterimpl.h
@@ -38,7 +38,7 @@ class RequesterImpl{
     void receiveData(const char* data, std::size_t size);
     std::optional<RequestHandle> sendRequest(
             std::map<std::string, std::string> params, std::string data,
-            std::function<void(const std::optional<ResponseData>&)> responseHandler,
+            const std::function<void(std::optional<ResponseData>)>& responseHandler,
             bool keepConnection = false);
     void setErrorInfoHandler(const std::function<void (const std::string &)>& handler);
 
@@ -52,12 +52,12 @@ class RequesterImpl{
     void initConnection(
             std::map<std::string, std::string> params,
             std::string data,
-            std::function<void(const std::optional<ResponseData>&)> responseHandler,
+            std::function<void(std::optional<ResponseData>)> responseHandler,
             bool keepConnection);
     std::optional<RequestHandle> doSendRequest(
             const std::map<std::string, std::string>& params,
             const std::string& data,
-            const std::function<void(const std::optional<ResponseData>&)>& responseHandler,
+            std::function<void(std::optional<ResponseData>)> responseHandler,
             bool keepConnection);
     void doEndRequest(uint16_t requestId, ResponseStatus responseStatus);
     void onRecordRead(const Record& record);
@@ -80,7 +80,7 @@ class RequesterImpl{
     } cfg_;
 
     struct ResponseContext{
-        std::function<void(const std::optional<ResponseData>&)> responseHandler;
+        std::function<void(std::optional<ResponseData>)> responseHandler;
         ResponseData responseData;
         bool keepConnection = false;
         std::shared_ptr<std::function<void()>> cancelRequestHandler;