Changeset 32851 in vbox for trunk/src/VBox/Main/ConsoleImpl2.cpp

Timestamp:

Sep 30, 2010 3:12:55 PM (14 years ago)

Author:

vboxsync

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

66324

Message:

Main: defer creation of the VMMDev instance in Console to Console::powerUpThread so that the VMMDev with the HGCM thread only gets created for session/console pairs any more which actually power up a VM; this avoids creating dozens of HGCM threads for every single session even if it never starts a VM; some more Console code cleanup while we're at it

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox/Main/ConsoleImpl2.cpp (modified) (14 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -495 +495 @@
     pConsole->mpVM = pVM;
 
+    VMMDev *pVMMDev = pConsole->m_pVMMDev;
+    Assert(pVMMDev);
+
     ComPtr<IMachine> pMachine = pConsole->machine();
 
@@ -1811 +1814 @@
         InsertConfigString(pLunL0, "Driver",               "HGCM");
         InsertConfigNode(pLunL0,   "Config", &pCfg);
-        VMMDev *pVMMDev = pConsole->mVMMDev;
         InsertConfigInteger(pCfg,  "Object", (uintptr_t)pVMMDev);
 
@@ -2145 +2147 @@
             {
                 /* Load the service */
-                rc = pConsole->mVMMDev->hgcmLoadService("VBoxSharedClipboard", "VBoxSharedClipboard");
+                rc = pVMMDev->hgcmLoadService("VBoxSharedClipboard", "VBoxSharedClipboard");
 
                 if (RT_FAILURE(rc))
@@ -2189 +2191 @@
                     }
 
-                    pConsole->mVMMDev->hgcmHostCall("VBoxSharedClipboard", VBOX_SHARED_CLIPBOARD_HOST_FN_SET_MODE, 1, &parm);
+                    pVMMDev->hgcmHostCall("VBoxSharedClipboard", VBOX_SHARED_CLIPBOARD_HOST_FN_SET_MODE, 1, &parm);
 
                     Log(("Set VBoxSharedClipboard mode\n"));
@@ -2207 +2209 @@
             {
                 /* Load the service */
-                rc = pConsole->mVMMDev->hgcmLoadService("VBoxSharedCrOpenGL", "VBoxSharedCrOpenGL");
+                rc = pVMMDev->hgcmLoadService("VBoxSharedCrOpenGL", "VBoxSharedCrOpenGL");
                 if (RT_FAILURE(rc))
                 {
@@ -2225 +2227 @@
                     parm.u.pointer.size = sizeof(IConsole *);
 
-                    rc = pConsole->mVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SET_CONSOLE,
-                                                        SHCRGL_CPARMS_SET_CONSOLE, &parm);
+                    rc = pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SET_CONSOLE, SHCRGL_CPARMS_SET_CONSOLE, &parm);
                     if (!RT_SUCCESS(rc))
                         AssertMsgFailed(("SHCRGL_HOST_FN_SET_CONSOLE failed with %Rrc\n", rc));
@@ -2232 +2233 @@
                     parm.u.pointer.addr = pVM;
                     parm.u.pointer.size = sizeof(pVM);
-                    rc = pConsole->mVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SET_VM,
-                                                        SHCRGL_CPARMS_SET_VM, &parm);
+                    rc = pVMMDev->hgcmHostCall("VBoxSharedCrOpenGL", SHCRGL_HOST_FN_SET_VM, SHCRGL_CPARMS_SET_VM, &parm);
                     if (!RT_SUCCESS(rc))
                         AssertMsgFailed(("SHCRGL_HOST_FN_SET_VM failed with %Rrc\n", rc));
@@ -4187 +4187 @@
     parms[3].u.pointer.size = 0;  /* We don't actually care. */
 
-    pVMMDev->hgcmHostCall ("VBoxGuestPropSvc", guestProp::SET_PROPS_HOST, 4,
-                           &parms[0]);
+    pVMMDev->hgcmHostCall("VBoxGuestPropSvc",
+                          guestProp::SET_PROPS_HOST,
+                          4,
+                          &parms[0]);
 }
 
@@ -4194 +4196 @@
  * Set a single guest property
  */
-static void configSetProperty(VMMDev * const pVMMDev, const char *pszName,
-                              const char *pszValue, const char *pszFlags)
+static void configSetProperty(VMMDev * const pVMMDev,
+                              const char *pszName,
+                              const char *pszValue,
+                              const char *pszFlags)
 {
     VBOXHGCMSVCPARM parms[4];
@@ -4251 +4255 @@
     AssertReturn(pvConsole, VERR_GENERAL_FAILURE);
     ComObjPtr<Console> pConsole = static_cast<Console *>(pvConsole);
+    AssertReturn(pConsole->m_pVMMDev, VERR_GENERAL_FAILURE);
 
     /* Load the service */
-    int rc = pConsole->mVMMDev->hgcmLoadService("VBoxGuestPropSvc", "VBoxGuestPropSvc");
+    int rc = pConsole->m_pVMMDev->hgcmLoadService("VBoxGuestPropSvc", "VBoxGuestPropSvc");
 
     if (RT_FAILURE(rc))
@@ -4271 +4276 @@
 
         /* Sysprep execution by VBoxService. */
-        configSetProperty(pConsole->mVMMDev,
+        configSetProperty(pConsole->m_pVMMDev,
                           "/VirtualBox/HostGuest/SysprepExec", "",
                           "TRANSIENT, RDONLYGUEST");
-        configSetProperty(pConsole->mVMMDev,
+        configSetProperty(pConsole->m_pVMMDev,
                           "/VirtualBox/HostGuest/SysprepArgs", "",
                           "TRANSIENT, RDONLYGUEST");
@@ -4327 +4332 @@
             }
             if (RT_SUCCESS(rc))
-                configSetProperties(pConsole->mVMMDev,
+                configSetProperties(pConsole->m_pVMMDev,
                                     (void *)papszNames,
                                     (void *)papszValues,
@@ -4355 +4360 @@
          */
         /* Set the VBox version string as a guest property */
-        configSetProperty(pConsole->mVMMDev, "/VirtualBox/HostInfo/VBoxVer",
+        configSetProperty(pConsole->m_pVMMDev, "/VirtualBox/HostInfo/VBoxVer",
                           VBOX_VERSION_STRING, "TRANSIENT, RDONLYGUEST");
         /* Set the VBox SVN revision as a guest property */
-        configSetProperty(pConsole->mVMMDev, "/VirtualBox/HostInfo/VBoxRev",
+        configSetProperty(pConsole->m_pVMMDev, "/VirtualBox/HostInfo/VBoxRev",
                           RTBldCfgRevisionStr(), "TRANSIENT, RDONLYGUEST");
 
@@ -4393 +4398 @@
 
     /* Load the service */
-    int rc = pConsole->mVMMDev->hgcmLoadService("VBoxGuestControlSvc", "VBoxGuestControlSvc");
+    int rc = pConsole->m_pVMMDev->hgcmLoadService("VBoxGuestControlSvc", "VBoxGuestControlSvc");
 
     if (RT_FAILURE(rc))