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

Timestamp:

Jul 18, 2012 6:02:58 PM (13 years ago)

Author:

vboxsync

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

79230

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main/include

Files:

• GuestCtrlImplPrivate.h (modified) (8 diffs)
• GuestImpl.h (modified) (1 diff)
• GuestProcessImpl.h (modified) (4 diffs)
• GuestSessionImpl.h (modified) (4 diffs)

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

@@ -37 +37 @@
 
 
-/* Builds a context ID out of the session ID, process ID and an
- * increasing count. */
+/** Maximum number of guest sessions a VM can have. */
+#define VBOX_GUESTCTRL_MAX_SESSIONS     255
+/** Maximum of guest processes a guest session can have. */
+#define VBOX_GUESTCTRL_MAX_PROCESSES    255
+/** Maximum of callback contexts a guest process can have. */
+#define VBOX_GUESTCTRL_MAX_CONTEXTS     _64K - 1
+
+/** Builds a context ID out of the session ID, process ID and an
+ *  increasing count. */
 #define VBOX_GUESTCTRL_CONTEXTID_MAKE(uSession, uProcess, uCount) \
     (  (uint32_t)((uSession) &   0xff) << 24 \
@@ -44 +51 @@
      | (uint32_t)((uCount)   & 0xffff)       \
     )
+/** Gets the session ID out of a context ID. */
+#define VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(uContextID) \
+    ((uContextID) >> 24)
+/** Gets the process ID out of a context ID. */
+#define VBOX_GUESTCTRL_CONTEXTID_GET_PROCESS(uContextID) \
+    (((uContextID) >> 16) & 0xff)
+/** Gets the conext count of a process out of a context ID. */
+#define VBOX_GUESTCTRL_CONTEXTID_GET_COUNT(uContextID) \
+    ((uContextID) & 0xffff)
 
 
@@ -67 +83 @@
 public:
 
+    int Cancel(void);
+
+    bool Canceled(void);
+
     int Init(eVBoxGuestCtrlCallbackType enmType);
 
@@ -73 +93 @@
     eVBoxGuestCtrlCallbackType Type(void);
 
-    int Wait(RTMSINTERVAL timeoutMS);
+    int Wait(ULONG uTimeoutMS);
 
 protected:
@@ -80 +100 @@
     eVBoxGuestCtrlCallbackType  mType;
     /** Callback flags. */
-    uint32_t                    mFlags;
+    uint32_t                    uFlags;
+    /** Was the callback canceled? */
+    bool                        fCanceled;
     /** Pointer to user-supplied data. */
     void                       *pvData;
@@ -86 +108 @@
     size_t                      cbData;
     /** The event semaphore triggering the*/
-    RTSEMEVENT                  mEventSem;
+    RTSEMEVENT                  hEventSem;
     /** Extended error information, if any. */
     ErrorInfo                   mErrorInfo;
 };
-typedef std::map <uint32_t, GuestCtrlCallback> GuestCtrlCallbacks;
+typedef std::map < uint32_t, GuestCtrlCallback* > GuestCtrlCallbacks;
 
 /**
@@ -112 +134 @@
 public:
 
-    int BuildEnvironmentBlock(void **ppvEnv, uint32_t *pcbEnv, uint32_t *pcEnvVars);
+    int BuildEnvironmentBlock(void **ppvEnv, size_t *pcbEnv, uint32_t *pcEnvVars);
 
     void Clear(void);
@@ -144 +166 @@
 protected:
 
-    int appendToEnvBlock(const char *pszEnv, void **ppvList, uint32_t *pcbList, uint32_t *pcEnvVars);
+    int appendToEnvBlock(const char *pszEnv, void **ppvList, size_t *pcbList, uint32_t *pcEnvVars);
 
 protected:

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

@@ -205 +205 @@
     /** @name Public internal methods.
      * @{ */
+    int         dispatchToSession(uint32_t uContextID, uint32_t uFunction, void *pvData, size_t cbData);
     Console    *getConsole(void) { return mParent; }
     int         sessionClose(ComObjPtr<GuestSession> pSession);

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

@@ -45 +45 @@
     DECLARE_EMPTY_CTOR_DTOR(GuestProcess)
 
-    int     init(Console *aConsole, GuestSession *aSession, uint32_t aProcessID, const GuestProcessInfo &aProcInfo);
+    int     init(Console *aConsole, GuestSession *aSession, ULONG aProcessID, const GuestProcessInfo &aProcInfo);
     void    uninit(void);
     HRESULT FinalConstruct(void);
@@ -69 +69 @@
     /** @name Public internal methods.
      * @{ */
