Changeset 49738 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Dec 2, 2013 12:52:51 PM (11 years ago)

Author:

vboxsync

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

91037

Message:

Main/BandwidthControl: fix regression (iterator incremented twice), plus lots of whitespace cleanup

Location:

trunk/src/VBox/Main/src-server

Files:

• BandwidthControlImpl.cpp (modified) (12 diffs)
• BandwidthGroupImpl.cpp (modified) (5 diffs)

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

@@ -115 +115 @@
     m->llBandwidthGroups.allocate();
     BandwidthGroupList::const_iterator it;
-    for(it = aThat->m->llBandwidthGroups->begin();
-        it != aThat->m->llBandwidthGroups->end();
-        ++it)
+    for (it = aThat->m->llBandwidthGroups->begin();
+         it != aThat->m->llBandwidthGroups->end();
+         ++it)
     {
         ComObjPtr<BandwidthGroup> group;
@@ -157 +157 @@
     m->llBandwidthGroups.allocate();
     BandwidthGroupList::const_iterator it;
-    for(it = aThat->m->llBandwidthGroups->begin();
-        it != aThat->m->llBandwidthGroups->end();
-        ++it)
+    for (it = aThat->m->llBandwidthGroups->begin();
+         it != aThat->m->llBandwidthGroups->end();
+         ++it)
     {
         ComObjPtr<BandwidthGroup> group;
@@ -178 +178 @@
  *  represented by @a aThat (locked for reading).
  */
-void BandwidthControl::i_copyFrom (BandwidthControl *aThat)
-{
-    AssertReturnVoid (aThat != NULL);
+void BandwidthControl::i_copyFrom(BandwidthControl *aThat)
+{
+    AssertReturnVoid(aThat != NULL);
 
     /* sanity */
     AutoCaller autoCaller(this);
-    AssertComRCReturnVoid (autoCaller.rc());
+    AssertComRCReturnVoid(autoCaller.rc());
 
     /* sanity too */
-    AutoCaller thatCaller (aThat);
-    AssertComRCReturnVoid (thatCaller.rc());
+    AutoCaller thatCaller(aThat);
+    AssertComRCReturnVoid(thatCaller.rc());
 
     /* even more sanity */
     AutoAnyStateDependency adep(m->pParent);
-    AssertComRCReturnVoid (adep.rc());
+    AssertComRCReturnVoid(adep.rc());
     /* Machine::copyFrom() may not be called when the VM is running */
-    AssertReturnVoid (!Global::IsOnline (adep.machineState()));
+    AssertReturnVoid(!Global::IsOnline(adep.machineState()));
 
     /* peer is not modified, lock it for reading (aThat is "master" so locked
@@ -205 +205 @@
     m->llBandwidthGroups->clear();
     BandwidthGroupList::const_iterator it;
-    for(it = aThat->m->llBandwidthGroups->begin();
-        it != aThat->m->llBandwidthGroups->end();
-        ++it)
+    for (it = aThat->m->llBandwidthGroups->begin();
+         it != aThat->m->llBandwidthGroups->end();
+         ++it)
     {
         ComObjPtr<BandwidthGroup> group;
         group.createObject();
-        group->initCopy (this, *it);
+        group->initCopy(this, *it);
         m->llBandwidthGroups->push_back(group);
     }
@@ -235 +235 @@
             /* unitialize all new groups (absent in the backed up list). */
             BandwidthGroupList *backedList = m->llBandwidthGroups.backedUpData();
-            for(it  = m->llBandwidthGroups->begin();
-                it != m->llBandwidthGroups->end();
-                ++it)
+            for (it  = m->llBandwidthGroups->begin();
+                 it != m->llBandwidthGroups->end();
+                 ++it)
             {
                 if (   std::find(backedList->begin(), backedList->end(), *it)
@@ -249 +249 @@
 
         /* rollback any changes to groups after restoring the list */
-        for(it = m->llBandwidthGroups->begin();
-            it != m->llBandwidthGroups->end();
-            ++it)
+        for (it = m->llBandwidthGroups->begin();
+             it != m->llBandwidthGroups->end();
+             ++it)
             (*it)->i_rollback();
     }
@@ -272 +272 @@
              * peers for those who have peers) */
             BandwidthGroupList *newList = new BandwidthGroupList();
-            for(it = m->llBandwidthGroups->begin(); it != m->llBandwidthGroups->end(); ++it)
+            for (it = m->llBandwidthGroups->begin();
+                 it != m->llBandwidthGroups->end();
+                 ++it)
             {
                 (*it)->i_commit();
@@ -292 +294 @@
                 /* and add it to the new list */
                 newList->push_back(peer);
-
-                ++it;
             }
 
             /* uninit old peer's controllers that are left */
-            for(it = m->pPeer->m->llBandwidthGroups->begin();
-                it != m->pPeer->m->llBandwidthGroups->end();
-                ++it)
+            for (it = m->pPeer->m->llBandwidthGroups->begin();
+                 it != m->pPeer->m->llBandwidthGroups->end();
+                 ++it)
                 (*it)->uninit();
 
@@ -321 +321 @@
     if (commitBandwidthGroups)
     {
-        for(it = m->llBandwidthGroups->begin();
-            it != m->llBandwidthGroups->end();
-            ++it)
+        for (it = m->llBandwidthGroups->begin();
+             it != m->llBandwidthGroups->end();
+             ++it)
             (*it)->i_commit();
     }
@@ -482 +482 @@
     aBandwidthGroups.resize(0);
     BandwidthGroupList::const_iterator it;
-    for(it = m->llBandwidthGroups->begin();
-        it != m->llBandwidthGroups->end();
-        ++it)
+    for (it = m->llBandwidthGroups->begin();
+         it != m->llBandwidthGroups->end();
+         ++it)
         aBandwidthGroups.push_back(*it);
 
@@ -497 +497 @@
     AssertComRCReturnRC(autoCaller.rc());
     settings::BandwidthGroupList::const_iterator it;
-    for(it = data.llBandwidthGroups.begin();
-        it != data.llBandwidthGroups.end();
-        ++it)
+    for (it = data.llBandwidthGroups.begin();
+         it != data.llBandwidthGroups.end();
+         ++it)
     {
         const settings::BandwidthGroup &gr = *it;
@@ -517 +517 @@
     data.llBandwidthGroups.clear();
     BandwidthGroupList::const_iterator it;
-    for(it = m->llBandwidthGroups->begin();
-        it != m->llBandwidthGroups->end();
-        ++it)
+    for (it = m->llBandwidthGroups->begin();
+         it != m->llBandwidthGroups->end();
+         ++it)
     {
         AutoWriteLock groupLock(*it COMMA_LOCKVAL_SRC_POS);

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

@@ -127 +127 @@
 
         unconst(aThat->m->pPeer) = this;
-        m->bd.attach (aThat->m->bd);
+        m->bd.attach(aThat->m->bd);
     }
     else
@@ -134 +134 @@
 
         AutoReadLock thatLock(aThat COMMA_LOCKVAL_SRC_POS);
-        m->bd.share (aThat->m->bd);
+        m->bd.share(aThat->m->bd);
     }
 
@@ -271 +271 @@
     /* sanity */
     AutoCaller autoCaller(this);
-    AssertComRCReturnVoid (autoCaller.rc());
+    AssertComRCReturnVoid(autoCaller.rc());
 
     /* sanity too */
-    AutoCaller peerCaller (m->pPeer);
-    AssertComRCReturnVoid (peerCaller.rc());
+    AutoCaller peerCaller(m->pPeer);
+    AssertComRCReturnVoid(peerCaller.rc());
 
     /* lock both for writing since we modify both (m->pPeer is "master" so locked
@@ -287 +287 @@
         {
             // attach new data to the peer and reshare it
-            m->pPeer->m->bd.attach (m->bd);
+            m->pPeer->m->bd.attach(m->bd);
         }
     }
@@ -304 +304 @@
     /* sanity */
     AutoCaller autoCaller(this);
-    AssertComRCReturnVoid (autoCaller.rc());
+    AssertComRCReturnVoid(autoCaller.rc());
 
     /* sanity too */
-    AutoCaller peerCaller (m->pPeer);
-    AssertComRCReturnVoid (peerCaller.rc());
+    AutoCaller peerCaller(m->pPeer);
+    AssertComRCReturnVoid(peerCaller.rc());
 
     /* peer is not modified, lock it for reading (m->pPeer is "master" so locked