Changeset 45415 in vbox for trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.h

Timestamp:

Apr 8, 2013 9:40:42 PM (12 years ago)

Author:

vboxsync

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

84843

Message:

GuestCtrl: Implemented using (public) VirtualBox events instead of own callback mechanisms. Bugfixes for testcases (still work in progress).

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.h (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.h

@@ -169 +169 @@
 /**
  * Structure for a guest session thread to
- * observe the forked session instance.
+ * observe/control the forked session instance from
+ * the VBoxService main executable.
  */
 typedef struct VBOXSERVICECTRLSESSIONTHREAD
@@ -243 +244 @@
 typedef struct VBOXSERVICECTRLSESSION
 {
+    /* The session's startup information. */
     VBOXSERVICECTRLSESSIONSTARTUPINFO
                                     StartupInfo;
-    /** List of active guest control threads (VBOXSERVICECTRLTHREAD). */
-    RTLISTANCHOR                    lstControlThreadsActive;
-    /** List of inactive guest control threads (VBOXSERVICECTRLTHREAD). */
+    /** List of active guest process threads (VBOXSERVICECTRLPROCESS). */
+    RTLISTANCHOR                    lstProcessesActive;
+    /** List of inactive guest process threads (VBOXSERVICECTRLPROCESS). */
     /** @todo Still needed? */
-    RTLISTANCHOR                    lstControlThreadsInactive;
+    RTLISTANCHOR                    lstProcessesInactive;
     /** List of guest control files (VBOXSERVICECTRLFILE). */
     RTLISTANCHOR                    lstFiles;
-    /** Critical section for protecting the guest process
-     *  threading list. */
-    RTCRITSECT                      csControlThreads;
+    /** The session's critical section. */
+    RTCRITSECT                      CritSect;
     /** Session flags. */
     uint32_t                        uFlags;
@@ -330 +331 @@
     /** Critical section for thread-safe use. */
     RTCRITSECT                      CritSect;
-    /** @todo Document me! */
+    /** Process startup information. */
+    VBOXSERVICECTRLPROCSTARTUPINFO
+                                    StartupInfo;
+    /** The process' PID assigned by the guest OS. */
     uint32_t                        uPID;
-    char                           *pszCmd;
-    uint32_t                        uFlags;
-    char                          **papszArgs;
-    uint32_t                        uNumArgs;
-    char                          **papszEnv;
-    uint32_t                        uNumEnvVars;
-    /** Name of specified user account to run the
-     *  guest process under. */
-    char                           *pszUser;
-    /** Password of specified user account. */
-    char                           *pszPassword;
-    /** Overall time limit (in ms) that the guest process
-     *  is allowed to run. 0 for indefinite time. */
-    uint32_t                        uTimeLimitMS;
     /** Pointer to the current IPC request being
-     *  processed. */
+     *  processed. We only support one request at a
+     *  time at the moment.
+     ** @todo Implemenet a request queue. */
     PVBOXSERVICECTRLREQUEST         pRequest;
     /** StdIn pipe for addressing writes to the
@@ -374 +366 @@
 
 /* Guest session thread handling. */
-extern int                      GstCntlSessionThreadOpen(PRTLISTANCHOR pList, const PVBOXSERVICECTRLSESSIONSTARTUPINFO pSessionStartupInfo, PVBOXSERVICECTRLSESSIONTHREAD *ppSessionThread);
-extern int                      GstCntlSessionThreadClose(PVBOXSERVICECTRLSESSIONTHREAD pSession, uint32_t uFlags);
-extern int                      GstCntlSessionThreadCloseAll(PRTLISTANCHOR pList, uint32_t uFlags);
+extern int                      GstCntlSessionThreadCreate(PRTLISTANCHOR pList, const PVBOXSERVICECTRLSESSIONSTARTUPINFO pSessionStartupInfo, PVBOXSERVICECTRLSESSIONTHREAD *ppSessionThread);
+extern int                      GstCntlSessionThreadDestroy(PVBOXSERVICECTRLSESSIONTHREAD pSession, uint32_t uFlags);
+extern int                      GstCntlSessionThreadDestroyAll(PRTLISTANCHOR pList, uint32_t uFlags);
 extern int                      GstCntlSessionThreadTerminate(PVBOXSERVICECTRLSESSIONTHREAD pSession);
 extern RTEXITCODE               VBoxServiceControlSessionForkInit(int argc, char **argv);
@@ -392 +384 @@
 extern int                      GstCntlProcessPerform(PVBOXSERVICECTRLPROCESS pProcess, PVBOXSERVICECTRLREQUEST pRequest);
 extern int                      GstCntlProcessStart(const PVBOXSERVICECTRLSESSION pSession, const PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo, uint32_t uContext);
-extern int                      GstCntlProcessStop(const PVBOXSERVICECTRLPROCESS pThread);
-extern void                     GstCntlProcessRelease(const PVBOXSERVICECTRLPROCESS pThread);
-extern int                      GstCntlProcessWait(const PVBOXSERVICECTRLPROCESS pThread, RTMSINTERVAL msTimeout, int *prc);
-extern int                      GstCntlProcessFree(PVBOXSERVICECTRLPROCESS pThread);
+extern int                      GstCntlProcessStop(PVBOXSERVICECTRLPROCESS pProcess);
+extern void                     GstCntlProcessRelease(const PVBOXSERVICECTRLPROCESS pProcess);
+extern int                      GstCntlProcessWait(const PVBOXSERVICECTRLPROCESS pProcess, RTMSINTERVAL msTimeout, int *pRc);
+extern int                      GstCntlProcessFree(PVBOXSERVICECTRLPROCESS pProcess);
 /* Process request handling. */
 extern int                      GstCntlProcessRequestAlloc(PVBOXSERVICECTRLREQUEST *ppReq, VBOXSERVICECTRLREQUESTTYPE enmType);