Changeset 26824 in vbox for trunk/src/VBox/Runtime/r3/posix/poll-posix.cpp

Timestamp:

Feb 26, 2010 10:36:08 AM (15 years ago)

Author:

vboxsync

Message:

iprt: Adjustments to RTPipeReadBlocking and RTPipeWriteBlocking. RTPoll and RTProcCreateEx testcases.

File:

• trunk/src/VBox/Runtime/r3/posix/poll-posix.cpp (modified) (5 diffs)

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

@@ -41 +41 @@
 #include <iprt/mem.h>
 #include <iprt/pipe.h>
+#include <iprt/string.h>
 #include <iprt/thread.h>
 #include <iprt/time.h>
@@ -234 +235 @@
 RTDECL(int)  RTPollSetCreate(PRTPOLLSET phPollSet)
 {
-    AssertPtr(phPollSet);
+    AssertPtrReturn(phPollSet, VERR_INVALID_POINTER);
     RTPOLLSETINTERNAL *pThis = (RTPOLLSETINTERNAL *)RTMemAlloc(sizeof(RTPOLLSETINTERNAL));
     if (!pThis)
@@ -279 +280 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTPOLLSET_MAGIC, VERR_INVALID_HANDLE);
-    AssertReturn(!(fEvents & (RTPOLL_EVT_VALID_MASK)), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fEvents & ~RTPOLL_EVT_VALID_MASK), VERR_INVALID_PARAMETER);
     AssertReturn(fEvents, VERR_INVALID_PARAMETER);
     AssertReturn(id != UINT32_MAX, VERR_INVALID_PARAMETER);
@@ -413 +414 @@
         {
             pThis->cHandles--;
-            if (i != pThis->cHandles)
-            {
-                pThis->paHandles[i] = pThis->paHandles[pThis->cHandles];
-                pThis->paPollFds[i] = pThis->paPollFds[pThis->cHandles];
+            size_t const cToMove = pThis->cHandles - i;
+            if (cToMove)
+            {
+                memmove(&pThis->paHandles[i], &pThis->paHandles[i + 1], cToMove * sizeof(pThis->paHandles[i]));
+                memmove(&pThis->paPollFds[i], &pThis->paPollFds[i + 1], cToMove * sizeof(pThis->paPollFds[i]));
             }
             rc = VINF_SUCCESS;
@@ -436 +438 @@
     AssertReturn(pThis->u32Magic == RTPOLLSET_MAGIC, VERR_INVALID_HANDLE);
     AssertReturn(id != UINT32_MAX, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pHandle, VERR_INVALID_POINTER);
+    AssertPtrNullReturn(pHandle, VERR_INVALID_POINTER);
 
     /*