X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fpipe.cpp;h=2975a0635074e981aea9dc909cdef5f872d3ca36;hp=b3735aa63b6d43a7724aaa13d1109ce96a78b0d2;hb=378ec811c8df431f5b4e7094eb1949476d3a79fe;hpb=6e0fd758970bcb5bad5e3f2454b694cc4d7b4b66

diff --git a/source/io/pipe.cpp b/source/io/pipe.cpp
index b3735aa..2975a06 100644
--- a/source/io/pipe.cpp
+++ b/source/io/pipe.cpp
@@ -2,6 +2,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #endif
+#include <msp/core/systemerror.h>
 #include <msp/strings/formatter.h>
 #include "pipe.h"
 
@@ -10,31 +11,46 @@ using namespace std;
 namespace Msp {
 namespace IO {
 
-Pipe::Pipe()
+struct Pipe::Private
+{
+#ifdef WIN32
+	OVERLAPPED *overlapped;
+	Handle event;
+	unsigned buf_size;
+	char *buffer;
+	unsigned buf_avail;
+	char *buf_next;
+#endif
+};
+
+
+Pipe::Pipe():
+	priv(0)
 {
 #ifdef WIN32
 	string name = format("\\\\.\\pipe\\%u.%p", GetCurrentProcessId(), this);
 	handle[0] = CreateNamedPipe(name.c_str(), PIPE_ACCESS_INBOUND|FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE, 1, 1024, 1024, 0, 0);
 	if(handle[0]==INVALID_HANDLE_VALUE)
-		throw SystemError("Unable to create pipe", GetLastError());
+		throw system_error("CreateNamedPipe");
 
 	handle[1] = CreateFile(name.c_str(), GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
 	if(handle[1]==INVALID_HANDLE_VALUE)
 	{
 		unsigned err = GetLastError();
 		CloseHandle(handle[0]);
-		throw SystemError("Unable to create pipe", err);
+		throw system_error(format("CreateFile(%s)", name), err);
 	}
 
-	overlapped = 0;
-	event = CreateEvent(0, true, false, 0);
-	buf_size = 1024;
-	buffer = new char[buf_size];
-	buf_avail = 0;
-	buf_next = buffer;
+	priv = new Private;
+	priv->overlapped = 0;
+	priv->event = CreateEvent(0, true, false, 0);
+	priv->buf_size = 1024;
+	priv->buffer = new char[priv->buf_size];
+	priv->buf_avail = 0;
+	priv->buf_next = priv->buffer;
 #else
 	if(pipe(handle)==-1)
-		throw SystemError("Unable to create pipe", errno);
+		throw system_error("pipe");
 #endif
 
 	set_events(P_INPUT);
@@ -43,6 +59,11 @@ Pipe::Pipe()
 Pipe::~Pipe()
 {
 	close();
+#ifdef WIN32
+	CloseHandle(priv->event);
+	delete priv->buffer;
+#endif
+	delete priv;
 }
 
 void Pipe::close()
@@ -82,7 +103,7 @@ unsigned Pipe::do_write(const char *buf, unsigned size)
 #ifdef WIN32
 	DWORD ret;
 	if(!WriteFile(handle[1], buf, size, &ret, 0))
-		throw SystemError("Writing to pipe failed", GetLastError());
+		throw system_error("WriteFile");
 #else
 	int ret = ::write(handle[1], buf, size);
 	if(ret==-1)
@@ -90,7 +111,7 @@ unsigned Pipe::do_write(const char *buf, unsigned size)
 		if(errno==EAGAIN)
 			return 0;
 		else
-			throw SystemError("Writing to pipe failed", errno);
+			throw system_error("write");
 	}
 #endif
 
@@ -106,23 +127,23 @@ unsigned Pipe::do_read(char *buf, unsigned size)
 	// Initiate overlapped read if needed
 	get_event_handle();
 
-	if(overlapped)
+	if(priv->overlapped)
 	{
 		DWORD ret;
-		if(!GetOverlappedResult(handle[0], overlapped, &ret, !buf_avail))
-			throw SystemError("Reading from pipe failed", GetLastError());
+		if(!GetOverlappedResult(handle[0], priv->overlapped, &ret, !priv->buf_avail))
+			throw system_error("GetOverlappedResult");
 		else
 		{
-			buf_avail += ret;
-			delete overlapped;
-			overlapped = 0;
+			priv->buf_avail += ret;
+			delete priv->overlapped;
+			priv->overlapped = 0;
 		}
 	}
 
-	unsigned ret = min(buf_avail, size);
-	memcpy(buf, buf_next, ret);
-	buf_next += ret;
-	buf_avail -= ret;
+	unsigned ret = min(priv->buf_avail, size);
+	memcpy(buf, priv->buf_next, ret);
+	priv->buf_next += ret;
+	priv->buf_avail -= ret;
 
 	// Initiate another overlapped read in case someone is polling us
 	get_event_handle();
@@ -133,7 +154,7 @@ unsigned Pipe::do_read(char *buf, unsigned size)
 		if(errno==EAGAIN)
 			return 0;
 		else
-			throw SystemError("Reading from pipe failed", errno);
+			throw system_error("read");
 	}
 #endif
 
@@ -149,30 +170,30 @@ unsigned Pipe::do_read(char *buf, unsigned size)
 Handle Pipe::get_event_handle()
 {
 #ifdef WIN32
-	if(!overlapped && !buf_avail)
+	if(!priv->overlapped && !priv->buf_avail)
 	{
-		overlapped = new OVERLAPPED;
-		memset(overlapped, 0, sizeof(OVERLAPPED));
-		overlapped->hEvent = event;
+		priv->overlapped = new OVERLAPPED;
+		memset(priv->overlapped, 0, sizeof(OVERLAPPED));
+		priv->overlapped->hEvent = priv->event;
 
 		DWORD ret;
-		buf_next = buffer;
-		if(!ReadFile(handle[0], buffer, buf_size, &ret, overlapped))
+		priv->buf_next = priv->buffer;
+		if(!ReadFile(handle[0], priv->buffer, priv->buf_size, &ret, priv->overlapped))
 		{
 			unsigned err = GetLastError();
 			if(err!=ERROR_IO_PENDING)
-				throw SystemError("Failed to start an overlapped read", err);
+				throw system_error("ReadFile");
 		}
 		else
 		{
-			buf_avail = ret;
-			delete overlapped;
-			overlapped = 0;
-			SetEvent(event);
+			priv->buf_avail = ret;
+			delete priv->overlapped;
+			priv->overlapped = 0;
+			SetEvent(priv->event);
 		}
 	}
 
-	return event;
+	return priv->event;
 #else
 	return handle[0];
 #endif