Use size_t for sizes in I/O classes

[libs/core.git] / source / io / pipe.cpp

diff --git a/source/io/pipe.cpp b/source/io/pipe.cpp
index afa0c259bdc3655195ccca692439774f8f967d8b..01bf20aaea32c056b33e2213dafdd1d0515c3f1e 100644 (file)
--- a/source/io/pipe.cpp
+++ b/source/io/pipe.cpp
@@ -1,9 +1,3 @@
-#ifndef WIN32
-#include <fcntl.h>
-#include <errno.h>
-#endif
-#include <msp/core/systemerror.h>
-#include <msp/strings/formatter.h>
 #include "pipe.h"
 
 using namespace std;
@@ -11,172 +5,83 @@ using namespace std;
 namespace Msp {
 namespace IO {
 
-Pipe::Pipe()
+Pipe::Pipe():
+       reader(read_handle, 1024)
 {
-#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 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 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;
-#else
-       if(pipe(handle)==-1)
-               throw system_error("pipe");
-#endif
+       mode = M_RDWR;
+
+       platform_init();
 
        set_events(P_INPUT);
 }
 
 Pipe::~Pipe()
-{
-       close();
-}
-
-void Pipe::close()
 {
        set_events(P_NONE);
 
        signal_flush_required.emit();
-#ifdef WIN32
-       CloseHandle(handle[0]);
-       CloseHandle(handle[1]);
-#else
-       ::close(handle[0]);
-       ::close(handle[1]);
-       signal_closed.emit();
-#endif
+       sys_close(read_handle);
+       sys_close(write_handle);
+}
+
+void Pipe::set_mode(Mode m)
+{
+       m = m&M_RDWR;
+       if(!m)
+               throw invalid_argument("Pipe::set_mode");
+
+       check_access(m);
+
+       Mode close = mode&M_RDWR&~m;
+       if(close&M_READ)
+               sys_close(read_handle);
+       if(close&M_WRITE)
+               sys_close(write_handle);
+       mode = (mode&~M_RDWR)|m;
 }
 
 void Pipe::set_block(bool b)
 {
-       mode = (mode&~M_NONBLOCK);
-       if(b)
-               mode = (mode|M_NONBLOCK);
-
-#ifndef WIN32
-       int flags = fcntl(handle[0], F_GETFD);
-       fcntl(handle[0], F_SETFL, (flags&O_NONBLOCK)|(b?0:O_NONBLOCK));
-       flags = fcntl(handle[1], F_GETFD);
-       fcntl(handle[1], F_SETFL, (flags&O_NONBLOCK)|(b?0:O_NONBLOCK));
-#endif
+       adjust_mode(mode, M_NONBLOCK, !b);
+       sys_set_blocking(read_handle, b);
+       sys_set_blocking(write_handle, b);
 }
 
-unsigned Pipe::do_write(const char *buf, unsigned size)
+void Pipe::set_inherit(bool i)
+{
+       adjust_mode(mode, M_INHERIT, i);
+       sys_set_inherit(read_handle, i);
+       sys_set_inherit(write_handle, i);
+}
+
+size_t Pipe::do_write(const char *buf, size_t size)
 {
        if(size==0)
                return 0;
 
-#ifdef WIN32
-       DWORD ret;
-       if(!WriteFile(handle[1], buf, size, &ret, 0))
-               throw system_error("WriteFile");
-#else
-       int ret = ::write(handle[1], buf, size);
-       if(ret==-1)
-       {
-               if(errno==EAGAIN)
-                       return 0;
-               else
-                       throw system_error("write");
-       }
-#endif
-
-       return ret;
+       return sys_write(write_handle, buf, size);
 }
 
-unsigned Pipe::do_read(char *buf, unsigned size)
+size_t Pipe::do_read(char *buf, size_t size)
 {
        if(size==0)
                return 0;
 
-#ifdef WIN32
-       // Initiate overlapped read if needed
-       get_event_handle();
-
-       if(overlapped)
-       {
-               DWORD ret;
-               if(!GetOverlappedResult(handle[0], overlapped, &ret, !buf_avail))
-                       throw system_error("GetOverlappedResult");
-               else
-               {
-                       buf_avail += ret;
-                       delete overlapped;
-                       overlapped = 0;
-               }
-       }
-
-       unsigned ret = min(buf_avail, size);
-       memcpy(buf, buf_next, ret);
-       buf_next += ret;
-       buf_avail -= ret;
-
-       // Initiate another overlapped read in case someone is polling us
-       get_event_handle();
-#else
-       int ret = ::read(handle[0], buf, size);
-       if(ret==-1)
-       {
-               if(errno==EAGAIN)
-                       return 0;
-               else
-                       throw system_error("read");
-       }
-#endif
-
+       size_t ret = reader.read(buf, size);
        if(ret==0)
-       {
-               eof_flag = true;
-               signal_end_of_file.emit();
-       }
+               set_eof();
 
        return ret;
 }
 
-Handle Pipe::get_event_handle()
+const Handle &Pipe::get_handle(Mode m)
 {
-#ifdef WIN32
-       if(!overlapped && !buf_avail)
-       {
-               overlapped = new OVERLAPPED;
-               memset(overlapped, 0, sizeof(OVERLAPPED));
-               overlapped->hEvent = event;
-
-               DWORD ret;
-               buf_next = buffer;
-               if(!ReadFile(handle[0], buffer, buf_size, &ret, overlapped))
-               {
-                       unsigned err = GetLastError();
-                       if(err!=ERROR_IO_PENDING)
-                               throw system_error("ReadFile");
-               }
-               else
-               {
-                       buf_avail = ret;
-                       delete overlapped;
-                       overlapped = 0;
-                       SetEvent(event);
-               }
-       }
-
-       return event;
-#else
-       return handle[0];
-#endif
+       if(m==M_READ)
+               return read_handle;
+       else if(m==M_WRITE)
+               return write_handle;
+       else
+               throw invalid_argument("Pipe::get_handle");
 }
 
 } // namespace IO