X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fpipe.cpp;h=b52c2bcb33131e02fc2a0d28f39aabc3e3e62593;hp=a8487867a137d406699361a3c5d0fe2cfaa35b08;hb=a97f614de0984d6dda2173ca72815ac1062faf7a;hpb=6c40658510b68788fd5ef0488b20873b6aa32938

diff --git a/source/io/pipe.cpp b/source/io/pipe.cpp
index a848786..b52c2bc 100644
--- a/source/io/pipe.cpp
+++ b/source/io/pipe.cpp
@@ -12,21 +12,8 @@ using namespace std;
 namespace Msp {
 namespace IO {
 
-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)
+	reader(handle[0], 1024)
 {
 #ifdef WIN32
 	string name = format("\\\\.\\pipe\\%u.%p", GetCurrentProcessId(), this);
@@ -34,21 +21,13 @@ Pipe::Pipe():
 	if(!handle[0])
 		throw system_error("CreateNamedPipe");
 
-	*handle[1] = CreateFile(name.c_str(), GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
+	*handle[1] = CreateFile(name.c_str(), GENERIC_WRITE, 0, 0, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0);
 	if(!handle[1])
 	{
 		unsigned err = GetLastError();
 		CloseHandle(*handle[0]);
 		throw system_error(format("CreateFile(%s)", name), err);
 	}
-
-	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
 	int pipe_fd[2];
 	if(pipe(pipe_fd)==-1)
@@ -62,16 +41,6 @@ Pipe::Pipe():
 }
 
 Pipe::~Pipe()
-{
-	close();
-#ifdef WIN32
-	CloseHandle(*priv->event);
-	delete priv->buffer;
-#endif
-	delete priv;
-}
-
-void Pipe::close()
 {
 	set_events(P_NONE);
 
@@ -108,74 +77,12 @@ unsigned Pipe::do_read(char *buf, unsigned size)
 	if(size==0)
 		return 0;
 
-#ifdef WIN32
-	// Initiate overlapped read if needed
-	get_event_handle();
-
-	if(priv->overlapped)
-	{
-		DWORD ret;
-		if(!GetOverlappedResult(*handle[0], priv->overlapped, &ret, !priv->buf_avail))
-			throw system_error("GetOverlappedResult");
-		else
-		{
-			priv->buf_avail += ret;
-			delete priv->overlapped;
-			priv->overlapped = 0;
-		}
-	}
-
-	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();
-#else
-	unsigned ret = sys_read(handle[0], buf, size);
-#endif
-
+	unsigned ret = reader.read(buf, size);
 	if(ret==0)
-	{
-		eof_flag = true;
-		signal_end_of_file.emit();
-	}
+		set_eof();
 
 	return ret;
 }
 
-const Handle &Pipe::get_event_handle()
-{
-#ifdef WIN32
-	if(!priv->overlapped && !priv->buf_avail)
-	{
-		priv->overlapped = new OVERLAPPED;
-		memset(priv->overlapped, 0, sizeof(OVERLAPPED));
-		priv->overlapped->hEvent = *priv->event;
-
-		DWORD ret;
-		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 system_error("ReadFile");
-		}
-		else
-		{
-			priv->buf_avail = ret;
-			delete priv->overlapped;
-			priv->overlapped = 0;
-			SetEvent(*priv->event);
-		}
-	}
-
-	return priv->event;
-#else
-	return handle[0];
-#endif
-}
-
 } // namespace IO
 } // namespace Msp