Changeset 33218 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 18, 2010 7:54:10 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66762

Message:

AsyncCompletion: Move bandwidth groups to the generic code and support arbitrary grouping of endpoints into bandwidth groups.

To add a new bandwidth group use setextradata (this adds a group called Test and sets the maximum to 2 MB/s):

VBoxInternal/PDM/AsyncCompletion/File/BwGroups/Test/Max 2097152
VBoxInternal/PDM/AsyncCompletion/File/BwGroups/Test/Start 2097152
VBoxInternal/PDM/AsyncCompletion/File/BwGroups/Test/Step 0

To assign a disk to the group add:

VBoxInternal/Devices/ahci/0/LUN#0/AttachedDriver/Config/BwGroup Test

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -186 +186 @@
     /** The disk buffer. */
     uint8_t            *pbData;
+    /** Bandwidth group the disk is assigned to. */
+    char               *pszBwGroup;
 } VBOXDISK, *PVBOXDISK;
 
@@ -364 +366 @@
                                                          pszLocation, fFlags,
                                                          pStorageBackend->pTemplate);
+
                 if (RT_SUCCESS(rc))
                 {
-                    *ppStorage = pStorageBackend;
-                    return VINF_SUCCESS;
+                    if (pThis->pszBwGroup)
+                        rc = PDMR3AsyncCompletionEpSetBwMgr(pStorageBackend->pEndpoint, pThis->pszBwGroup);
+
+                    if (RT_SUCCESS(rc))
+                    {
+                        *ppStorage = pStorageBackend;
+                        return VINF_SUCCESS;
+                    }
+
+                    PDMR3AsyncCompletionEpClose(pStorageBackend->pEndpoint);
                 }
 
@@ -1901 +1912 @@
     if (pThis->pbData)
         RTMemFree(pThis->pbData);
+    if (pThis->pszBwGroup)
+    {
+        MMR3HeapFree(pThis->pszBwGroup);
+        pThis->pszBwGroup = NULL;
+    }
 }
 
@@ -2001 +2017 @@
                                           "ReadOnly\0MaybeReadOnly\0TempReadOnly\0Shareable\0HonorZeroWrites\0"
                                           "HostIPStack\0UseNewIo\0BootAcceleration\0BootAccelerationBuffer\0"
-                                          "SetupMerge\0MergeSource\0MergeTarget\0");
+                                          "SetupMerge\0MergeSource\0MergeTarget\0BwGroup\0");
         }
         else
@@ -2107 +2123 @@
                 break;
             }
+            rc = CFGMR3QueryStringAlloc(pCurNode, "BwGroup", &pThis->pszBwGroup);
+            if (RT_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
+            {
+                rc = PDMDRV_SET_ERROR(pDrvIns, rc,
+                                      N_("DrvVD: Configuration error: Querying \"BwGroup\" as string failed"));
+                break;
+            }
+            else
+                rc = VINF_SUCCESS;
         }