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

Timestamp:

Mar 28, 2012 2:48:00 PM (13 years ago)

Author:

vboxsync

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

77139

Message:

Main/GuestCtrl: Introduced host<->guest PID mapping for immediate returns of executeProcess(); bugfixes.

File:

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

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

@@ -175 +175 @@
     HRESULT getProcessOutputInternal(ULONG aPID, ULONG aFlags, ULONG aTimeoutMS,
                                      LONG64 aSize, ComSafeArrayOut(BYTE, aData), int *pRC);
-    HRESULT executeProcessResult(const char *pszCommand, const char *pszUser, ULONG ulTimeout, PCALLBACKDATAEXECSTATUS pExecStatus, ULONG *puPID);
+    HRESULT executeSetResult(const char *pszCommand, const char *pszUser, ULONG ulTimeout, PCALLBACKDATAEXECSTATUS pExecStatus, ULONG *puPID);
     int     executeStreamQueryFsObjInfo(IN_BSTR aObjName,GuestProcessStreamBlock &streamBlock, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttribs);
-    int     executeStreamDrain(ULONG aPID, ULONG ulFlags, GuestProcessStream &stream);
+    int     executeStreamDrain(ULONG aPID, ULONG ulFlags, GuestProcessStream *pStream);
     int     executeStreamGetNextBlock(ULONG ulPID, ULONG ulFlags, GuestProcessStream &stream, GuestProcessStreamBlock &streamBlock);
     int     executeStreamParseNextBlock(ULONG ulPID, ULONG ulFlags, GuestProcessStream &stream, GuestProcessStreamBlock &streamBlock);
     HRESULT executeStreamParse(ULONG uPID, ULONG ulFlags, GuestCtrlStreamObjects &streamObjects);
-    HRESULT executeWaitForExit(ULONG uPID, ComPtr<IProgress> pProgress, ULONG uTimeoutMS,
-                               ExecuteProcessStatus_T *pRetStatus, ULONG *puRetExitCode);
+    HRESULT executeWaitForExit(ULONG uPID, ComPtr<IProgress> pProgress, ULONG uTimeoutMS);
     // Internal guest file functions
     HRESULT fileExistsInternal(IN_BSTR aFile, IN_BSTR aUsername, IN_BSTR aPassword, BOOL *aExists);
@@ -211 +210 @@
         /** Size of user-supplied data. */
         uint32_t                    cbData;
+        /** The host PID. Needed for translating to
+         *  a guest PID. */
+        uint32_t                    uHostPID;
         /** Pointer to user-supplied IProgress. */
         ComObjPtr<Progress>         pProgress;
@@ -219 +221 @@
 
     int callbackAdd(const PVBOXGUESTCTRL_CALLBACK pCallbackData, uint32_t *puContextID);
+    int callbackAssignHostPID(uint32_t uContextID, uint32_t uHostPID);
     void callbackDestroy(uint32_t uContextID);
     void callbackRemove(uint32_t uContextID);
     bool callbackExists(uint32_t uContextID);
     void callbackFreeUserData(void *pvData);
+    uint32_t callbackGetHostPID(uint32_t uContextID);
     int callbackGetUserData(uint32_t uContextID, eVBoxGuestCtrlCallbackType *pEnmType, void **ppvData, size_t *pcbData);
     void* callbackGetUserDataMutableRaw(uint32_t uContextID, size_t *pcbData);
@@ -231 +235 @@
     int callbackNotifyEx(uint32_t uContextID, int iRC, const char *pszMessage);
     int callbackNotifyComplete(uint32_t uContextID);
-    int callbackNotifyAllForPID(uint32_t uPID, int iRC, const char *pszMessage);
+    int callbackNotifyAllForPID(uint32_t uGuestPID, int iRC, const char *pszMessage);
     int callbackWaitForCompletion(uint32_t uContextID, LONG lStage, LONG lTimeout);
 
@@ -242 +246 @@
     typedef struct VBOXGUESTCTRL_PROCESS
     {
+        /** The guest PID -- needed for controlling the actual guest
+         *  process which has its own PID (generated by the guest OS). */
+        uint32_t                    mGuestPID;
+        /** The last reported process status. */
         ExecuteProcessStatus_T      mStatus;
+        /** The process execution flags. */
         uint32_t                    mFlags;
+        /** The process' exit code. */
         uint32_t                    mExitCode;
     } VBOXGUESTCTRL_PROCESS, *PVBOXGUESTCTRL_PROCESS;
@@ -250 +260 @@
     typedef std::map< uint32_t, VBOXGUESTCTRL_PROCESS >::const_iterator GuestProcessMapIterConst;
 
-    int  processGetStatus(uint32_t u32PID, PVBOXGUESTCTRL_PROCESS pProcess, bool fRemove);
-    int  processSetStatus(uint32_t u32PID, ExecuteProcessStatus_T enmStatus, uint32_t uExitCode, uint32_t uFlags);
+    uint32_t processGetGuestPID(uint32_t uHostPID);
+    int  processGetStatus(uint32_t uHostPID, PVBOXGUESTCTRL_PROCESS pProcess, bool fRemove);
+    int  processSetStatus(uint32_t uHostPID, uint32_t uGuestPID,
+                          ExecuteProcessStatus_T enmStatus, uint32_t uExitCode, uint32_t uFlags);
 
     // Internal guest directory representation.
@@ -259 +271 @@
         Bstr                        mFilter;
         ULONG                       mFlags;
-        /** Associated PID of started vbox_ls tool. */
+        /** Associated host PID of started vbox_ls tool. */
         ULONG                       mPID;
         GuestProcessStream          mStream;
-#if 0
-        /** Next enetry in our stream objects vector
-         *  to process. */
-        uint32_t                    mNextEntry;
-        /** The guest stream object containing all */
-        GuestCtrlStreamObjects      mStream;
-#endif
     } VBOXGUESTCTRL_DIRECTORY, *PVBOXGUESTCTRL_DIRECTORY;
     typedef std::map< uint32_t, VBOXGUESTCTRL_DIRECTORY > GuestDirectoryMap;
@@ -280 +285 @@
      * Handler for guest execution control notifications.
      */
-    HRESULT handleErrorCompletion(int rc);
-    HRESULT handleErrorHGCM(int rc);
+    HRESULT setErrorCompletion(int rc);
+    HRESULT setErrorFromProgress(ComPtr<IProgress> pProgress);
+    HRESULT setErrorHGCM(int rc);
 # endif
 
@@ -319 +325 @@
     /** Next upcoming context ID. */
     volatile uint32_t mNextContextID;
+    /** Next upcoming host PID */
+    volatile uint32_t mNextHostPID;
     /** Next upcoming directory handle ID. */
     volatile uint32_t mNextDirectoryID;