Changeset 61169 in vbox for trunk

Timestamp:

May 24, 2016 4:33:27 PM (9 years ago)

Author:

vboxsync

Message:

8238 VBoxSVC settings - BandwidthGroupImpl

Location:

trunk/src/VBox/Main

Files:

• include/BandwidthGroupImpl.h (modified) (4 diffs)
• src-server/BandwidthGroupImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/include/BandwidthGroupImpl.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 #define ____H_BANDWIDTHGROUPIMPL
 
+#include <VBox/settings.h>
 #include "BandwidthControlImpl.h"
 #include "BandwidthGroupWrap.h"
@@ -51 +52 @@
 
     ComObjPtr<BandwidthGroup> i_getPeer() { return m->pPeer; }
-    const Utf8Str &i_getName() const { return m->bd->strName; }
-    BandwidthGroupType_T i_getType() const { return m->bd->enmType; }
-    LONG64 i_getMaxBytesPerSec() const { return m->bd->aMaxBytesPerSec; }
+    const Utf8Str &i_getName() const { return m->bd->mData.strName; }
+    BandwidthGroupType_T i_getType() const { return m->bd->mData.enmType; }
+    LONG64 i_getMaxBytesPerSec() const { return m->bd->mData.cMaxBytesPerSec; }
     ULONG i_getReferences() const { return m->bd->cReferences; }
 
@@ -74 +75 @@
     {
        BackupableBandwidthGroupData()
-           : enmType(BandwidthGroupType_Null),
-             aMaxBytesPerSec(0),
-             cReferences(0)
+           : cReferences(0)
        { }
 
-       Utf8Str                 strName;
-       BandwidthGroupType_T    enmType;
-       LONG64                  aMaxBytesPerSec;
-       ULONG                   cReferences;
+       settings::BandwidthGroup mData;
+       ULONG                    cReferences;
     };
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -78 +78 @@
     m->bd.allocate();
 
-    m->bd->strName = aName;
-    m->bd->enmType = aType;
+    m->bd->mData.strName = aName;
+    m->bd->mData.enmType = aType;
     m->bd->cReferences = 0;
-    m->bd->aMaxBytesPerSec = aMaxBytesPerSec;
+    m->bd->mData.cMaxBytesPerSec = aMaxBytesPerSec;
 
     /* Confirm a successful initialization */
@@ -201 +201 @@
 {
     /* mName is constant during life time, no need to lock */
-    aName = m->bd.data()->strName;
+    aName = m->bd.data()->mData.strName;
 
     return S_OK;
@@ -209 +209 @@
 {
     /* type is constant during life time, no need to lock */
-    *aType = m->bd->enmType;
+    *aType = m->bd->mData.enmType;
 
     return S_OK;
@@ -227 +227 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aMaxBytesPerSec = m->bd->aMaxBytesPerSec;
+    *aMaxBytesPerSec = m->bd->mData.cMaxBytesPerSec;
 
     return S_OK;
@@ -241 +241 @@
 
     m->bd.backup();
-    m->bd->aMaxBytesPerSec = aMaxBytesPerSec;
+    m->bd->mData.cMaxBytesPerSec = aMaxBytesPerSec;
 
     /* inform direct session if any. */