Changeset 50436 in vbox

Timestamp:

Feb 12, 2014 6:53:15 PM (11 years ago)

Author:

vboxsync

Message:

Main/BandwidthControl+BandwidthGroup: fix an init bug which led to crashes when restoring snapshots (just one line, using the wrong "copy constructor"), and quite some comment fixes to talk about the right thing (and not show where the code was copied from)

Location:

trunk/src/VBox/Main/src-server

Files:

• BandwidthControlImpl.cpp (modified) (9 diffs)
• BandwidthGroupImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/BandwidthControlImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -56 +56 @@
  * @returns COM result indicator.
  * @param aParent       Pointer to our parent object.
- * @param aName         Name of the storage controller.
- * @param aInstance     Instance number of the storage controller.
  */
 HRESULT BandwidthControl::init(Machine *aParent)
@@ -132 +130 @@
 
 /**
- *  Initializes the storage controller object given another guest object
+ *  Initializes the bandwidth control object given another guest object
  *  (a kind of copy constructor). This object makes a private copy of data
  *  of the original object passed as an argument.
@@ -163 +161 @@
         ComObjPtr<BandwidthGroup> group;
         group.createObject();
-        group->init(this, *it);
+        group->initCopy(this, *it);
         m->llBandwidthGroups->push_back(group);
     }
@@ -201 +199 @@
     AutoWriteLock wl(this COMMA_LOCKVAL_SRC_POS);
 
-    /* create private copies of all filters */
+    /* create private copies of all bandwidth groups */
     m->llBandwidthGroups.backup();
     m->llBandwidthGroups->clear();
@@ -269 +267 @@
             AutoWriteLock peerlock(m->pPeer COMMA_LOCKVAL_SRC_POS);
 
-            /* Commit all changes to new controllers (this will reshare data with
+            /* Commit all changes to new groups (this will reshare data with
              * peers for those who have peers) */
             BandwidthGroupList *newList = new BandwidthGroupList();
@@ -296 +294 @@
             }
 
-#if 0
-            /* uninit old peer's controllers that are left */
+            /* uninit old peer's groups that are left */
             for (it = m->pPeer->m->llBandwidthGroups->begin();
                  it != m->pPeer->m->llBandwidthGroups->end();
                  ++it)
                 (*it)->uninit();
-#endif
-
-            /* attach new list of controllers to our peer */
+
+            /* attach new list of groups to our peer */
             m->pPeer->m->llBandwidthGroups.attach(newList);
         }
@@ -317 +313 @@
     {
         /* the list of groups itself is not changed,
-         * just commit changes to controllers themselves */
+         * just commit changes to groups themselves */
         commitBandwidthGroups = true;
     }
@@ -361 +357 @@
 
 /**
- * Returns a storage controller object with the given name.
+ * Returns a bandwidth group object with the given name.
  *
- *  @param aName                 storage controller name to find
- *  @param aBandwidthGroup where to return the found storage controller
+ *  @param aName                 bandwidth group name to find
+ *  @param aBandwidthGroup where to return the found bandwidth group
  *  @param aSetError             true to set extended error info on failure
  */

trunk/src/VBox/Main/src-server/BandwidthGroupImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -49 +49 @@
  * @returns COM result indicator.
  * @param aParent       Pointer to our parent object.
- * @param aName         Name of the storage controller.
- * @param aInstance     Instance number of the storage controller.
+ * @param aName         Name of the bandwidth group.
+ * @param aType         Type of the bandwidth group (net, disk).
+ * @param aMaxBytesPerSec Maximum bandwidth for the bandwidth group.
  */
 HRESULT BandwidthGroup::init(BandwidthControl *aParent,
@@ -144 +145 @@
 
 /**
- *  Initializes the storage controller object given another guest object
+ *  Initializes the bandwidth group object given another guest object
  *  (a kind of copy constructor). This object makes a private copy of data
  *  of the original object passed as an argument.