Changeset 47561 in vbox for trunk/src/VBox/Main/include

Timestamp:

Aug 6, 2013 3:18:17 PM (12 years ago)

Author:

vboxsync

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

87761

Message:

Main/VirtualBox+Machine+Session: separate out the client death detection functionality into separate objects

Location:

trunk/src/VBox/Main/include

Files:

• ClientToken.h (added)
• ClientTokenHolder.h (added)
• ClientWatcher.h (added)
• MachineImpl.h (modified) (6 diffs)
• SessionImpl.h (modified) (4 diffs)
• VirtualBoxImpl.h (modified) (9 diffs)

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

@@ -783 +783 @@
     }
 
-#if defined(RT_OS_WINDOWS)
-
-    bool isSessionOpen(ComObjPtr<SessionMachine> &aMachine,
-                       ComPtr<IInternalSessionControl> *aControl = NULL,
-                       HANDLE *aIPCSem = NULL, bool aAllowClosing = false);
-    bool isSessionSpawning(RTPROCESS *aPID = NULL);
-
-    bool isSessionOpenOrClosing(ComObjPtr<SessionMachine> &aMachine,
-                                ComPtr<IInternalSessionControl> *aControl = NULL,
-                                HANDLE *aIPCSem = NULL)
-    { return isSessionOpen(aMachine, aControl, aIPCSem, true /* aAllowClosing */); }
-
-#elif defined(RT_OS_OS2)
-
-    bool isSessionOpen(ComObjPtr<SessionMachine> &aMachine,
-                       ComPtr<IInternalSessionControl> *aControl = NULL,
-                       HMTX *aIPCSem = NULL, bool aAllowClosing = false);
-
-    bool isSessionSpawning(RTPROCESS *aPID = NULL);
-
-    bool isSessionOpenOrClosing(ComObjPtr<SessionMachine> &aMachine,
-                                 ComPtr<IInternalSessionControl> *aControl = NULL,
-                                 HMTX *aIPCSem = NULL)
-    { return isSessionOpen(aMachine, aControl, aIPCSem, true /* aAllowClosing */); }
-
-#else
-
     bool isSessionOpen(ComObjPtr<SessionMachine> &aMachine,
                        ComPtr<IInternalSessionControl> *aControl = NULL,
@@ -819 +792 @@
     { return isSessionOpen(aMachine, aControl, true /* aAllowClosing */); }
 
-#endif
-
     bool checkForSpawnFailure();
 
@@ -848 +819 @@
 
 protected:
+
+    class ClientToken;
 
     HRESULT checkStateDependency(StateDependency aDepType);
@@ -1075 +1048 @@
     STDMETHOD(SetRemoveSavedStateFile)(BOOL aRemove);
     STDMETHOD(UpdateState)(MachineState_T machineState);
-    STDMETHOD(GetIPCId)(BSTR *id);
     STDMETHOD(BeginPowerUp)(IProgress *aProgress);
     STDMETHOD(EndPowerUp)(LONG iResult);
@@ -1134 +1106 @@
     bool checkForDeath();
 
+    void getTokenId(Utf8Str &strTokenId);
+    // getClientToken must be only used by callers who can guarantee that
+    // the object cannot be deleted in the mean time, i.e. have a caller/lock.
+    ClientToken *getClientToken();
+
     HRESULT onNetworkAdapterChange(INetworkAdapter *networkAdapter, BOOL changeAdapter);
     HRESULT onNATRedirectRuleChange(ULONG ulSlot, BOOL aNatRuleRemove, IN_BSTR aRuleName,
@@ -1236 +1213 @@
     ConsoleTaskData mConsoleTaskData;
 
-    /** interprocess semaphore handle for this machine */
-#if defined(RT_OS_WINDOWS)
-    HANDLE mIPCSem;
-    Bstr mIPCSemName;
-    friend bool Machine::isSessionOpen(ComObjPtr<SessionMachine> &aMachine,
-                                       ComPtr<IInternalSessionControl> *aControl,
-                                       HANDLE *aIPCSem, bool aAllowClosing);
-#elif defined(RT_OS_OS2)
-    HMTX mIPCSem;
-    Bstr mIPCSemName;
-    friend bool Machine::isSessionOpen(ComObjPtr<SessionMachine> &aMachine,
-                                       ComPtr<IInternalSessionControl> *aControl,
-                                       HMTX *aIPCSem, bool aAllowClosing);
-#elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
-    int mIPCSem;
-# ifdef VBOX_WITH_NEW_SYS_V_KEYGEN
-    Bstr mIPCKey;
-# endif /*VBOX_WITH_NEW_SYS_V_KEYGEN */
-#else
-# error "Port me!"
-#endif
+    /** client token for this machine */
+    ClientToken *mClientToken;
 
     static DECLCALLBACK(int) taskHandler(RTTHREAD thread, void *pvUser);

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

@@ -24 +24 @@
 #ifdef RT_OS_WINDOWS
 # include "win/resource.h"
-#endif
-
-/** @def VBOX_WITH_SYS_V_IPC_SESSION_WATCHER
- *  Use SYS V IPC for watching a session.
- *  This is defined in the Makefile since it's also used by MachineImpl.h/cpp.
- */
-#ifdef DOXYGEN_RUNNING
-# define VBOX_WITH_SYS_V_IPC_SESSION_WATCHER
 #endif
 
@@ -81 +73 @@
     STDMETHOD(GetPID)(ULONG *aPid);
     STDMETHOD(GetRemoteConsole)(IConsole **aConsole);
-    STDMETHOD(AssignMachine)(IMachine *aMachine, LockType_T aLockType);
+    STDMETHOD(AssignMachine)(IMachine *aMachine, LockType_T aLockType, IN_BSTR aTokenId);
     STDMETHOD(AssignRemoteMachine)(IMachine *aMachine, IConsole *aConsole);
     STDMETHOD(UpdateMachineState)(MachineState_T aMachineState);
@@ -124 +116 @@
 
     HRESULT unlockMachine(bool aFinalRelease, bool aFromServer);
-    HRESULT grabIPCSemaphore();
-    void releaseIPCSemaphore();
 
     SessionState_T mState;
@@ -139 +129 @@
     ComPtr<IVirtualBox> mVirtualBox;
 
-    /* interprocess semaphore handle (id) for the opened machine */
-#if defined(RT_OS_WINDOWS)
-    HANDLE mIPCSem;
-    HANDLE mIPCThreadSem;
-#elif defined(RT_OS_OS2)
-    RTTHREAD mIPCThread;
-    RTSEMEVENT mIPCThreadSem;
-#elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
-    int mIPCSem;
-#else
-# error "Port me!"
-#endif
+    class ClientTokenHolder;
+
+    ClientTokenHolder *mClientTokenHolder;
 };
 

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

@@ -20 +20 @@
 
 #include "VirtualBoxBase.h"
+#include "objectslist.h"
 
 #ifdef RT_OS_WINDOWS
@@ -33 +34 @@
 class SessionMachine;
 class GuestOSType;
-class SharedFolder;
 class Progress;
 class Host;
@@ -39 +39 @@
 class DHCPServer;
 class PerformanceCollector;
-class VirtualBoxCallbackRegistration; /* see VirtualBoxImpl.cpp */
 #ifdef VBOX_WITH_EXTPACK
 class ExtPackManager;
@@ -52 +51 @@
 class SVCHlpClient;
 #endif
-
-struct VMClientWatcherData;
 
 namespace settings
@@ -71 +68 @@
 
     typedef std::list<ComPtr<IInternalSessionControl> > InternalControlList;
+    typedef ObjectsList<Machine> MachinesOList;
 
     class CallbackEvent;
@@ -216 +214 @@
     void onGuestPropertyChange(const Guid &aMachineId, IN_BSTR aName, IN_BSTR aValue,
                                IN_BSTR aFlags);
-    void onMachineUninit(Machine *aMachine);
     void onNatRedirectChange(const Guid &aMachineId, ULONG ulSlot, bool fRemove, IN_BSTR aName,
                                    NATProtocol_T aProto, IN_BSTR aHostIp, uint16_t aHostPort,
@@ -234 +231 @@
     void getOpenedMachines(SessionMachinesList &aMachines,
                            InternalControlList *aControls = NULL);
+    MachinesOList &getMachinesList();
 
     HRESULT findMachine(const Guid &aId,
@@ -322 +320 @@
 
 private:
+    class ClientWatcher;
 
     static HRESULT setErrorStatic(HRESULT aResultCode,
@@ -361 +360 @@
     static Bstr sAPIVersion;
 
-    static DECLCALLBACK(int) ClientWatcher(RTTHREAD thread, void *pvUser);
     static DECLCALLBACK(int) AsyncEventHandler(RTTHREAD thread, void *pvUser);