Changeset 44472 in vbox for trunk/src

Timestamp:

Jan 30, 2013 3:55:32 PM (12 years ago)

Author:

vboxsync

Message:

IPRT: Merging poll-win.cpp and poll-posix.cpp, part 2.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (5 diffs)
• r3/poll.cpp (modified) (1 diff)
• r3/posix/pipe-posix.cpp (modified) (3 diffs)
• r3/posix/poll-posix.cpp (deleted)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -646 +646 @@
         r3/posix/RTPathUserDocuments-posix.cpp \
         r3/posix/pipe-posix.cpp \
-        r3/posix/poll-posix.cpp \
+        r3/poll.cpp \
         r3/posix/process-posix.cpp \
         r3/posix/process-creation-posix.cpp \
@@ -801 +801 @@
         r3/posix/path2-posix.cpp \
         r3/posix/pipe-posix.cpp \
-        r3/posix/poll-posix.cpp \
+        r3/poll.cpp \
         r3/posix/process-posix.cpp \
         r3/posix/process-creation-posix.cpp \
@@ -866 +866 @@
         r3/posix/RTPathUserDocuments-posix.cpp \
         r3/posix/pipe-posix.cpp \
-        r3/posix/poll-posix.cpp \
+        r3/poll.cpp \
         r3/posix/process-posix.cpp \
         r3/posix/process-creation-posix.cpp \
@@ -925 +925 @@
         r3/posix/RTPathUserDocuments-posix.cpp \
         r3/posix/pipe-posix.cpp \
-        r3/posix/poll-posix.cpp \
+        r3/poll.cpp \
         r3/posix/process-posix.cpp \
         r3/posix/process-creation-posix.cpp \
@@ -999 +999 @@
         r3/posix/pathhost-posix.cpp \
         r3/posix/pipe-posix.cpp \
-        r3/posix/poll-posix.cpp \
+        r3/poll.cpp \
         r3/posix/process-posix.cpp \
         r3/posix/process-creation-posix.cpp \

trunk/src/VBox/Runtime/r3/poll.cpp

@@ -275 +275 @@
         pThis->paPollFds[i].revents = 0;
 
-    int rc = poll(&pThis->paPollFds[0], pThis->cHandles,
-                  cMillies == RT_INDEFINITE_WAIT || cMillies >= INT_MAX
-                  ? -1
-                  : (int)cMillies);
+    rc = poll(&pThis->paPollFds[0], pThis->cHandles,
+              cMillies == RT_INDEFINITE_WAIT || cMillies >= INT_MAX
+              ? -1
+              : (int)cMillies);
     if (rc == 0)
         return VERR_TIMEOUT;

trunk/src/VBox/Runtime/r3/posix/pipe-posix.cpp

@@ -36 +36 @@
 #include <iprt/err.h>
 #include <iprt/mem.h>
+#include <iprt/poll.h>
 #include <iprt/string.h>
 #include <iprt/thread.h>
@@ -55 +56 @@
 #endif
 
+#include "internal/pipe.h"
+
 
 /*******************************************************************************
@@ -668 +671 @@
 }
 
+
+int rtPipePollGetHandle(RTPIPE hPipe, uint32_t fEvents, PRTHCINTPTR phNative)
+{
+    RTPIPEINTERNAL *pThis = hPipe;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->u32Magic == RTPIPE_MAGIC, VERR_INVALID_HANDLE);
+
+    AssertReturn(!(fEvents & RTPOLL_EVT_READ)  || pThis->fRead,  VERR_INVALID_PARAMETER);
+    AssertReturn(!(fEvents & RTPOLL_EVT_WRITE) || !pThis->fRead, VERR_INVALID_PARAMETER);
+
+    *phNative = pThis->fd;
+    return VINF_SUCCESS;
+}
+