event/BufferedSocket: pass std::exception_ptr to OnSocketError()

src/client/Client.hxx

@@ -200,7 +200,7 @@ public:
 private:
 	/* virtual methods from class BufferedSocket */
 	virtual InputResult OnSocketInput(void *data, size_t length) override;
-	virtual void OnSocketError(Error &&error) override;
+	void OnSocketError(std::exception_ptr ep) override;
 	virtual void OnSocketClosed() override;
 
 	/* virtual methods from class TimeoutMonitor */

src/client/ClientEvent.cxx

@@ -22,9 +22,9 @@
 #include "Log.hxx"
 
 void
-Client::OnSocketError(Error &&error)
+Client::OnSocketError(std::exception_ptr ep)
 {
-	FormatError(error, "error on client %d", num);
+	FormatError(ep, "error on client %d", num);
 
 	SetExpired();
 }

src/event/BufferedSocket.cxx

@@ -20,8 +20,6 @@
 #include "config.h"
 #include "BufferedSocket.hxx"
 #include "net/SocketError.hxx"
-#include "util/Error.hxx"
-#include "util/Domain.hxx"
 #include "Compiler.h"
 
 #include <algorithm>
@@ -45,7 +43,7 @@ BufferedSocket::DirectRead(void *data, size_t length)
 	if (IsSocketErrorClosed(code))
 		OnSocketClosed();
 	else
-		OnSocketError(NewSocketError(code));
+		OnSocketError(std::make_exception_ptr(MakeSocketError(code, "Failed to receive from socket")));
 	return -1;
 }
 
@@ -80,12 +78,7 @@ BufferedSocket::ResumeInput()
 		switch (result) {
 		case InputResult::MORE:
 			if (input.IsFull()) {
-				// TODO
-				static constexpr Domain buffered_socket_domain("buffered_socket");
-				Error error;
-				error.Set(buffered_socket_domain,
-					  "Input buffer is full");
-				OnSocketError(std::move(error));
+				OnSocketError(std::make_exception_ptr(std::runtime_error("Input buffer is full")));
 				return false;
 			}
 

src/event/BufferedSocket.hxx

@@ -24,10 +24,11 @@
 #include "SocketMonitor.hxx"
 #include "util/StaticFifoBuffer.hxx"
 
+#include <exception>
+
 #include <assert.h>
 #include <stdint.h>
 
-class Error;
 class EventLoop;
 
 /**
@@ -109,7 +110,7 @@ protected:
 	 */
 	virtual InputResult OnSocketInput(void *data, size_t length) = 0;
 
-	virtual void OnSocketError(Error &&error) = 0;
+	virtual void OnSocketError(std::exception_ptr ep) = 0;
 	virtual void OnSocketClosed() = 0;
 
 	virtual bool OnSocketReady(unsigned flags) override;

src/event/FullyBufferedSocket.cxx

@@ -20,8 +20,6 @@
 #include "config.h"
 #include "FullyBufferedSocket.hxx"
 #include "net/SocketError.hxx"
-#include "util/Error.hxx"
-#include "util/Domain.hxx"
 #include "Compiler.h"
 
 #include <assert.h>
@@ -42,7 +40,7 @@ FullyBufferedSocket::DirectWrite(const void *data, size_t length)
 		if (IsSocketErrorClosed(code))
 			OnSocketClosed();
 		else
-			OnSocketError(NewSocketError(code));
+			OnSocketError(std::make_exception_ptr(MakeSocketError(code, "Failed to send to socket")));
 	}
 
 	return nbytes;
@@ -85,11 +83,7 @@ FullyBufferedSocket::Write(const void *data, size_t length)
 	const bool was_empty = output.IsEmpty();
 
 	if (!output.Append(data, length)) {
-		// TODO
-		static constexpr Domain buffered_socket_domain("buffered_socket");
-		Error error;
-		error.Set(buffered_socket_domain, "Output buffer is full");
-		OnSocketError(std::move(error));
+		OnSocketError(std::make_exception_ptr(std::runtime_error("Output buffer is full")));
 		return false;
 	}
 

src/output/plugins/httpd/HttpdClient.cxx

@@ -474,9 +474,9 @@ HttpdClient::OnSocketInput(void *data, size_t length)
 }
 
 void
-HttpdClient::OnSocketError(Error &&error)
+HttpdClient::OnSocketError(std::exception_ptr ep)
 {
-	LogError(error);
+	LogError(ep);
 }
 
 void

src/output/plugins/httpd/HttpdClient.hxx

@@ -191,7 +191,7 @@ private:
 protected:
 	virtual bool OnSocketReady(unsigned flags) override;
 	virtual InputResult OnSocketInput(void *data, size_t length) override;
-	virtual void OnSocketError(Error &&error) override;
+	void OnSocketError(std::exception_ptr ep) override;
 	virtual void OnSocketClosed() override;
 };