vbox的更動 45010 路徑 trunk/src/VBox/Main/include

時間撮記:

2013-3-12 下午05:47:56 (12 年 以前)

作者:

vboxsync

訊息:

GuestCtrl: More code for guest session infrastructure handling (untested, work in progress).

位置:

trunk/src/VBox/Main/include

檔案:

• GuestCtrlImplPrivate.h (修改) (1 筆差異)
• GuestProcessImpl.h (修改) (1 筆差異)
• GuestSessionImpl.h (修改) (4 筆差異)

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

@@ -205 +205 @@
     /** Structure containing the overall result. */
     ProcessWaitResult_T         mResult;
+};
+
+
+/*
+ * Class representing a guest control session waiting
+ * event.
+ */
+class GuestSessionWaitEvent : public GuestCtrlEvent
+{
+public:
+
+    GuestSessionWaitEvent(void);
+
+    GuestSessionWaitEvent(uint32_t uWaitFlags);
+
+    virtual ~GuestSessionWaitEvent(void);
+
+public:
+
+    void Destroy(void);
+
+    int Init(uint32_t uWaitFlags);
+
+    uint32_t GetWaitFlags(void) { return ASMAtomicReadU32(&mFlags); }
+
+    GuestSessionWaitResult_T GetWaitResult(void) { return mResult; }
+
+    int GetWaitRc(void) { return mRC; }
+
+    int Signal(GuestSessionWaitResult_T enmResult, int rc = VINF_SUCCESS);
+
+protected:
+
+    /** The waiting flag(s). The specifies what to
+     *  wait for. See GuestSessionWaitFlag_T. */
+    uint32_t                    mFlags;
+    /** Structure containing the overall result. */
+    GuestSessionWaitResult_T    mResult;
 };
 

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

@@ -113 +113 @@
         /** The current process status. */
         ProcessStatus_T          mStatus;
+        /** The last returned process status
+         *  returned from the guest side. */
         int                      mRC;
-        /** The mutex for protecting the waiter(s). */
-        RTSEMMUTEX               mWaitMutex;
         /** How many waiters? At the moment there can only
          *  be one. */

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

@@ -311 +311 @@
     STDMETHOD(SymlinkRemoveDirectory)(IN_BSTR aPath);
     STDMETHOD(SymlinkRemoveFile)(IN_BSTR aFile);
+    STDMETHOD(WaitFor)(ULONG aWaitFlags, ULONG aTimeoutMS, GuestSessionWaitResult_T *aReason);
+    STDMETHOD(WaitForArray)(ComSafeArrayIn(GuestSessionWaitForFlag_T, aFlags), ULONG aTimeoutMS, GuestSessionWaitResult_T *aReason);
     /** @}  */
 
@@ -347 +349 @@
     static Utf8Str          guestErrorToString(int guestRc);
     int                     onSessionStatusChange(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, GuestCtrlCallback *pCallback, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
-    int                     openSession(int *pGuestRc);
-    int                     openSessionAsync(void);
+    int                     startSessionIntenal(int *pGuestRc);
+    int                     startSessionAsync(void);
     static DECLCALLBACK(int)
-                            openSessionThread(RTTHREAD Thread, void *pvUser);
+                            startSessionThread(RTTHREAD Thread, void *pvUser);
     Guest                  *getParent(void) { return mData.mParent; }
     uint32_t                getProtocolVersion(void) { return mData.mProtocolVersion; }
@@ -361 +363 @@
     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);
     /** @}  */
 
@@ -396 +399 @@
          *  files, ...). */
         uint32_t                    mNumObjects;
+        /** The last returned session status
+         *  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;
 };