Changeset 69942 in vbox

Timestamp:

Dec 5, 2017 11:40:31 PM (7 years ago)

Author:

vboxsync

Message:

iprt/vfs: Made RTVFSFILEOPS::pfnPollOne optional.

Location:

trunk

Files:

• include/iprt/vfslowlevel.h (modified) (1 diff)
• src/VBox/Runtime/common/dvm/dvmvfs.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/fs/isomaker.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/vfs/vfsbase.cpp (modified) (3 diffs)
• src/VBox/Runtime/common/vfs/vfsmemory.cpp (modified) (2 diffs)
• src/VBox/Storage/VDIfVfs.cpp (modified) (3 diffs)
• src/VBox/Storage/VDVfs.cpp (modified) (2 diffs)

trunk/include/iprt/vfslowlevel.h

@@ -883 +883 @@
      *                      should be hidden from the caller (@c false).
      * @param   pfRetEvents Where to return the event mask.
+     * @note    Optional.  If NULL, immediately return all requested non-error
+     *          events, waiting for errors works like sleep.
      * @sa      RTPollSetAdd, RTPoll, RTPollNoResume.
      */

trunk/src/VBox/Runtime/common/dvm/dvmvfs.cpp

@@ -324 +324 @@
 
 /**
- * @interface_method_impl{RTVFSIOSTREAMOPS,pfnPollOne}
- */
-static DECLCALLBACK(int) rtDvmVfsFile_PollOne(void *pvThis, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr,
-                                              uint32_t *pfRetEvents)
-{
-    NOREF(pvThis);
-    int rc;
-    if (fEvents != RTPOLL_EVT_ERROR)
-    {
-        *pfRetEvents = fEvents & ~RTPOLL_EVT_ERROR;
-        rc = VINF_SUCCESS;
-    }
-    else
-        rc = RTVfsUtilDummyPollOne(fEvents, cMillies, fIntr, pfRetEvents);
-    return rc;
-}
-
-
-/**
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnTell}
  */
@@ -481 +462 @@
         rtDvmVfsFile_Write,
         rtDvmVfsFile_Flush,
-        rtDvmVfsFile_PollOne,
+        NULL /*pfnPollOne*/,
         rtDvmVfsFile_Tell,
         NULL /*Skip*/,

trunk/src/VBox/Runtime/common/fs/isomaker.cpp

@@ -7270 +7270 @@
 
 /**
- * @interface_method_impl{RTVFSIOSTREAMOPS,pfnPollOne}
- */
-static DECLCALLBACK(int) rtFsIsoMakerOutFile_PollOne(void *pvThis, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr,
-                                                     uint32_t *pfRetEvents)
-{
-    NOREF(pvThis);
-    return RTVfsUtilDummyPollOne(fEvents, cMillies, fIntr, pfRetEvents);
-}
-
-
-/**
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnTell}
  */
@@ -7415 +7404 @@
         rtFsIsoMakerOutFile_Write,
         rtFsIsoMakerOutFile_Flush,
-        rtFsIsoMakerOutFile_PollOne,
+        NULL /*PollOne*/,
         rtFsIsoMakerOutFile_Tell,
         rtFsIsoMakerOutFile_Skip,

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -40 +40 @@
 #include <iprt/param.h>
 #include <iprt/path.h>
+#include <iprt/poll.h>
 #include <iprt/semaphore.h>
 #include <iprt/thread.h>
@@ -114 +115 @@
         AssertPtr((pIoStreamOps)->pfnWrite); \
         AssertPtr((pIoStreamOps)->pfnFlush); \
-        AssertPtr((pIoStreamOps)->pfnPollOne); \
+        AssertPtrNull((pIoStreamOps)->pfnPollOne); \
         AssertPtr((pIoStreamOps)->pfnTell); \
         AssertPtrNull((pIoStreamOps)->pfnSkip); \
@@ -3647 +3648 @@
     AssertReturn(pThis->uMagic == RTVFSIOSTREAM_MAGIC, VERR_INVALID_HANDLE);
 
