Changeset 32885 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Oct 4, 2010 12:56:35 PM (14 years ago)

Author:

vboxsync

Message:

Renaming cpu priority to cpu execution cap

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -196 +196 @@
     mIoCacheSize    = 5; /* 5MB */
 
-    /* Maximum CPU priority by default. */
-    mCpuPriority = 100;
+    /* Maximum CPU execution cap by default. */
+    mCpuExecutionCap = 100;
 }
 
@@ -1314 +1314 @@
 }
 
-STDMETHODIMP Machine::COMGETTER(CPUPriority)(ULONG *aPriority)
-{
-    if (!aPriority)
+STDMETHODIMP Machine::COMGETTER(CPUExecutionCap)(ULONG *aExecutionCap)
+{
+    if (!aExecutionCap)
         return E_POINTER;
 
@@ -1324 +1324 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aPriority = mHWData->mCpuPriority;
-
-    return S_OK;
-}
-
-STDMETHODIMP Machine::COMSETTER(CPUPriority)(ULONG aPriority)
+    *aExecutionCap = mHWData->mCpuExecutionCap;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(CPUExecutionCap)(ULONG aExecutionCap)
 {
     HRESULT rc = S_OK;
 
-    /* check priority limits */
-    if (    aPriority < 1
-         || aPriority > 100
+    /* check throttle limits */
+    if (    aExecutionCap < 1
+         || aExecutionCap > 100
        )
         return setError(E_INVALIDARG,
-                        tr("Invalid CPU priority: %lu (must be in range [%lu, %lu])"),
-                        aPriority, 1, 100);
+                        tr("Invalid CPU execution cap value: %lu (must be in range [%lu, %lu])"),
+                        aExecutionCap, 1, 100);
 
     AutoCaller autoCaller(this);
@@ -1347 +1347 @@
 
     alock.release();
-    rc = onCPUPriorityChange(aPriority);
+    rc = onCpuExecutionCapChange(aExecutionCap);
     alock.acquire();
     if (FAILED(rc)) return rc;
@@ -1353 +1353 @@
     setModified(IsModified_MachineData);
     mHWData.backup();
-    mHWData->mCpuPriority = aPriority;
+    mHWData->mCpuExecutionCap = aExecutionCap;
 
     /* Save settings if online - todo why is this required?? */
@@ -7021 +7021 @@
         mHWData->mCPUCount                    = data.cCPUs;
         mHWData->mCPUHotPlugEnabled           = data.fCpuHotPlug;
-        mHWData->mCpuPriority                 = data.ulCpuPriority;
+        mHWData->mCpuExecutionCap             = data.ulCpuExecutionCap;
 
         // cpu
@@ -8070 +8070 @@
         }
 
-        data.cCPUs         = mHWData->mCPUCount;
-        data.fCpuHotPlug   = !!mHWData->mCPUHotPlugEnabled;
-        data.ulCpuPriority = mHWData->mCpuPriority;
+        data.cCPUs             = mHWData->mCPUCount;
+        data.fCpuHotPlug       = !!mHWData->mCPUHotPlugEnabled;
+        data.ulCpuExecutionCap = mHWData->mCpuExecutionCap;
 
         data.llCpus.clear();
@@ -10991 +10991 @@
 }
 
-HRESULT SessionMachine::onCPUPriorityChange(ULONG aCpuPriority)
+HRESULT SessionMachine::onCPUExecutionCapChange(ULONG aExecutionCap)
 {
     LogFlowThisFunc(("\n"));
@@ -11008 +11008 @@
         return S_OK;
 
-    return directControl->OnCPUPriorityChange(aCpuPriority);
+    return directControl->OnCPUExecutionCapChange(aExecutionCap);
 }