Changeset 53000 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 8, 2014 4:55:32 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI rework/cleanup for 7115 (part #9): Caching CSession in UISession instead of UIMachine; Improving UIMachine prepare/cleanup stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (7 diffs)
• UIMachine.h (modified) (3 diffs)
• UISession.cpp (modified) (7 diffs)
• UISession.h (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -32 +32 @@
 /* COM includes: */
 # include "CMachine.h"
+# include "CSession.h"
 # include "CConsole.h"
 # include "CSnapshot.h"
@@ -150 +151 @@
     }
 
+    /* Try to create machine UI: */
+    return create();
+}
+
+/* static */
+bool UIMachine::create()
+{
+    /* Make sure machine is null pointer: */
+    AssertReturn(m_spInstance == 0, false);
+
     /* Create machine UI: */
     new UIMachine;
-    /* Prepare machine UI: */
-    return m_spInstance->prepare();
+    /* Make sure it's prepared: */
+    if (!m_spInstance->prepare())
+    {
+        /* Destroy machine UI otherwise: */
+        destroy();
+        /* False in that case: */
+        return false;
+    }
+    /* True by default: */
+    return true;
 }
 
@@ -159 +178 @@
 void UIMachine::destroy()
 {
+    /* Make sure machine is valid pointer: */
+    AssertReturnVoid(m_spInstance != 0);
+
     /* Cleanup machine UI: */
     m_spInstance->cleanup();
@@ -229 +251 @@
 bool UIMachine::prepare()
 {
-    /* Create VM session: */
-    m_session = vboxGlobal().openSession(vboxGlobal().managedVMUuid(),
-                                         vboxGlobal().isSeparateProcess() ? KLockType_Shared : KLockType_VM);
-    if (m_session.isNull())
+    /* Try to create session UI: */
+    if (!UISession::create(m_pSession, this))
         return false;
-
-    /* Create UI session: */
-    m_pSession = new UISession(this, m_session);
 
     /* Preventing application from closing in case of window(s) closed: */
@@ -272 +289 @@
 {
     /* Load 'visual state' option: */
+    if (uisession())
     {
         /* Load restricted visual states: */
@@ -299 +317 @@
 {
     /* Save 'visual state' option: */
+    if (uisession())
     {
         /* Get requested visual state: */
@@ -324 +343 @@
     m_pVisualState = 0;
 
-    /* Delete UI session: */
-    delete m_pSession;
-    m_pSession = 0;
-
-    /* Free session finally: */
-    m_session.UnlockMachine();
-    m_session.detach();
+    /* Destroy session UI if necessary: */
+    if (uisession())
+        UISession::destroy(m_pSession);
 
     /* Quit application: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -27 +27 @@
 /* COM includes: */
 #include "COMEnums.h"
-#include "CSession.h"
 
 /* Forward declarations: */
@@ -51 +50 @@
       * @return true if machine was started, false otherwise. */
     static bool startMachine(const QString &strID);
+    /** Static constructor. */
+    static bool create();
     /** Static destructor. */
     static void destroy();
@@ -96 +97 @@
     static UIMachine* m_spInstance;
 
-    /** Holds the session instance. */
-    CSession m_session;
-
     /** Holds the session UI instance. */
     UISession *m_pSession;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -128 +128 @@
 #endif /* Q_WS_MAC */
 
-UISession::UISession(UIMachine *pMachine, CSession &sessionReference)
+/* static */
+bool UISession::create(UISession *&pSession, UIMachine *pMachine)
+{
+    /* Make sure null pointer passed: */
+    AssertReturn(pSession == 0, false);
+
+    /* Create session UI: */
+    pSession = new UISession(pMachine);
+    /* Make sure it's prepared: */
+    if (!pSession->prepare())
+    {
+        /* Destroy session UI otherwise: */
+        destroy(pSession);
+        /* False in that case: */
+        return false;
+    }
+    /* True by default: */
+    return true;
+}
+
+/* static */
+void UISession::destroy(UISession *&pSession)
+{
+    /* Make sure valid pointer passed: */
+    AssertReturnVoid(pSession != 0);
+
+    /* Cleanup session UI: */
+    pSession->cleanup();
+    /* Destroy session: */
+    delete pSession;
+    pSession = 0;
+}
+
+UISession::UISession(UIMachine *pMachine)
     : QObject(pMachine)
     /* Base variables: */
     , m_pMachine(pMachine)
-    , m_session(sessionReference)
     , m_pActionPool(0)
 #ifdef Q_WS_MAC
@@ -139 +171 @@
     /* Common variables: */
     , m_machineStatePrevious(KMachineState_Null)
-    , m_machineState(session().GetMachine().GetState())
+    , m_machineState(KMachineState_Null)
 #ifndef Q_WS_MAC
     , m_pMachineWindowIcon(0)
@@ -181 +213 @@
     , m_fIsHidingHostPointer(true)
 {
+}
+
+bool UISession::prepare()
+{
+    /* Prepare session: */
+    if (!prepareSession())
+        return false;
+
     /* Prepare actions: */
     prepareActions();
@@ -206 +246 @@
     sigaction(SIGUSR1, &sa, NULL);
 #endif /* VBOX_GUI_WITH_KEYS_RESET_HANDLER */
+
+    /* True by default: */
+    return true;
 }
 
 UISession::~UISession()
+{
+}
+
+void UISession::cleanup()
 {
 #ifdef Q_WS_WIN
@@ -230 +277 @@
     /* Cleanup actions: */
     cleanupActions();
+
+    /* Cleanup session: */
+    cleanupSession();
 }
 
@@ -966 +1016 @@
 }
 
+bool UISession::prepareSession()
+{
+    /* Open session: */
+    m_session = vboxGlobal().openSession(vboxGlobal().managedVMUuid(),
+                                         vboxGlobal().isSeparateProcess()
+                                         ? KLockType_Shared : KLockType_VM);
+    if (m_session.isNull())
+        return false;
+
+    /* Update machine-state: */
+    m_machineState = m_session.GetMachine().GetState();
+
+    /* True by default: */
+    return true;
+}
+
 void UISession::prepareConsoleEventHandlers()
 {
@@ -1325 +1391 @@
 }
 
+void UISession::cleanupSession()
+{
+    /* Close session: */
+    if (!m_session.isNull())
+    {
+        m_session.UnlockMachine();
+        m_session.detach();
+    }
+}
+
 #ifdef Q_WS_MAC
 void UISession::updateMenu()

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -29 +29 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CSession.h"
 
 /* Forward declarations: */
@@ -36 +37 @@
 class UIMachineLogic;
 class UIActionPool;
-class CSession;
 class CUSBDevice;
 class CNetworkAdapter;
@@ -77 +77 @@
 public:
 
-    /* Machine uisession constructor/destructor: */
-    UISession(UIMachine *pMachine, CSession &session);
-    virtual ~UISession();
+    /** Factory constructor. */
+    static bool create(UISession *&pSession, UIMachine *pMachine);
+    /** Factory destructor. */
+    static void destroy(UISession *&pSession);
 
     /* API: Runtime UI stuff: */
@@ -309 +310 @@
 private:
 
+    /** Constructor. */
+    UISession(UIMachine *pMachine);
+    /** Destructor. */
+    ~UISession();
+
     /* Private getters: */
     UIMachine* uimachine() const { return m_pMachine; }
 
     /* Prepare helpers: */
+    bool prepare();
+    bool prepareSession();
     void prepareActions();
     void prepareConnections();
@@ -327 +335 @@
     void cleanupConnections();
     void cleanupActions();
+    void cleanupSession();
+    void cleanup();
 
 #ifdef Q_WS_MAC
@@ -344 +354 @@
     /* Private variables: */
     UIMachine *m_pMachine;
-    CSession &m_session;
+
+    /** Holds the session instance. */
+    CSession m_session;
 
     /** Holds the action-pool instance. */