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

Timestamp:

Jul 30, 2013 9:43:14 AM (12 years ago)

Author:

vboxsync

Message:

Guest Control: Adjustments for supporting < 4.3 Guest Additions in conjunction with the new guest session, extended testcase (now passing using latest 4.2 Guest Additions with latest trunk).

Location:

trunk/src/VBox/Main/include

Files:

• GuestCtrlImplPrivate.h (modified) (5 diffs)
• GuestProcessImpl.h (modified) (2 diffs)
• GuestSessionImpl.h (modified) (3 diffs)

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

@@ -377 +377 @@
 class GuestWaitEvent
 {
+
 public:
 
@@ -387 +388 @@
     const ComPtr<IEvent>             Event(void) { return mEvent; };
     const std::list<VBoxEventType_T> Types(void) { return mEventTypes; };
-    int                              Signal(IEvent *pEvent);
+    virtual int                      Signal(IEvent *pEvent);
     int                              Wait(RTMSINTERVAL uTimeoutMS);
 
 protected:
 
+    /* Shutdown indicator. */
+    bool                       fAborted;
+    /* Associated context ID (CID). */
     uint32_t                   mCID;
+    /** List of event types this event should
+     *  be signalled on. */
     std::list<VBoxEventType_T> mEventTypes;
     /** The event semaphore for triggering
@@ -418 +424 @@
 public:
 
+    int baseInit(void);
+    void baseUninit(void);
+    int cancelWaitEvents(void);
     int generateContextID(uint32_t uSessionID, uint32_t uObjectID, uint32_t *puContextID);
-    int registerEvent(uint32_t uSessionID, uint32_t uObjectID, const std::list<VBoxEventType_T> &lstEvents, GuestWaitEvent **ppEvent);
-    void unregisterEvent(GuestWaitEvent *pEvent);
-    void unregisterEventListener(void);
+    int registerWaitEvent(uint32_t uSessionID, uint32_t uObjectID, const std::list<VBoxEventType_T> &lstEvents, GuestWaitEvent **ppEvent);
+    void unregisterWaitEvent(GuestWaitEvent *pEvent);
     int waitForEvent(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, VBoxEventType_T *pType, IEvent **ppEvent);
 
@@ -431 +439 @@
     /** The next upcoming context ID for this object. */
     uint32_t                 mNextContextID;
-    /** Local listener for handling the waiting events. */
-    ComPtr<IEventListener>   mListener;
+    /** Local listener for handling the waiting events
+     *  internally. */
+    ComPtr<IEventListener>   mLocalListener;
     /** Critical section for wait events access. */
     RTCRITSECT               mWaitEventCritSect;
@@ -463 +472 @@
 
     int bindToSession(Console *pConsole, GuestSession *pSession, uint32_t uObjectID);
-    int registerEvent(const std::list<VBoxEventType_T> &lstEvents, GuestWaitEvent **ppEvent);
+    int registerWaitEvent(const std::list<VBoxEventType_T> &lstEvents, GuestWaitEvent **ppEvent);
     int sendCommand(uint32_t uFunction, uint32_t uParms, PVBOXHGCMSVCPARM paParms);
 

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

@@ -80 +80 @@
     int readData(uint32_t uHandle, uint32_t uSize, uint32_t uTimeoutMS, void *pvData, size_t cbData, uint32_t *pcbRead, int *pGuestRc);
     static HRESULT setErrorExternal(VirtualBoxBase *pInterface, int guestRc);
-    int startProcess(int *pGuestRc);
+    int startProcess(uint32_t uTimeoutMS, int *pGuestRc);
     int startProcessAsync(void);
-    int terminateProcess(int *pGuestRc);
+    int terminateProcess(uint32_t uTimeoutMS, int *pGuestRc);
+    static ProcessWaitResult_T waitFlagsToResultEx(uint32_t fWaitFlags, ProcessStatus_T procStatus, uint32_t uProcFlags, uint32_t uProtocol);
+    ProcessWaitResult_T waitFlagsToResult(uint32_t fWaitFlags);
     int waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, ProcessWaitResult_T &waitResult, int *pGuestRc);
     int waitForInputNotify(GuestWaitEvent *pEvent, uint32_t uHandle, uint32_t uTimeoutMS, ProcessInputStatus_T *pInputStatus, uint32_t *pcbProcessed);
     int waitForOutput(GuestWaitEvent *pEvent, uint32_t uHandle, uint32_t uTimeoutMS, void* pvData, size_t cbData, uint32_t *pcbRead);
-    int waitForStatusChange(GuestWaitEvent *pEvent, uint32_t fWaitFlags, uint32_t uTimeoutMS, ProcessStatus_T *pProcessStatus, int *pGuestRc);
+    int waitForStatusChange(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, ProcessStatus_T *pProcessStatus, int *pGuestRc);
+    static bool waitResultImpliesEx(ProcessWaitResult_T waitResult, ProcessStatus_T procStatus, uint32_t uProcFlags, uint32_t uProtocol);
     int writeData(uint32_t uHandle, uint32_t uFlags, void *pvData, size_t cbData, uint32_t uTimeoutMS, uint32_t *puWritten, int *pGuestRc);
     /** @}  */
@@ -168 +171 @@
     int TerminatedOk(LONG *pExitCode);
 
-    void Terminate(void);
+    int Terminate(uint32_t uTimeoutMS, int *pGuestRc);
 
 protected:

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

@@ -273 +273 @@
     STDMETHOD(COMGETTER(Timeout))(ULONG *aTimeout);
     STDMETHOD(COMSETTER(Timeout))(ULONG aTimeout);
+    STDMETHOD(COMGETTER(ProtocolVersion))(ULONG *aVersion);
     STDMETHOD(COMGETTER(Environment))(ComSafeArrayOut(BSTR, aEnvironment));
     STDMETHOD(COMSETTER(Environment))(ComSafeArrayIn(IN_BSTR, aEnvironment));
@@ -359 +360 @@
     HRESULT                 isReadyExternal(void);
     int                     onSessionStatusChange(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
-    int                     startSessionIntenal(int *pGuestRc);
+    int                     startSessionInternal(int *pGuestRc);
     int                     startSessionAsync(void);
     static DECLCALLBACK(int)
@@ -384 +385 @@
     Guest                          *mParent;
     /**
-     * This can safely be used without holding any locks.
+     * The session's event source. This source is used for
+     * serving the internal listener as well as all other
+     * external listeners that may register to it.
+     *
+     * Note: 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.