Changeset 63830 in vbox for trunk/src/VBox/Storage/VD.cpp

Timestamp:

Sep 14, 2016 11:19:56 AM (8 years ago)

Author:

vboxsync

Message:

Storage/VD: Cleanup, get rid of goto ...

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (4 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -1635 +1635 @@
 
 /**
- * Process the I/O context, core method which assumes that the I/O context
- * acquired the lock.
+ * Returns whether the given I/O context has completed.
  *
- * @returns VBox status code.
- * @param   pIoCtx    I/O context to process.
- */
-static int vdIoCtxProcessLocked(PVDIOCTX pIoCtx)
-{
-    int rc = VINF_SUCCESS;
-
-    VD_IS_LOCKED(pIoCtx->pDisk);
-
-    LogFlowFunc(("pIoCtx=%#p\n", pIoCtx));
-
+ * @returns Flag whether the I/O context is complete.
+ * @param   pIoCtx          The I/O context to check.
+ */
+DECLINLINE(bool) vdIoCtxIsComplete(PVDIOCTX pIoCtx)
+{
     if (   !pIoCtx->cMetaTransfersPending
         && !pIoCtx->cDataTransfersPending
         && !pIoCtx->pfnIoCtxTransfer)
-    {
-        rc = VINF_VD_ASYNC_IO_FINISHED;
-        goto out;
-    }
+        return true;
 
     /*
@@ -1664 +1654 @@
         && !pIoCtx->cMetaTransfersPending
         && !pIoCtx->cDataTransfersPending)
-    {
-        rc = VINF_VD_ASYNC_IO_FINISHED;
-        goto out;
-    }
-
+        return true;
+
+    return false;
+}
+
+/**
+ * Returns whether the given I/O context is blocked due to a metadata transfer
+ * or because the backend blocked it.
+ *
+ * @returns Flag whether the I/O context is blocked.
+ * @param   pIoCtx          The I/O context to check.
+ */
+DECLINLINE(bool) vdIoCtxIsBlocked(PVDIOCTX pIoCtx)
+{
     /* Don't change anything if there is a metadata transfer pending or we are blocked. */
     if (   pIoCtx->cMetaTransfersPending
         || (pIoCtx->fFlags & VDIOCTX_FLAGS_BLOCKED))
-    {
-        rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
-        goto out;
-    }
-
-    if (pIoCtx->pfnIoCtxTransfer)
-    {
-        /* Call the transfer function advancing to the next while there is no error. */
-        while (   pIoCtx->pfnIoCtxTransfer
-               && !pIoCtx->cMetaTransfersPending
-               && RT_SUCCESS(rc))
-        {
-            LogFlowFunc(("calling transfer function %#p\n", pIoCtx->pfnIoCtxTransfer));
-            rc = pIoCtx->pfnIoCtxTransfer(pIoCtx);
-
-            /* Advance to the next part of the transfer if the current one succeeded. */
-            if (RT_SUCCESS(rc))
+        return true;
+
+    return false;
+}
+
+/**
+ * Process the I/O context, core method which assumes that the I/O context
+ * acquired the lock.
+ *
+ * @returns VBox status code.
+ * @param   pIoCtx    I/O context to process.
+ */
+static int vdIoCtxProcessLocked(PVDIOCTX pIoCtx)
+{
+    int rc = VINF_SUCCESS;
+
+    VD_IS_LOCKED(pIoCtx->pDisk);
+
+    LogFlowFunc(("pIoCtx=%#p\n", pIoCtx));
+
+    if (!vdIoCtxIsComplete(pIoCtx))
+    {
+        if (!vdIoCtxIsBlocked(pIoCtx))
+        {
+            if (pIoCtx->pfnIoCtxTransfer)
             {
-                pIoCtx->pfnIoCtxTransfer = pIoCtx->pfnIoCtxTransferNext;
-                pIoCtx->pfnIoCtxTransferNext = NULL;
+                /* Call the transfer function advancing to the next while there is no error. */
+                while (   pIoCtx->pfnIoCtxTransfer
+                       && !pIoCtx->cMetaTransfersPending
+                       && RT_SUCCESS(rc))
+                {
+                    LogFlowFunc(("calling transfer function %#p\n", pIoCtx->pfnIoCtxTransfer));
+                    rc = pIoCtx->pfnIoCtxTransfer(pIoCtx);
+
+                    /* Advance to the next part of the transfer if the current one succeeded. */
+                    if (RT_SUCCESS(rc))
+                    {
+                        pIoCtx->pfnIoCtxTransfer = pIoCtx->pfnIoCtxTransferNext;
+                        pIoCtx->pfnIoCtxTransferNext = NULL;
+                    }
+                }
             }
-        }
-    }
-
-    if (   RT_SUCCESS(rc)
-        && !pIoCtx->cMetaTransfersPending
-        && !pIoCtx->cDataTransfersPending
-        && !(pIoCtx->fFlags & VDIOCTX_FLAGS_BLOCKED))
-        rc = VINF_VD_ASYNC_IO_FINISHED;
-    else if (   RT_SUCCESS(rc)
-             || rc == VERR_VD_NOT_ENOUGH_METADATA
-             || rc == VERR_VD_IOCTX_HALT)
-        rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
-    else if (   RT_FAILURE(rc)
-                && (rc != VERR_VD_ASYNC_IO_IN_PROGRESS))
-    {
-        ASMAtomicCmpXchgS32(&pIoCtx->rcReq, rc, VINF_SUCCESS);
-
-        /*
-         * The I/O context completed if we have an error and there is no data
-         * or meta data transfer pending.
-         */
-        if (   !pIoCtx->cMetaTransfersPending
-            && !pIoCtx->cDataTransfersPending)
-            rc = VINF_VD_ASYNC_IO_FINISHED;
+
+            if (   RT_SUCCESS(rc)
+                && !pIoCtx->cMetaTransfersPending
+                && !pIoCtx->cDataTransfersPending
+                && !(pIoCtx->fFlags & VDIOCTX_FLAGS_BLOCKED))
+                rc = VINF_VD_ASYNC_IO_FINISHED;
+            else if (   RT_SUCCESS(rc)
+                     || rc == VERR_VD_NOT_ENOUGH_METADATA
+                     || rc == VERR_VD_IOCTX_HALT)
+                rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
+            else if (   RT_FAILURE(rc)
+                        && (rc != VERR_VD_ASYNC_IO_IN_PROGRESS))
+            {
+                ASMAtomicCmpXchgS32(&pIoCtx->rcReq, rc, VINF_SUCCESS);
+
+                /*
+                 * The I/O context completed if we have an error and there is no data
+                 * or meta data transfer pending.
+                 */
+                if (   !pIoCtx->cMetaTransfersPending
+                    && !pIoCtx->cDataTransfersPending)
+                    rc = VINF_VD_ASYNC_IO_FINISHED;
+                else
+                    rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
+            }
+        }
         else
             rc = VERR_VD_ASYNC_IO_IN_PROGRESS;
     }
-
-out:
+    else
+        rc = VINF_VD_ASYNC_IO_FINISHED;
+
     LogFlowFunc(("pIoCtx=%#p rc=%Rrc cDataTransfersPending=%u cMetaTransfersPending=%u fComplete=%RTbool\n",
                  pIoCtx, rc, pIoCtx->cDataTransfersPending, pIoCtx->cMetaTransfersPending,
@@ -3750 +3773 @@
     size_t cbPluginDirEntry = sizeof(RTDIRENTRYEX);
     int rc = RTDirOpenFiltered(&pPluginDir, pszPluginFilter, RTDIRFILTER_WINNT, 0);
-    if (RT_FAILURE(rc))
+    if (RT_SUCCESS(rc))
+    {
+        pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(sizeof(RTDIRENTRYEX));
+        if (pPluginDirEntry)
+        {
+            while (   (rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK))
+                   != VERR_NO_MORE_FILES)
+            {
+                char *pszPluginPath = NULL;
+
+                if (rc == VERR_BUFFER_OVERFLOW)
+                {
+                    /* allocate new buffer. */
+                    RTMemFree(pPluginDirEntry);
+                    pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(cbPluginDirEntry);
+                    if (!pPluginDirEntry)
+                    {
+                        rc = VERR_NO_MEMORY;
+                        break;
+                    }
+                    /* Retry. */
+                    rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
+                    if (RT_FAILURE(rc))
+                        break;
+                }
+                else if (RT_FAILURE(rc))
+                    break;
+
+                /* We got the new entry. */
+                if (!RTFS_IS_FILE(pPluginDirEntry->Info.Attr.fMode))
+                    continue;
+
+                /* Prepend the path to the libraries. */
+                pszPluginPath = RTPathJoinA(pszPath, pPluginDirEntry->szName);
+                if (!pszPluginPath)
+                {
+                    rc = VERR_NO_STR_MEMORY;
+                    break;
+                }
+
+                rc = vdPluginLoadFromFilename(pszPluginPath);
+                RTStrFree(pszPluginPath);
+            }
+
+            RTMemFree(pPluginDirEntry);
+        }
+        else
+            rc = VERR_NO_MEMORY;
+
+        RTDirClose(pPluginDir);
+    }
+    else
     {
         /* On Windows the above immediately signals that there are no
          * files matching, while on other platforms enumerating the
          * files below fails. Either way: no plugins. */
-        goto out;
-    }
-
-    pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(sizeof(RTDIRENTRYEX));
-    if (!pPluginDirEntry)
-    {
-        rc = VERR_NO_MEMORY;
-        goto out;
-    }
-
-    while (   (rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK))
-           != VERR_NO_MORE_FILES)
-    {
-        char *pszPluginPath = NULL;
-
-        if (rc == VERR_BUFFER_OVERFLOW)
-        {
-            /* allocate new buffer. */
-            RTMemFree(pPluginDirEntry);
-            pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(cbPluginDirEntry);
-            if (!pPluginDirEntry)
-            {
-                rc = VERR_NO_MEMORY;
-                break;
-            }
-            /* Retry. */
-            rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
-            if (RT_FAILURE(rc))
-                break;
-        }
-        else if (RT_FAILURE(rc))
-            break;
-
-        /* We got the new entry. */
-        if (!RTFS_IS_FILE(pPluginDirEntry->Info.Attr.fMode))
-            continue;
-
-        /* Prepend the path to the libraries. */
-        pszPluginPath = RTPathJoinA(pszPath, pPluginDirEntry->szName);
-        if (!pszPluginPath)
-        {
-            rc = VERR_NO_STR_MEMORY;
-            break;
-        }
-
-        rc = vdPluginLoadFromFilename(pszPluginPath);
-        RTStrFree(pszPluginPath);
-    }
-out:
+    }
+
     if (rc == VERR_NO_MORE_FILES)
         rc = VINF_SUCCESS;
     RTStrFree(pszPluginFilter);
-    if (pPluginDirEntry)
-        RTMemFree(pPluginDirEntry);
-    if (pPluginDir)
-        RTDirClose(pPluginDir);
     return rc;
 #else
@@ -3873 +3896 @@
     size_t cbPluginDirEntry = sizeof(RTDIRENTRYEX);
     int rc = RTDirOpenFiltered(&pPluginDir, pszPluginFilter, RTDIRFILTER_WINNT, 0);
-    if (RT_FAILURE(rc))
+    if (RT_SUCCESS(rc))
+    {
+        pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(sizeof(RTDIRENTRYEX));
+        if (pPluginDirEntry)
+        {
+            while ((rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK)) != VERR_NO_MORE_FILES)
+            {
+                char *pszPluginPath = NULL;
+
+                if (rc == VERR_BUFFER_OVERFLOW)
+                {
+                    /* allocate new buffer. */
+                    RTMemFree(pPluginDirEntry);
+                    pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(cbPluginDirEntry);
+                    if (!pPluginDirEntry)
+                    {
+                        rc = VERR_NO_MEMORY;
+                        break;
+                    }
+                    /* Retry. */
+                    rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
+                    if (RT_FAILURE(rc))
+                        break;
+                }
+                else if (RT_FAILURE(rc))
+                    break;
+
+                /* We got the new entry. */
+                if (!RTFS_IS_FILE(pPluginDirEntry->Info.Attr.fMode))
+                    continue;
+
+                /* Prepend the path to the libraries. */
+                pszPluginPath = RTPathJoinA(pszPath, pPluginDirEntry->szName);
+                if (!pszPluginPath)
+                {
+                    rc = VERR_NO_STR_MEMORY;
+                    break;
+                }
+
+                rc = vdPluginUnloadFromFilename(pszPluginPath);
+                RTStrFree(pszPluginPath);
+            }
+
+            RTMemFree(pPluginDirEntry);
+        }
+        else
+            rc = VERR_NO_MEMORY;
+
+        RTDirClose(pPluginDir);
+    }
+    else
     {
         /* On Windows the above immediately signals that there are no
          * files matching, while on other platforms enumerating the
          * files below fails. Either way: no plugins. */
-        goto out;
-    }
-
-    pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(sizeof(RTDIRENTRYEX));
-    if (!pPluginDirEntry)
-    {
-        rc = VERR_NO_MEMORY;
-        goto out;
-    }
-
-    while ((rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK)) != VERR_NO_MORE_FILES)
-    {
-        char *pszPluginPath = NULL;
-
-        if (rc == VERR_BUFFER_OVERFLOW)
-        {
-            /* allocate new buffer. */
-            RTMemFree(pPluginDirEntry);
-            pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(cbPluginDirEntry);
-            if (!pPluginDirEntry)
-            {
-                rc = VERR_NO_MEMORY;
-                break;
-            }
-            /* Retry. */
-            rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
-            if (RT_FAILURE(rc))
-                break;
-        }
-        else if (RT_FAILURE(rc))
-            break;
-
-        /* We got the new entry. */
-        if (!RTFS_IS_FILE(pPluginDirEntry->Info.Attr.fMode))
-            continue;
-
-        /* Prepend the path to the libraries. */
-        pszPluginPath = RTPathJoinA(pszPath, pPluginDirEntry->szName);
-        if (!pszPluginPath)
-        {
-            rc = VERR_NO_STR_MEMORY;
-            break;
-        }
-
-        rc = vdPluginUnloadFromFilename(pszPluginPath);
-        RTStrFree(pszPluginPath);
-    }
-out:
+    }
+    
     if (rc == VERR_NO_MORE_FILES)
         rc = VINF_SUCCESS;
     RTStrFree(pszPluginFilter);
-    if (pPluginDirEntry)
-        RTMemFree(pPluginDirEntry);
-    if (pPluginDir)
-        RTDirClose(pPluginDir);
     return rc;
 #else