-    RTVfsLockAcquireWrite(pThis->Base.hLock);
-    int rc = pThis->pOps->pfnPollOne(pThis->Base.pvThis, fEvents, cMillies, fIntr, pfRetEvents);
-    RTVfsLockReleaseWrite(pThis->Base.hLock);
+    int rc;
+    if (pThis->pOps->pfnPollOne)
+    {
+        RTVfsLockAcquireWrite(pThis->Base.hLock);
+        rc = pThis->pOps->pfnPollOne(pThis->Base.pvThis, fEvents, cMillies, fIntr, pfRetEvents);
+        RTVfsLockReleaseWrite(pThis->Base.hLock);
+    }
+    /*
+     * Default implementation.  Polling for non-error events returns
+     * immediately, waiting for errors will work like sleep.
+     */
+    else if (fEvents != RTPOLL_EVT_ERROR)
+    {
+        *pfRetEvents = fEvents & ~RTPOLL_EVT_ERROR;
+        rc = VINF_SUCCESS;
+    }
+    else if (fIntr)
+        rc = RTThreadSleep(cMillies);
+    else
+    {
+        uint64_t uMsStart = RTTimeMilliTS();
+        do
+            rc = RTThreadSleep(cMillies);
+        while (   rc == VERR_INTERRUPTED
+               && !fIntr
+               && RTTimeMilliTS() - uMsStart < cMillies);
+        if (rc == VERR_INTERRUPTED)
+            rc = VERR_TIMEOUT;
+    }
     return rc;
 }

trunk/src/VBox/Runtime/common/vfs/vfsmemory.cpp

@@ -551 +551 @@
 
 /**
- * @interface_method_impl{RTVFSIOSTREAMOPS,pfnPollOne}
- */
-static DECLCALLBACK(int) rtVfsMemFile_PollOne(void *pvThis, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr,
-                                              uint32_t *pfRetEvents)
-{
-    NOREF(pvThis);
-    int rc;
-    if (fEvents != RTPOLL_EVT_ERROR)
-    {
-        *pfRetEvents = fEvents & ~RTPOLL_EVT_ERROR;
-        rc = VINF_SUCCESS;
-    }
-    else
-        rc = RTVfsUtilDummyPollOne(fEvents, cMillies, fIntr, pfRetEvents);
-    return rc;
-}
-
-
-/**
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnTell}
  */
@@ -718 +699 @@
         rtVfsMemFile_Write,
         rtVfsMemFile_Flush,
-        rtVfsMemFile_PollOne,
+        NULL /*PollOne*/,
         rtVfsMemFile_Tell,
         NULL /*Skip*/,

trunk/src/VBox/Storage/VDIfVfs.cpp

@@ -161 +161 @@
 
 /**
- * @interface_method_impl{RTVFSIOSTREAMOPS,pfnPollOne}
- */
-static DECLCALLBACK(int) vdIfVfsIos_PollOne(void *pvThis, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr,
-                                            uint32_t *pfRetEvents)
-{
-    NOREF(pvThis);
-    int rc;
-    if (fEvents != RTPOLL_EVT_ERROR)
-    {
-        *pfRetEvents = fEvents & ~RTPOLL_EVT_ERROR;
-        rc = VINF_SUCCESS;
-    }
-    else
-        rc = RTVfsUtilDummyPollOne(fEvents, cMillies, fIntr, pfRetEvents);
-    return rc;
-}
-
-
-/**
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnTell}
  */
@@ -208 +189 @@
     vdIfVfsIos_Write,
     vdIfVfsIos_Flush,
-    vdIfVfsIos_PollOne,
+    NULL /*PollOne*/,
     vdIfVfsIos_Tell,
     NULL /*Skip*/,
@@ -366 +347 @@
         vdIfVfsIos_Write,
         vdIfVfsIos_Flush,
-        vdIfVfsIos_PollOne,
+        NULL /*PollOne*/,
         vdIfVfsIos_Tell,
         NULL /*Skip*/,

trunk/src/VBox/Storage/VDVfs.cpp

@@ -386 +386 @@
 
 /**
- * @interface_method_impl{RTVFSIOSTREAMOPS,pfnPollOne}
- */
-static DECLCALLBACK(int) vdVfsFile_PollOne(void *pvThis, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr,
-                                           uint32_t *pfRetEvents)
-{
-    NOREF(pvThis);
-    int rc;
-    if (fEvents != RTPOLL_EVT_ERROR)
-    {
-        *pfRetEvents = fEvents & ~RTPOLL_EVT_ERROR;
-        rc = VINF_SUCCESS;
-    }
-    else
-        rc = RTVfsUtilDummyPollOne(fEvents, cMillies, fIntr, pfRetEvents);
-    return rc;
-}
-
-
-/**
  * @interface_method_impl{RTVFSIOSTREAMOPS,pfnTell}
  */
@@ -541 +522 @@
         vdVfsFile_Write,
         vdVfsFile_Flush,
-        vdVfsFile_PollOne,
+        NULL /*PollOne*/,
         vdVfsFile_Tell,
         NULL /*Skip*/,