-    int callbackAdd(const GuestCtrlCallback& theCallback, uint32_t *puContextID);
-    bool callbackExists(uint32_t uContextID);
+    int callbackAdd(GuestCtrlCallback *pCallback, ULONG *puContextID);
+    int callbackDispatcher(uint32_t uContextID, uint32_t uFunction, void *pvData, size_t cbData);
+    bool callbackExists(ULONG uContextID);
     bool isReady(void);
-    int prepareExecuteEnv(const char *pszEnv, void **ppvList, uint32_t *pcbList, uint32_t *pcEnvVars);
-    int readData(ULONG aHandle, ULONG aSize, ULONG aTimeoutMS, ComSafeArrayOut(BYTE, aData));
+    ULONG getPID(void) { return mData.mPID; }
+    int onGuestDisconnected(void);
+    int onProcessInputStatus(uint32_t uStatus, uint32_t uFlags, uint32_t cbDataProcessed);
+    int onProcessStatusChange(uint32_t uStatus, uint32_t uFlags, uint32_t uPID);
+    int onProcessOutput(uint32_t uHandle, uint32_t uFlags, void *pvData, uint32_t cbData);
+    int prepareExecuteEnv(const char *pszEnv, void **ppvList, ULONG *pcbList, ULONG *pcEnvVars);
+    int readData(ULONG uHandle, ULONG uSize, ULONG uTimeoutMS, BYTE *pbData, size_t cbData);
     int startProcess(void);
     static DECLCALLBACK(int) startProcessThread(RTTHREAD Thread, void *pvUser);
     int terminateProcess(void);
-    int waitFor(ComSafeArrayIn(ProcessWaitForFlag_T, aFlags), ULONG aTimeoutMS, ProcessWaitReason_T *aReason);
-    int writeData(ULONG aHandle, ComSafeArrayIn(BYTE, aData), ULONG aTimeoutMS, ULONG *aWritten);
+    int waitFor(uint32_t fFlags, ULONG uTimeoutMS, ProcessWaitReason_T *penmReason);
+    int writeData(ULONG uHandle, BYTE const *pbData, size_t cbData, ULONG uTimeoutMS, ULONG *puWritten);
     /** @}  */
 
@@ -99 +105 @@
         ULONG                    mPID;
         /** Internal, host-side process ID. */
-        uint32_t                 mProcessID;
+        ULONG                 mProcessID;
         /** The current process status. */
         ProcessStatus_T          mStatus;
@@ -105 +111 @@
         bool                     mStarted;
         /** The next upcoming context ID. */
-        uint32_t                 mNextContextID;
+        ULONG                    mNextContextID;
+        /** The waiting event. */
+        RTSEMEVENT               mEvent;
     } mData;
+
+    friend GuestSession; /* Let's be friends! */
 };
 

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

@@ -48 +48 @@
     DECLARE_EMPTY_CTOR_DTOR(GuestSession)
 
-    int     init(Guest *aGuest, uint32_t aSessionID, Utf8Str aUser, Utf8Str aPassword, Utf8Str aDomain, Utf8Str aName);
+    int     init(Guest *aGuest, ULONG aSessionID, Utf8Str aUser, Utf8Str aPassword, Utf8Str aDomain, Utf8Str aName);
     void    uninit(void);
     HRESULT FinalConstruct(void);
@@ -113 +113 @@
     typedef std::vector <ComObjPtr<GuestDirectory> > SessionDirectories;
     typedef std::vector <ComObjPtr<GuestFile> > SessionFiles;
-    typedef std::map <uint32_t, ComObjPtr<GuestProcess> > SessionProcesses;
+    /** Map of guest processes. The key specifies the internal process number.
+     *  To retrieve the process' guest PID use the Id() method of the IProgress interface. */
+    typedef std::map <ULONG, ComObjPtr<GuestProcess> > SessionProcesses;
 
 public:
@@ -119 +121 @@
      * @{ */
     int                     directoryClose(ComObjPtr<GuestDirectory> pDirectory);
+    int                     dispatchToProcess(uint32_t uContextID, uint32_t uFunction, void *pvData, size_t cbData);
     int                     fileClose(ComObjPtr<GuestFile> pFile);
     const GuestCredentials &getCredentials(void);
@@ -124 +127 @@
     int                     processClose(ComObjPtr<GuestProcess> pProcess);
     int                     processCreateExInteral(GuestProcessInfo &aProcInfo, IGuestProcess **aProcess);
-    inline bool             processExists(uint32_t uProcessID);
+    inline bool             processExists(ULONG uProcessID, ComObjPtr<GuestProcess> *pProcess);
+    inline int              processGetByPID(ULONG uPID, ComObjPtr<GuestProcess> *pProcess);
     /** @}  */