Changeset 42382 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 25, 2012 9:35:56 AM (12 years ago)

Author:

vboxsync

Message:

Main/Session+Console+Machine: minimal change to reduce the overhead of normal API client sessions, because they don't need a full Console object with all sub-objects associated with them. Much more work todo if we want to completely eliminate all VM machinery dependency since the methods of Console are a wild mix of VM related and unrelated.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/VBoxHeadless.cpp (modified) (2 diffs)
• VBoxSDL/VBoxSDL.cpp (modified) (1 diff)
• VirtualBox/src/VBoxSnapshotDetailsDlg.cpp (modified) (1 diff)
• VirtualBox/src/globals/VBoxGlobal.cpp (modified) (3 diffs)
• VirtualBox/src/globals/VBoxGlobal.h (modified) (1 diff)
• VirtualBox/src/selector/VBoxSnapshotsWgt.cpp (modified) (2 diffs)
• VirtualBox/src/settings/UISettingsDialogSpecific.cpp (modified) (2 diffs)

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

@@ -43 +43 @@
 #include <VBox/VBoxVideo.h>
 
-#ifdef VBOX_WITH_VIDEO_REC 
+#ifdef VBOX_WITH_VIDEO_REC
 #include <cstdlib>
 #include <cerrno>
@@ -827 +827 @@
 
         // open a session
-        CHECK_ERROR_BREAK(m, LockMachine(session, LockType_Write));
+        CHECK_ERROR_BREAK(m, LockMachine(session, LockType_VM));
         fSessionOpened = true;
 

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

@@ -1415 +1415 @@
     AssertReleaseRC(vrc);
 
-    rc = pMachine->LockMachine(pSession, LockType_Write);
+    rc = pMachine->LockMachine(pSession, LockType_VM);
     if (FAILED(rc))
     {

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp

@@ -112 +112 @@
 
     /* We need a session when we manipulate the snapshot data of a machine. */
-    CSession session = vboxGlobal().openSession(mSnapshot.GetMachine().GetId(), true);
+    CSession session = vboxGlobal().openExistingSession(mSnapshot.GetMachine().GetId());
     if (session.isNull())
         return;

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

@@ -469 +469 @@
     AssertMsg(!m_pVirtualMachine, ("Machine already started"));
 
-    /* Create session: */
-    CSession session = vboxGlobal().openSession(strMachineId);
+    /* Create VM session: */
+    CSession session = vboxGlobal().openSession(strMachineId, KLockType_VM);
     if (session.isNull())
         return false;
@@ -1813 +1813 @@
  *
  *  @param aId          Machine ID.
- *  @param aExisting    @c true to open an existing session with the machine
- *                      which is already running, @c false to open a new direct
- *                      session.
- */
-CSession VBoxGlobal::openSession(const QString &aId, bool aExisting /* = false */)
+ *  @param aLockType    @c KLockType_Shared to open an existing session with
+ *                      the machine which is already running, @c KLockType_Write
+ *                      to open a new direct session, @c KLockType_VM to open
+ *                      a new session for running a VM in this process.
+ */
+CSession VBoxGlobal::openSession(const QString &aId, KLockType aLockType /* = KLockType_Shared */)
 {
     CSession session;
@@ -1830 +1831 @@
     if (!foundMachine.isNull())
     {
-        foundMachine.LockMachine(session,
-                                 (aExisting) ? KLockType_Shared : KLockType_Write);
+        foundMachine.LockMachine(session, aLockType);
         if (session.GetType() == KSessionType_Shared)
         {

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

@@ -239 +239 @@
 #endif
 
-    CSession openSession(const QString &aId, bool aExisting = false);
+    CSession openSession(const QString &aId, KLockType aLockType = KLockType_Write);
 
     /** Shortcut to openSession (aId, true). */
-    CSession openExistingSession(const QString &aId) { return openSession (aId, true); }
+    CSession openExistingSession(const QString &aId) { return openSession(aId, KLockType_Shared); }
 
     void startEnumeratingMedia();

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp

@@ -645 +645 @@
     /* Open a direct session (this call will handle all errors) */
     bool busy = mSessionState != KSessionState_Unlocked;
-    CSession session = vboxGlobal().openSession (mMachineId, busy /* aExisting */);
+    CSession session;
+    if (busy)
+        session = vboxGlobal().openExistingSession(mMachineId);
+    else
+        session = vboxGlobal().openSession(mMachineId);
     if (session.isNull())
         return;
@@ -779 +783 @@
 
     /* Open a session to work with corresponding VM: */
-    CSession session = vboxGlobal().openSession(mMachineId,
-                                                mSessionState != KSessionState_Unlocked /* connect to existing */);
+    CSession session;
+    if (mSessionState != KSessionState_Unlocked)
+        session = vboxGlobal().openExistingSession(mMachineId);
+    else
+        session = vboxGlobal().openSession(mMachineId);
     fIsValid = !session.isNull();
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -748 +748 @@
 
     /* Prepare session: */
-    m_session = dialogType() == SettingsDialogType_Wrong ? CSession() : vboxGlobal().openSession(m_strMachineId, true /* shared */);
+    m_session = dialogType() == SettingsDialogType_Wrong ? CSession() : vboxGlobal().openExistingSession(m_strMachineId);
     /* Check that session was created: */
     if (m_session.isNull())
@@ -787 +787 @@
 
     /* Prepare session: */
-    bool fSessionShared = dialogType() != SettingsDialogType_Offline;
-    m_session = dialogType() == SettingsDialogType_Wrong ? CSession() : vboxGlobal().openSession(m_strMachineId, fSessionShared);
+    if (dialogType() == SettingsDialogType_Wrong)
+        m_session = CSession();
+    else if (dialogType() != SettingsDialogType_Offline)
+        m_session = vboxGlobal().openExistingSession(m_strMachineId);
+    else
+        m_session = vboxGlobal().openSession(m_strMachineId);
     /* Check that session was created: */
     if (m_session.isNull())