Changeset 26067 in vbox for trunk/src/VBox

Timestamp:

Jan 27, 2010 1:33:54 PM (15 years ago)

Author:

vboxsync

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

56994

Message:

Main/Session+Console: By default, create a console with no sub-objects (saves resources). VM processes need to explicitly ask for a full console when before opening the session.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxFB/VBoxFB.cpp (modified) (4 diffs)
• Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (2 diffs)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (4 diffs)
• Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (4 diffs)
• Frontends/VirtualBox/src/globals/VBoxGlobal.h (modified) (2 diffs)
• Main/ConsoleImpl.cpp (modified) (3 diffs)
• Main/SessionImpl.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/ConsoleImpl.h (modified) (2 diffs)
• Main/include/SessionImpl.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxFB/VBoxFB.cpp

@@ -9 +9 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27 +27 @@
 #include "Framebuffer.h"
 #include <getopt.h>
+#include <VBox/version.h>
 #include <VBox/param.h>
 #include <iprt/path.h>
@@ -210 +211 @@
         {
             printf("Error: could not instantiate Session object! rc = %08X\n", rc);
+            exit(-1);
+        }
+
+        rc = session->SetFullConsole(true);
+        if (NS_FAILED(rc))
+        {
+            printf("Error: could not select full VM console! rc = %08X\n", rc);
             exit(-1);
         }
@@ -545 +553 @@
                             buttonState |= MouseButtonState::MiddleButton;
                         mouse->PutMouseEvent(mouseXDelta, mouseYDelta, mouseZDelta,
-                                             buttonState);
+                                             0, buttonState);
                         break;
                     }

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -877 +877 @@
               Utf8Str(id).raw()));
 
+        // make sure we ge a full featured VM console
+        CHECK_ERROR_BREAK(session, COMSETTER(FullConsole)(true));
+
         // open a session
         CHECK_ERROR_BREAK(virtualBox, OpenSession (session, id));

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1488 +1488 @@
     AssertReleaseRC(vrc);
 
+    rc = session->COMSETTER(FullConsole)(true);
+    if (FAILED(rc))
+    {
+        com::ErrorInfo info;
+        if (info.isFullAvailable())
+            PrintError("Could not select a full VM console",
+                    info.getText().raw(), info.getComponent().raw());
+        goto leave;
+    }
     rc = virtualBox->OpenSession(session, uuidVM.toUtf16());
     if (FAILED(rc))
@@ -1495 +1504 @@
             PrintError("Could not open VirtualBox session",
                     info.getText().raw(), info.getComponent().raw());
-        goto leave;
-    }
-    if (!session)
-    {
-        RTPrintf("Could not open VirtualBox session!\n");
         goto leave;
     }
@@ -2916 +2920 @@
     callback.setNull();
     consoleCallback.setNull();
-    
+
     LogFlow(("Uninitializing COM...\n"));
     com::Shutdown();

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -2190 +2190 @@
  *                      which is already running, @c false to open a new direct
  *                      session.
- */
-CSession VBoxGlobal::openSession (const QString &aId, bool aExisting /* = false */)
+ *  @param aFullConsole @c true to create a full console, suitable of running
+ *                      a VM, @c false to create a minimal console suitable
+ *                      for API clients. Only significant if @a aExisting is
+ *                      @false.
+ */
+CSession VBoxGlobal::openSession (const QString &aId, bool aExisting /* = false */, bool aFullConsole /* = false */)
 {
     CSession session;
@@ -2205 +2209 @@
     else
     {
+        session.SetFullConsole(aFullConsole);
         mVBox.OpenSession (session, aId);
         CMachine machine = session.GetMachine ();
@@ -2231 +2236 @@
     AssertReturn (mValid, false);
 
-    CSession session = vboxGlobal().openSession (id);
+    CSession session = vboxGlobal().openSession (id, false, true);
     if (session.isNull())
         return false;

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -670 +670 @@
 #endif
 
-    CSession openSession (const QString &aId, bool aExisting = false);
+    CSession openSession (const QString &aId, bool aExisting = false, bool aFullConsole = false);
 
     /** Shortcut to openSession (aId, true). */

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -308 +308 @@
 /////////////////////////////////////////////////////////////////////////////
 
-HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl)
+HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl,
+                      bool aFullConsole)
 {
     AssertReturn(aMachine && aControl, E_INVALIDARG);
@@ -331 +332 @@
     AssertComRCReturnRC(rc);
 
+    if (aFullConsole)
+    {
 #ifdef VBOX_WITH_VRDP
-    rc = mMachine->COMGETTER(VRDPServer)(unconst(mVRDPServer).asOutParam());
-    AssertComRCReturnRC(rc);
+        rc = mMachine->COMGETTER(VRDPServer)(unconst(mVRDPServer).asOutParam());
+        AssertComRCReturnRC(rc);
 #endif
 
-    /* Create associated child COM objects */
-
-    unconst(mGuest).createObject();
-    rc = mGuest->init(this);
-    AssertComRCReturnRC(rc);
-
-    unconst(mKeyboard).createObject();
-    rc = mKeyboard->init(this);
-    AssertComRCReturnRC(rc);
-
-    unconst(mMouse).createObject();
-    rc = mMouse->init(this);
-    AssertComRCReturnRC(rc);
-
-    unconst(mDisplay).createObject();
-    rc = mDisplay->init(this);
-    AssertComRCReturnRC(rc);
-
-    unconst(mRemoteDisplayInfo).createObject();
-    rc = mRemoteDisplayInfo->init(this);
-    AssertComRCReturnRC(rc);
-
-    /* Grab global and machine shared folder lists */
-
-    rc = fetchSharedFolders(true /* aGlobal */);
-    AssertComRCReturnRC(rc);
-    rc = fetchSharedFolders(false /* aGlobal */);
-    AssertComRCReturnRC(rc);
-
-    /* Create other child objects */
-
-    unconst(mConsoleVRDPServer) = new ConsoleVRDPServer(this);
-    AssertReturn(mConsoleVRDPServer, E_FAIL);
+        /* Create associated child COM objects */
+
+        unconst(mGuest).createObject();
+        rc = mGuest->init(this);
+        AssertComRCReturnRC(rc);
+
+        unconst(mKeyboard).createObject();
+        rc = mKeyboard->init(this);
+        AssertComRCReturnRC(rc);
+
+        unconst(mMouse).createObject();
+        rc = mMouse->init(this);
+        AssertComRCReturnRC(rc);
+
+        unconst(mDisplay).createObject();
+        rc = mDisplay->init(this);
+        AssertComRCReturnRC(rc);
+
+        unconst(mRemoteDisplayInfo).createObject();
+        rc = mRemoteDisplayInfo->init(this);
+        AssertComRCReturnRC(rc);
+
+        /* Grab global and machine shared folder lists */
+
+        rc = fetchSharedFolders(true /* aGlobal */);
+        AssertComRCReturnRC(rc);
+        rc = fetchSharedFolders(false /* aGlobal */);
+        AssertComRCReturnRC(rc);
+
+        /* Create other child objects */
+
+        unconst(mConsoleVRDPServer) = new ConsoleVRDPServer(this);
+        AssertReturn(mConsoleVRDPServer, E_FAIL);
+
+        unconst(mVMMDev) = new VMMDev(this);
+        AssertReturn(mVMMDev, E_FAIL);
+
+        unconst(mAudioSniffer) = new AudioSniffer(this);
+        AssertReturn(mAudioSniffer, E_FAIL);
+    }
 
     mcAudioRefs = 0;
     mcVRDPClients = 0;
     mu32SingleRDPClientId = 0;
-
-    unconst(mVMMDev) = new VMMDev(this);
-    AssertReturn(mVMMDev, E_FAIL);
-
-    unconst(mAudioSniffer) = new AudioSniffer(this);
-    AssertReturn(mAudioSniffer, E_FAIL);
 
     /* Confirm a successful initialization when it's the case */

trunk/src/VBox/Main/SessionImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -89 +89 @@
     mState = SessionState_Closed;
     mType = SessionType_Null;
+    mFullConsole = false;
 
 #if defined(RT_OS_WINDOWS)
@@ -176 +177 @@
 }
 
