net:http-server: improve data/cancel handler lifetime handling

Author: blattersturm

code/components/net-http-server/include/HttpServer.h

@@ -10,6 +10,7 @@
 #include "TcpServer.h"
 
 #include <forward_list>
+#include <shared_mutex>
 
 namespace net
 {
@@ -37,33 +38,53 @@ class HttpRequest : public fwRefCountable
 
 	HeaderMap m_headerList;
 
-	std::function<void(const std::vector<uint8_t>&)> m_dataHandler;
+	std::shared_ptr<std::function<void(const std::vector<uint8_t>&)>> m_dataHandler;
 
-	std::function<void()> m_cancelHandler;
+	std::shared_mutex m_dataHandlerMutex;
+
+	std::shared_ptr<std::function<void()>> m_cancelHandler;
+
+	std::shared_mutex m_cancelHandlerMutex;
 
 public:
 	HttpRequest(int httpVersionMajor, int httpVersionMinor, const std::string& requestMethod, const std::string& path, const HeaderMap& headerList, const std::string& remoteAddress);
 
 	virtual ~HttpRequest() override;
 
-	inline const std::function<void(const std::vector<uint8_t>& data)>& GetDataHandler() const
+	inline std::shared_ptr<std::function<void(const std::vector<uint8_t>& data)>> GetDataHandler()
 	{
+		std::shared_lock<std::shared_mutex> lock(m_dataHandlerMutex);
 		return m_dataHandler;
 	}
 
+	inline void SetDataHandler()
+	{
+		std::unique_lock<std::shared_mutex> lock(m_dataHandlerMutex);
+		m_dataHandler = {};
+	}
+
 	inline void SetDataHandler(const std::function<void(const std::vector<uint8_t>& data)>& handler)
 	{
-		m_dataHandler = handler;
+		std::unique_lock<std::shared_mutex> lock(m_dataHandlerMutex);
+		m_dataHandler = std::make_shared<std::remove_const_t<std::remove_reference_t<decltype(handler)>>>(handler);
 	}
 
-	inline const std::function<void()>& GetCancelHandler() const
+	inline std::shared_ptr<std::function<void()>> GetCancelHandler()
 	{
+		std::shared_lock<std::shared_mutex> lock(m_cancelHandlerMutex);
 		return m_cancelHandler;
 	}
 
+	inline void SetCancelHandler()
+	{
+		std::unique_lock<std::shared_mutex> lock(m_cancelHandlerMutex);
+		m_cancelHandler = {};
+	}
+
 	inline void SetCancelHandler(const std::function<void()>& handler)
 	{
-		m_cancelHandler = handler;
+		std::unique_lock<std::shared_mutex> lock(m_cancelHandlerMutex);
+		m_cancelHandler = std::make_shared<std::remove_const_t<std::remove_reference_t<decltype(handler)>>>(handler);
 	}
 
 	inline std::pair<int, int> GetHttpVersion() const

code/components/net-http-server/src/Http1Server.cpp

@@ -396,13 +396,13 @@ void HttpServerImpl::OnConnection(fwRefContainer<TcpServerStream> stream)
 					readQueue.erase(readQueue.begin(), readQueue.begin() + contentLength);
 
 					// call the data handler
-					auto& dataHandler = localConnectionData->request->GetDataHandler();
+					auto dataHandler = localConnectionData->request->GetDataHandler();
 
 					if (dataHandler)
 					{
-						dataHandler(requestData);
+						localConnectionData->request->SetDataHandler();
 
-						localConnectionData->request->SetDataHandler(std::function<void(const std::vector<uint8_t>&)>());
+						(*dataHandler)(requestData);
 					}
 
 					// clean up the req/res
@@ -460,15 +460,15 @@ void HttpServerImpl::OnConnection(fwRefContainer<TcpServerStream> stream)
 					readQueue.erase(readQueue.begin(), readQueue.begin() + readQueue.size() - result);
 
 					// call the data handler
-					auto& dataHandler = localConnectionData->request->GetDataHandler();
+					auto dataHandler = localConnectionData->request->GetDataHandler();
 
 					if (dataHandler)
 					{
-						requestData.resize(localConnectionData->lastLength);
+						localConnectionData->request->SetDataHandler();
 
-						dataHandler(requestData);
+						requestData.resize(localConnectionData->lastLength);
 
-						localConnectionData->request->SetDataHandler(std::function<void(const std::vector<uint8_t>&)>());
+						(*dataHandler)(requestData);
 					}
 
 					// clean up the req/res
@@ -508,9 +508,9 @@ void HttpServerImpl::OnConnection(fwRefContainer<TcpServerStream> stream)
 
 			if (cancelHandler)
 			{
-				cancelHandler();
+				(*cancelHandler)();
 
-				connectionData->request->SetCancelHandler(std::function<void()>());
+				connectionData->request->SetCancelHandler();
 			}
 
 			connectionData->request = nullptr;

code/components/net-http-server/src/Http2Server.cpp

@@ -126,13 +126,13 @@ class Http2Response : public HttpResponse
 	{
 		if (m_request.GetRef() && !m_ended)
 		{
-			auto& cancelHandler = m_request->GetCancelHandler();
+			auto cancelHandler = m_request->GetCancelHandler();
 
 			if (cancelHandler)
 			{
-				cancelHandler();
+				(*cancelHandler)();
 
-				m_request->SetCancelHandler(std::function<void()>());
+				m_request->SetCancelHandler();
 			}
 		}
 
@@ -318,11 +318,11 @@ void Http2ServerImpl::OnConnection(fwRefContainer<TcpServerStream> stream)
 					if (req->httpReq.GetRef())
 					{
 						auto handler = req->httpReq->GetDataHandler();
-						req->httpReq->SetDataHandler({});
+						req->httpReq->SetDataHandler();
 
 						if (handler)
 						{
-							handler(req->body);
+							(*handler)(req->body);
 						}
 					}
 				}