Changeset 31332 in vbox

Timestamp:

Aug 3, 2010 12:38:49 PM (15 years ago)

Author:

vboxsync

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

64370

Message:

Support passing cpu priority change to a running guest.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (4 diffs)
• SessionImpl.cpp (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (5 diffs)
• include/ConsoleImpl.h (modified) (1 diff)
• include/MachineImpl.h (modified) (2 diffs)
• include/SessionImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -269 +269 @@
         kOnMediumChanged,
         kOnCPUChanged,
+        kOnCPUPriorityChanged,
         kOnVRDPServerChanged,
         kOnRemoteDisplayInfoChanged,
@@ -3809 +3810 @@
     if (SUCCEEDED(rc))
         CONSOLE_DO_CALLBACKS2(OnCPUChanged, aCPU, aRemove);
+
+    LogFlowThisFunc(("Leaving rc=%#x\n", rc));
+    return rc;
+}
+
+/**
+ * Called by IInternalSessionControl::OnCPUPriorityChange().
+ *
+ * @note Locks this object for writing.
+ */
+HRESULT Console::onCPUPriorityChange(ULONG aCpuPriority)
+{
+    LogFlowThisFunc(("\n"));
+
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = S_OK;
+
+    /* don't trigger the CPU priority change if the VM isn't running */
+    if (mpVM)
+    {
+        /* protect mpVM */
+        AutoVMCaller autoVMCaller(this);
+        if (FAILED(autoVMCaller.rc())) return autoVMCaller.rc();
+
+        if (   mMachineState == MachineState_Running
+            || mMachineState == MachineState_Teleporting
+            || mMachineState == MachineState_LiveSnapshotting
+            )
+        {
+            /* No need to call in the EMT thread. */
+            rc = VMR3SetCpuPriority(mpVM, aCpuPriority);
+        }
+        else
+            rc = setInvalidMachineStateError();
+    }
+
+    /* notify console callbacks on success */
+    if (SUCCEEDED(rc))
+        CONSOLE_DO_CALLBACKS1(OnCPUPriorityChanged, aCpuPriority);
 
     LogFlowThisFunc(("Leaving rc=%#x\n", rc));

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1299 +1299 @@
 STDMETHODIMP Machine::COMSETTER(CPUPriority)(ULONG aPriority)
 {
+    HRESULT rc = S_OK;
+
     /* check priority limits */
     if (    aPriority < 1
@@ -1312 +1314 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    /* Todo: must always allow changes. */
-    HRESULT rc = checkStateDependency(MutableStateDep);
+    alock.release();
+    rc = onCPUPriorityChange(aPriority);
+    alock.acquire();
     if (FAILED(rc)) return rc;
 
@@ -1319 +1322 @@
     mHWData.backup();
     mHWData->mCpuPriority = aPriority;
+
+    /* Save settings if online - todo why is this required?? */
+    if (Global::IsOnline(mData->mMachineState))
+        saveSettings(NULL);
 
     return S_OK;
@@ -10715 +10722 @@
 }
 
+HRESULT SessionMachine::onCPUPriorityChange(ULONG aCpuPriority)
+{
+    LogFlowThisFunc(("\n"));
+
+    AutoCaller autoCaller(this);
+    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+
+    ComPtr<IInternalSessionControl> directControl;
+    {
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+        directControl = mData->mSession.mDirectControl;
+    }
+
+    /* ignore notifications sent after #OnSessionEnd() is called */
+    if (!directControl)
+        return S_OK;
+
+    return directControl->OnCPUPriorityChange(aCpuPriority);
+}
+
 /**
  *  @note Locks this object for reading.

trunk/src/VBox/Main/SessionImpl.cpp

@@ -594 +594 @@
 
     return mConsole->onCPUChange(aCPU, aRemove);
+}
+
+STDMETHODIMP Session::OnCPUPriorityChange(ULONG aCpuPriority)
+{
+    LogFlowThisFunc(("\n"));
+
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
+    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
+
+    return mConsole->onCPUPriorityChange(aCpuPriority);
 }
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -12395 +12395 @@
   <interface
      name="IInternalSessionControl" extends="$unknown"
-     uuid="ab161f72-e4b3-44e6-a919-2256474bda66"
+     uuid="ef059f1d-2273-4f81-9342-c152a0d2cd40"
      internal="yes"
      wsmap="suppress"
@@ -12572 +12572 @@
       <param name="add" type="boolean" dir="in">
         <desc>Flag whether the CPU was added or removed</desc>
+      </param>
+    </method>
+
+    <method name="onCPUPriorityChange">
+      <desc>
+         Notification when the CPU priority changes.
+      </desc>
+      <param name="priority" type="unsigned long" dir="in">
+         <desc>The new CPU priority value. (1-100)</desc>
       </param>
     </method>
@@ -13776 +13785 @@
   <enum
      name="VBoxEventType"
-     uuid="7d695029-32b8-4855-86d3-75de9082923b">
+     uuid="2c76667e-6981-4122-a71a-cdfd6a6eb575">
 
     <desc>
@@ -13980 +13989 @@
       </desc>
     </const>
+    <const name="OnCPUPriorityChanged" value="63">
+      <desc>
+        <see>ICPUPriorityChangedEvent</see>
+      </desc>
+    </const>
     <!-- Last event marker -->
-    <const name="Last" value="63">
+    <const name="Last" value="64">
       <desc>
         Must be last event, used for iterations and structures relying on numerical event values.
@@ -14673 +14687 @@
 
   <interface
+    name="ICPUPriorityChangedEvent" extends="IEvent"
+    uuid="657fe2fe-a75a-4cb6-8cf9-072aa41e7d75"
+    wsmap="managed" autogen="VBoxEvent" id="OnCPUPriorityChanged"
+    >
+   <desc>
+      Notification when the CPU priority changes.
+   </desc>
+     <attribute name="priority" type="unsigned long" readonly="yes">
+       <desc>
+         The new CPU priority value. (1-100)
+       </desc>
+     </attribute>
+  </interface>
+
+   <interface
      name="IVRDPServerChangedEvent" extends="IEvent"
      uuid="726038B6-6279-4A7A-8037-D041693D1915"

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

@@ -182 +182 @@
     HRESULT onMediumChange(IMediumAttachment *aMediumAttachment, BOOL aForce);
     HRESULT onCPUChange(ULONG aCPU, BOOL aRemove);
+    HRESULT onCPUPriorityChange(ULONG aCpuPriority);
     HRESULT onVRDPServerChange(BOOL aRestart);
     HRESULT onUSBControllerChange();

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

@@ -616 +616 @@
     virtual HRESULT onStorageControllerChange() { return S_OK; }
     virtual HRESULT onCPUChange(ULONG /* aCPU */, BOOL /* aRemove */) { return S_OK; }
+    virtual HRESULT onCPUPriorityChange(ULONG /* aCpuPriority */) { return S_OK; }
     virtual HRESULT onMediumChange(IMediumAttachment * /* mediumAttachment */, BOOL /* force */) { return S_OK; }
     virtual HRESULT onSharedFolderChange() { return S_OK; }
@@ -944 +945 @@
     HRESULT onParallelPortChange(IParallelPort *parallelPort);
     HRESULT onCPUChange(ULONG aCPU, BOOL aRemove);
+    HRESULT onCPUPriorityChange(ULONG aCpuPriority);
     HRESULT onVRDPServerChange(BOOL aRestart);
     HRESULT onUSBControllerChange();

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

@@ -90 +90 @@
     STDMETHOD(OnMediumChange)(IMediumAttachment *aMediumAttachment, BOOL aForce);
     STDMETHOD(OnCPUChange)(ULONG aCPU, BOOL aRemove);
+    STDMETHOD(OnCPUPriorityChange)(ULONG aCpuPriority);
     STDMETHOD(OnVRDPServerChange)(BOOL aRestart);
     STDMETHOD(OnUSBControllerChange)();