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

Timestamp:

Mar 6, 2019 4:40:18 PM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Implemented virtual guest object methods for session status changes to allow guest objects set their internal state accordingly. The guest session's object map now also keeps a (weak) pointer to the guest objects for handling the callbacks.

Location:

trunk/src/VBox/Main/include

Files:

• GuestCtrlImplPrivate.h (modified) (2 diffs)
• GuestDirectoryImpl.h (modified) (1 diff)
• GuestFileImpl.h (modified) (2 diffs)
• GuestProcessImpl.h (modified) (1 diff)
• GuestSessionImpl.h (modified) (3 diffs)

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

@@ -1152 +1152 @@
 class GuestObject : public GuestBase
 {
+    friend GuestSession;
 
 public:
@@ -1164 +1165 @@
 protected:
 
-    virtual int i_onRemove(void) = 0;
+    /**
+     * Called by IGuestSession when the session status has been changed.
+     *
+     * @returns VBox status code.
+     * @param   enmSessionStatus    New session status.
+     */
+    virtual int i_onSessionStatusChange(GuestSessionStatus_T enmSessionStatus) = 0;
+
+    /**
+     * Called by IGuestSession right before this object gets
+     * unregistered (removed) from the public object list.
+     */
+    virtual int i_onUnregister(void) = 0;
 
     /** Callback dispatcher -- must be implemented by the actual object. */

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

@@ -48 +48 @@
 
 public:
+    /** @name Implemented virtual methods from GuestObject.
+     * @{ */
+    int            i_callbackDispatcher(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
+    int            i_onUnregister(void);
+    int            i_onSessionStatusChange(GuestSessionStatus_T enmSessionStatus);
+    /** @}  */
+
+public:
     /** @name Public internal methods.
      * @{ */
-    int            i_callbackDispatcher(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
-    int            i_onRemove(void);
-
     int            i_closeInternal(int *pGuestRc);
     int            i_readInternal(ComObjPtr<GuestFsObjInfo> &fsObjInfo, int *pGuestRc);

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

@@ -49 +49 @@
 
 public:
+    /** @name Implemented virtual methods from GuestObject.
+     * @{ */
+    int             i_callbackDispatcher(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
+    int             i_onUnregister(void);
+    int             i_onSessionStatusChange(GuestSessionStatus_T enmSessionStatus);
+    /** @}  */
+
+public:
     /** @name Public internal methods.
      * @{ */
-    int             i_callbackDispatcher(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
     int             i_closeFile(int *pGuestRc);
     EventSource    *i_getEventSource(void) { return mEventSource; }
@@ -57 +64 @@
     int             i_onFileNotify(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
     int             i_onGuestDisconnected(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
-    int             i_onRemove(void);
     int             i_openFile(uint32_t uTimeoutMS, int *pGuestRc);
     int             i_queryInfo(GuestFsObjData &objData, int *prcGuest);

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

@@ -51 +51 @@
 
 public:
+    /** @name Implemented virtual methods from GuestObject.
+     * @{ */
+    int i_callbackDispatcher(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
+    int i_onUnregister(void);
+    int i_onSessionStatusChange(GuestSessionStatus_T enmSessionStatus);
+    /** @}  */
+
+public:
     /** @name Public internal methods.
      * @{ */
-    int i_callbackDispatcher(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
     inline int i_checkPID(uint32_t uPID);
-    int i_onRemove(void);
     int i_readData(uint32_t uHandle, uint32_t uSize, uint32_t uTimeoutMS, void *pvData, size_t cbData, uint32_t *pcbRead, int *pGuestRc);
     int i_startProcess(uint32_t cMsTimeout, int *pGuestRc);

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

@@ -263 +263 @@
         /** The object type. */
         SESSIONOBJECTTYPE enmType;
+        /** Weak pointer to the object itself. */
+        GuestObject      *pObject;
     };
 
@@ -309 +311 @@
     bool                    i_isStarted(void) const;
     HRESULT                 i_isStartedExternal(void);
+    static bool             i_isTerminated(GuestSessionStatus_T enmStatus);
     bool                    i_isTerminated(void) const;
     int                     i_onRemove(void);
@@ -318 +321 @@
     Guest                  *i_getParent(void) { return mParent; }
     uint32_t                i_getProtocolVersion(void) { return mData.mProtocolVersion; }
-    int                     i_objectRegister(SESSIONOBJECTTYPE enmType, uint32_t *pidObject);
+    int                     i_objectRegister(GuestObject *pObject, SESSIONOBJECTTYPE enmType, uint32_t *pidObject);
     int                     i_objectUnregister(uint32_t uObjectID);
+    int                     i_objectsUnregister(void);
+    int                     i_objectsNotifyAboutStatusChange(GuestSessionStatus_T enmSessionStatus);
     int                     i_pathRename(const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags, int *pGuestRc);
     int                     i_pathUserDocuments(Utf8Str &strPath, int *prcGuest);