Changeset 45415 in vbox for trunk/src/VBox/Main/include/GuestSessionImpl.h

Timestamp:

Apr 8, 2013 9:40:42 PM (12 years ago)

Author:

vboxsync

Message:

GuestCtrl: Implemented using (public) VirtualBox events instead of own callback mechanisms. Bugfixes for testcases (still work in progress).

File:

• trunk/src/VBox/Main/include/GuestSessionImpl.h (modified) (7 diffs)

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

@@ -21 +21 @@
 
 #include "VirtualBoxBase.h"
+#include "EventImpl.h"
 
 #include "GuestCtrlImplPrivate.h"
@@ -238 +239 @@
 class ATL_NO_VTABLE GuestSession :
     public VirtualBoxBase,
+    public GuestBase,
     VBOX_SCRIPTABLE_IMPL(IGuestSession)
 {
@@ -271 +273 @@
     STDMETHOD(COMGETTER(Directories))(ComSafeArrayOut(IGuestDirectory *, aDirectories));
     STDMETHOD(COMGETTER(Files))(ComSafeArrayOut(IGuestFile *, aFiles));
+    STDMETHOD(COMGETTER(EventSource))(IEventSource ** aEventSource);
     /** @}  */
 
@@ -345 +348 @@
     const GuestCredentials &getCredentials(void);
     const GuestEnvironment &getEnvironment(void);
+    EventSource            *getEventSource(void) { return mEventSource; }
     Utf8Str                 getName(void);
     ULONG                   getId(void) { return mData.mSession.mID; }
     static Utf8Str          guestErrorToString(int guestRc);
-    int                     onSessionStatusChange(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, GuestCtrlCallback *pCallback, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
+    HRESULT                 isReadyExternal(void);
+    int                     onSessionStatusChange(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
     int                     startSessionIntenal(int *pGuestRc);
     int                     startSessionAsync(void);
     static DECLCALLBACK(int)
                             startSessionThread(RTTHREAD Thread, void *pvUser);
-    Guest                  *getParent(void) { return mData.mParent; }
+    Guest                  *getParent(void) { return mParent; }
     uint32_t                getProtocolVersion(void) { return mData.mProtocolVersion; }
     int                     processRemoveFromList(GuestProcess *pProcess);
@@ -361 +366 @@
     int                     sendCommand(uint32_t uFunction, uint32_t uParms, PVBOXHGCMSVCPARM paParms);
     static HRESULT          setErrorExternal(VirtualBoxBase *pInterface, int guestRc);
+    int                     setSessionStatus(GuestSessionStatus_T sessionStatus, int sessionRc);
+    int                     signalWaiters(GuestSessionWaitResult_T enmWaitResult, int rc /*= VINF_SUCCESS */);
     int                     startTaskAsync(const Utf8Str &strTaskDesc, GuestSessionTask *pTask, ComObjPtr<Progress> &pProgress);
     int                     queryInfo(void);
     int                     waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, GuestSessionWaitResult_T &waitResult, int *pGuestRc);
+    int                     waitForStateChange(uint32_t fWaitFlags, uint32_t uTimeoutMS, GuestSessionStatus_T *pSessionStatus, int *pGuestRc);
     /** @}  */
 
 private:
+
+    /** Pointer to the parent (Guest). */
+    Guest                          *mParent;
+    /**
+     * This can safely be used without holding any locks.
+     * An AutoCaller suffices to prevent it being destroy while in use and
+     * internally there is a lock providing the necessary serialization.
+     */
+    const ComObjPtr<EventSource>    mEventSource;
 
     struct Data
     {
-        /** Pointer to the parent (Guest). */
-        Guest                      *mParent;
         /** The session credentials. */
         GuestCredentials            mCredentials;
@@ -381 +396 @@
          *  overwritten/extended by ProcessCreate(Ex). */
         GuestEnvironment            mEnvironment;
-        /** The session callback, needed for communicating
-         *  with the guest. */
-        GuestCtrlCallback           mCallback;
         /** Directory objects bound to this session. */
         SessionDirectories          mDirectories;
@@ -402 +414 @@
          *  returned from the guest side. */
         int                         mRC;
-        /** How many waiters? At the moment there can only
-         *  be one. */
-        uint32_t                    mWaitCount;
-        /** The actual session event for doing the waits.
-         *  At the moment we only support one wait a time. */
-        GuestSessionWaitEvent      *mWaitEvent;
     } mData;
 };