Changeset 78779 in vbox for trunk/src/VBox/Main

Timestamp:

May 27, 2019 10:22:15 AM (6 years ago)

Author:

vboxsync

Message:

Main: Cache the VBoxInternal2/TurnResetIntoPowerOff value so we don't have to release the console lock in Console::powerDown when it's not active, as this introduces a race condition wrt the VM state. It also avoid some IPC during power off, which is nice.

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (7 diffs)
• src-client/ConsoleImpl2.cpp (modified) (1 diff)

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

@@ -865 +865 @@
 #endif
 
-    bool i_isResetTurnedIntoPowerOff(void);
-
     /** @name Disk encryption support
      * @{ */
@@ -941 +939 @@
     /** true if a USB controller is available (i.e. USB devices can be attached). */
     bool mfVMHasUsbController : 1;
+    /** Shadow of the VBoxInternal2/TurnResetIntoPowerOff extra data setting.
+     * This is initialized by Console::i_configConstructorInner(). */
+    bool mfTurnResetIntoPowerOff : 1;
     /** true if the VM power off was caused by reset. */
     bool mfPowerOffCausedByReset : 1;

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -275 +275 @@
 inline static const char *networkAdapterTypeToName(NetworkAdapterType_T adapterType);
 
-class VmEventListener {
+class VmEventListener
+{
 public:
     VmEventListener()
@@ -328 +329 @@
                     break;
                 mConsole->i_onNATRedirectRuleChange(ulSlot, fRemove, proto, hostIp.raw(), hostPort, guestIp.raw(), guestPort);
+                break;
             }
-            break;
 
             case VBoxEventType_OnHostNameResolutionConfigurationChange:
@@ -398 +399 @@
     , mfSnapshotFolderDiskTypeShown(false)
     , mfVMHasUsbController(false)
+    , mfTurnResetIntoPowerOff(false)
     , mfPowerOffCausedByReset(false)
     , mpVmm2UserMethods(NULL)
@@ -1080 +1082 @@
 
 #endif /* VBOX_WITH_GUEST_PROPS */
-
-bool Console::i_isResetTurnedIntoPowerOff(void)
-{
-    Bstr value;
-    HRESULT hrc = mMachine->GetExtraData(Bstr("VBoxInternal2/TurnResetIntoPowerOff").raw(),
-                                         value.asOutParam());
-    if (   hrc   == S_OK
-        && value == "1")
-        return true;
-    return false;
-}
 
 #ifdef VBOX_WITH_EXTPACK
@@ -2193 +2184 @@
 
 #ifdef VBOX_WITH_GUEST_PROPS
-    alock.release(); /** @todo r=bird: This code introduces a race condition wrt to the state.  This must be done elsewhere! */
-
-    if (i_isResetTurnedIntoPowerOff())
-    {
+    if (mfTurnResetIntoPowerOff)
+    {
+        alock.release(); /** @todo r=bird: This code introduces a race condition wrt to the state.  This must be done elsewhere! */
         mMachine->DeleteGuestProperty(Bstr("/VirtualBox/HostInfo/VMPowerOffReason").raw());
         mMachine->SetGuestProperty(Bstr("/VirtualBox/HostInfo/VMPowerOffReason").raw(),
                                    Bstr("PowerOff").raw(), Bstr("RDONLYGUEST").raw());
         mMachine->SaveSettings();
-    }
-
-    alock.acquire();
+        alock.acquire();
+    }
 #endif
 
@@ -6052 +6041 @@
     if (ptrVM.isOk())
     {
-        Bstr strKey(aKey);
-        Bstr strVal(aVal);
-
-        if (strKey == "VBoxInternal2/TurnResetIntoPowerOff")
-        {
-            int vrc = VMR3SetPowerOffInsteadOfReset(ptrVM.rawUVM(), strVal == "1");
+        if (RTUtf16CmpAscii(aKey, "VBoxInternal2/TurnResetIntoPowerOff") == 0)
+        {
+            mfTurnResetIntoPowerOff = RTUtf16CmpAscii(aVal, "1") == 0;
+            int vrc = VMR3SetPowerOffInsteadOfReset(ptrVM.rawUVM(), mfTurnResetIntoPowerOff);
             AssertRC(vrc);
         }
@@ -8791 +8778 @@
         {
 #ifdef VBOX_WITH_GUEST_PROPS
-            if (that->i_isResetTurnedIntoPowerOff())
+            if (that->mfTurnResetIntoPowerOff)
             {
                 Bstr strPowerOffReason;

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1204 +1204 @@
 
         /* Reset overwrite. */
-        if (i_isResetTurnedIntoPowerOff())
+        mfTurnResetIntoPowerOff = GetExtraDataBoth(virtualBox, pMachine,
+                                                   "VBoxInternal2/TurnResetIntoPowerOff", &strTmp)->equals("1");
+        if (mfTurnResetIntoPowerOff)
             InsertConfigInteger(pRoot, "PowerOffInsteadOfReset", 1);