Changeset 28772 in vbox for trunk/src/VBox/Main/include/GuestImpl.h

Timestamp:

Apr 26, 2010 5:13:39 PM (15 years ago)

Author:

vboxsync

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

60655

Message:

Guest Control/Main: Added local process list, added early implementation of IGuest::GetProcessStatus().

File:

• trunk/src/VBox/Main/include/GuestImpl.h (modified) (4 diffs)

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

@@ -96 +96 @@
                               IN_BSTR aStdIn, IN_BSTR aStdOut, IN_BSTR aStdErr,
                               IN_BSTR aUserName, IN_BSTR aPassword,
-                              ULONG aTimeoutMS, ULONG* aPID, IProgress **aProgress);
+                              ULONG aTimeoutMS, ULONG *aPID, IProgress **aProgress);
     STDMETHOD(GetProcessOutput)(ULONG aPID, ULONG aFlags, ULONG aTimeoutMS, ULONG64 aSize, ComSafeArrayOut(BYTE, aData));
+    STDMETHOD(GetProcessStatus)(ULONG aPID, ULONG *aReason, ULONG *aExitCode, ULONG *aStatus);
     STDMETHOD(InternalGetStatistics)(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
                                      ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemCache,
@@ -124 +125 @@
     struct CallbackContext
     {
-        uint32_t            mContextID;
-        void               *pvData;
-        uint32_t            cbData;
+        uint32_t                    mContextID;
+        eVBoxGuestCtrlCallbackType  mType;
+        void                       *pvData;
+        uint32_t                    cbData;
         /** Atomic flag whether callback was called. */
-        volatile bool       bCalled;
+        volatile bool               bCalled;
         /** Pointer to user-supplied IProgress. */
-        ComObjPtr<Progress> pProgress;
+        ComObjPtr<Progress>         pProgress;
     };
     typedef std::list< CallbackContext > CallbackList;
     typedef std::list< CallbackContext >::iterator CallbackListIter;
     typedef std::list< CallbackContext >::const_iterator CallbackListIterConst;
+
+    struct GuestProcess
+    {
+        uint32_t                 mPID;
+        uint32_t                 mStatus;
+        uint32_t                 mReason;
+        uint32_t                 mExitCode;
+    };
+    typedef std::list< GuestProcess > GuestProcessList;
+    typedef std::list< GuestProcess >::iterator GuestProcessIter;
+    typedef std::list< GuestProcess >::const_iterator GuestProcessIterConst;
 
     int prepareExecuteEnv(const char *pszEnv, void **ppvList, uint32_t *pcbList, uint32_t *pcEnv);
@@ -141 +154 @@
     int notifyCtrlExecOut(uint32_t u32Function, PHOSTEXECOUTCALLBACKDATA pData);
     CallbackListIter getCtrlCallbackContextByID(uint32_t u32ContextID);
-    CallbackListIter getCtrlCallbackContextByPID(uint32_t u32PID);
+    GuestProcessIter getProcessByPID(uint32_t u32PID);
     void removeCtrlCallbackContext(CallbackListIter it);
-    uint32_t addCtrlCallbackContext(void *pvData, uint32_t cbData, Progress* pProgress);
+    uint32_t addCtrlCallbackContext(eVBoxGuestCtrlCallbackType enmType, void *pvData, uint32_t cbData, Progress* pProgress);
 # endif
 
@@ -171 +184 @@
     volatile uint32_t mNextContextID;
     CallbackList mCallbackList;
+    GuestProcessList mGuestProcessList;
 # endif
 };