Changeset 26784 in vbox for trunk

Timestamp:

Feb 25, 2010 11:56:52 AM (15 years ago)

Author:

vboxsync

Message:

iprt/pipe.h++: Adjusted RTPipeWrite[Blocking] behavior wrt to zero byte writes and broken pipes. (darwin will return EPIPE, linux does not.)

Location:

trunk

Files:

• include/iprt/pipe.h (modified) (2 diffs)
• src/VBox/Runtime/r3/posix/pipe-posix.cpp (modified) (4 diffs)
• src/VBox/Runtime/testcase/tstRTPipe.cpp (modified) (4 diffs)

trunk/include/iprt/pipe.h

@@ -118 +118 @@
  * @returns IPRT status code.
  * @retval  VERR_WRONG_ORDER if racing a call to RTPipeWriteBlocking.
- * @retval  VERR_BROKEN_PIPE if the remote party has disconnected.
+ * @retval  VERR_BROKEN_PIPE if the remote party has disconnected.  Does not
+ *          trigger when @a cbToWrite is 0.
  * @retval  VINF_TRY_AGAIN if no data was written.  @a *pcbWritten will be set
  *          to 0.
@@ -135 +136 @@
  * @returns IPRT status code.
  * @retval  VERR_WRONG_ORDER if racing a call to RTPipeWrite.
- * @retval  VERR_BROKEN_PIPE if the remote party has disconnected.
+ * @retval  VERR_BROKEN_PIPE if the remote party has disconnected.  Does not
+ *          trigger when @a cbToWrite is 0.
  * @retval  VERR_ACCESS_DENIED if it's a read pipe.
  *

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

@@ -378 +378 @@
     if (RT_SUCCESS(rc))
     {
-        do
+        while (cbToRead > 0)
         {
             ssize_t cbRead = read(pThis->fd, pvBuf, RT_MIN(cbToRead, SSIZE_MAX));
@@ -395 +395 @@
             pvBuf     = (char *)pvBuf + cbRead;
             cbToRead -= cbRead;
-        } while (cbToRead > 0);
+        }
 
         ASMAtomicDecU32(&pThis->u32State);
@@ -415 +415 @@
     if (RT_SUCCESS(rc))
     {
-        ssize_t cbWritten = write(pThis->fd, pvBuf, RT_MIN(cbToWrite, SSIZE_MAX));
-        if (cbWritten >= 0)
-            *pcbWritten = cbWritten;
-        else if (errno == EAGAIN)
-        {
-            *pcbWritten = 0;;
-            rc = VINF_TRY_AGAIN;
+        if (cbToWrite)
+        {
+            ssize_t cbWritten = write(pThis->fd, pvBuf, RT_MIN(cbToWrite, SSIZE_MAX));
+            if (cbWritten >= 0)
+                *pcbWritten = cbWritten;
+            else if (errno == EAGAIN)
+            {
+                *pcbWritten = 0;;
+                rc = VINF_TRY_AGAIN;
+            }
+            else
+                rc = RTErrConvertFromErrno(errno);
         }
         else
-            rc = RTErrConvertFromErrno(errno);
+            *pcbWritten = 0;
 
         ASMAtomicDecU32(&pThis->u32State);
@@ -471 +476 @@
 
     if (fsync(pThis->fd))
+    {
+        if (errno == EINVAL || errno == ENOTSUP)
+            return VERR_NOT_SUPPORTED;
         return RTErrConvertFromErrno(errno);
+    }
     return VINF_SUCCESS;
 }

trunk/src/VBox/Runtime/testcase/tstRTPipe.cpp

@@ -140 +140 @@
     RTTESTI_CHECK_RC_RETV(RTPipeCreate(&hPipeR, &hPipeW, RTPIPE_C_INHERIT_READ | RTPIPE_C_INHERIT_WRITE), VINF_SUCCESS);
     int rc = RTPipeFlush(hPipeW);
-    RTTESTI_CHECK(rc == VERR_NOT_SUPPORTED || rc == VINF_SUCCESS);
+    RTTESTI_CHECK_MSG(rc == VERR_NOT_SUPPORTED || rc == VINF_SUCCESS, ("%Rrc\n", rc));
     RTTESTI_CHECK_RC_RETV(RTPipeClose(hPipeR), VINF_SUCCESS);
     RTTESTI_CHECK_RC_RETV(RTPipeClose(hPipeW), VINF_SUCCESS);
@@ -223 +223 @@
     RTTESTI_CHECK_RC_RETV(RTPipeClose(hPipeR), VINF_SUCCESS);
     cbWritten = ~(size_t)2;
-    RTTESTI_CHECK_RC(RTPipeWrite(hPipeW, "", 0, &cbWritten), VERR_BROKEN_PIPE);
-    RTTESTI_CHECK(cbWritten == ~(size_t)2);
+    RTTESTI_CHECK_RC(RTPipeWrite(hPipeW, "", 0, &cbWritten), VINF_SUCCESS);
+    RTTESTI_CHECK(cbWritten == 0);
     cbWritten = ~(size_t)2;
     RTTESTI_CHECK_RC(RTPipeWrite(hPipeW, "4", 1, &cbWritten), VERR_BROKEN_PIPE);
@@ -233 +233 @@
     RTTESTI_CHECK_RC_RETV(RTPipeClose(hPipeW), VINF_SUCCESS);
     cbRead = ~(size_t)0;
-    RTTESTI_CHECK_RC(RTPipeRead(hPipeR, abBuf, 0, &cbRead), VINF_SUCCESS);         // !?
+    RTTESTI_CHECK_RC(RTPipeRead(hPipeR, abBuf, 0, &cbRead), VINF_SUCCESS);
     RTTESTI_CHECK(cbRead == 0);
     cbRead = ~(size_t)3;
@@ -284 +284 @@
     RTTESTI_CHECK(!memcmp(abBuf, "42!", 3));
     RTTESTI_CHECK_RC(RTPipeClose(hPipeR), VINF_SUCCESS);
-    RTTESTI_CHECK_RC_RETV(RTPipeWriteBlocking(hPipeW, "", 0), VERR_BROKEN_PIPE);
+    RTTESTI_CHECK_RC_RETV(RTPipeWriteBlocking(hPipeW, "", 0), VINF_SUCCESS);
     RTTESTI_CHECK_RC_RETV(RTPipeWriteBlocking(hPipeW, "42", 2), VERR_BROKEN_PIPE);
     RTTESTI_CHECK_RC(RTPipeClose(hPipeW), VINF_SUCCESS);