+STDMETHODIMP Session::COMSETTER(FullConsole) (BOOL aFullConsole)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    AssertReturn(mState == SessionState_Closed, VBOX_E_INVALID_VM_STATE);
+
+    mFullConsole = aFullConsole;
+    return S_OK;
+}
+
+STDMETHODIMP Session::COMGETTER(FullConsole) (BOOL *aFullConsole)
+{
+    CheckComArgOutPointerValid(aFullConsole);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aFullConsole = mFullConsole;
+    return S_OK;
+}
+
 STDMETHODIMP Session::COMGETTER(Machine) (IMachine **aMachine)
 {
@@ -319 +346 @@
 
     rc = mConsole.createObject();
-    AssertComRCReturn (rc, rc);
-
-    rc = mConsole->init (aMachine, mControl);
-    AssertComRCReturn (rc, rc);
+    AssertComRCReturn(rc, rc);
+
+    rc = mConsole->init(aMachine, mControl, mFullConsole);
+    AssertComRCReturn(rc, rc);
 
     rc = grabIPCSemaphore();

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

@@ -12960 +12960 @@
   <interface
      name="ISession" extends="$dispatched"
-     uuid="12F4DCDB-12B2-4EC1-B7CD-DDD9F6C5BF4D"
+     uuid="37661fa3-385b-4b2b-8b22-93304c45f36e"
      wsmap="managed"
      >
@@ -13015 +13015 @@
       is open within one process, no any other process may open another direct
       session for the same machine. This prevents the machine from being changed
-      by other processes while it is running or while the machine is being configured.
+      by other processes while it is running or while the machine is being
+      configured. If the current process is should have a full Console
+      object with all associated sub-objects, remember to set
+      <link to="ISession::fullConsole"/> appropriately.
       </li>
       </ul>
@@ -13047 +13050 @@
         SessionType_SessionOpen), otherwise an error will be returned.
       </desc>
+    </attribute>
+
+    <attribute name="fullConsole" type="boolean">
+      <desc>Defines whether the console object is meant for full VMs,
+      which have the associated sub-objects, or if it is unnecessary to
+      create them. Default is @c false.</desc>
     </attribute>
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -103 +103 @@
 
     // public initializers/uninitializers for internal purposes only
-    HRESULT init (IMachine *aMachine, IInternalMachineControl *aControl);
+    HRESULT init (IMachine *aMachine, IInternalMachineControl *aControl,
+                  bool aFullConsole);
     void uninit();
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -78 +78 @@
     STDMETHOD(COMGETTER(State)) (SessionState_T *aState);
     STDMETHOD(COMGETTER(Type)) (SessionType_T *aType);
+    STDMETHOD(COMSETTER(FullConsole)) (BOOL aType);
+    STDMETHOD(COMGETTER(FullConsole)) (BOOL *aType);
     STDMETHOD(COMGETTER(Machine)) (IMachine **aMachine);
     STDMETHOD(COMGETTER(Console)) (IConsole **aConsole);
@@ -122 +124 @@
     SessionState_T mState;
     SessionType_T mType;
+    bool mFullConsole;
 
     ComPtr<IInternalMachineControl> mControl;