Changeset 35558 in vbox

Timestamp:

Jan 14, 2011 1:30:33 PM (14 years ago)

Author:

vboxsync

Message:

Runtime/process: add a Solaris-specific flag to suppress changing the contract id (not used at the moment), and put a note in the runtime that the webservice self-daemonizing code relies on the fact that RTProcDaemonizeUsingFork keeps the contract id unchanged, in case someone cleans this up

Location:

trunk

Files:

• include/iprt/process.h (modified) (1 diff)
• src/VBox/Runtime/r3/posix/process-creation-posix.cpp (modified) (4 diffs)

trunk/include/iprt/process.h

@@ -194 +194 @@
  * introduced with Windows Vista. */
 #define RTPROC_FLAGS_SERVICE                RT_BIT(2)
+/** Suppress changing the process contract id for the child process
+ * on Solaris. Without this flag the contract id is always changed,
+ * as that's the more frequently used case. */
+#define RTPROC_FLAGS_SAME_CONTRACT          RT_BIT(3)
 /** @}  */
 

trunk/src/VBox/Runtime/r3/posix/process-creation-posix.cpp

@@ -356 +356 @@
     {
 # ifdef RT_OS_SOLARIS
-        int templateFd = rtSolarisContractPreFork();
-        if (templateFd == -1)
-            return VERR_OPEN_FAILED;
+        int templateFd = -1;
+        if (!(fFlags & RTPROC_FLAGS_SAME_CONTRACT))
+        {
+            templateFd = rtSolarisContractPreFork();
+            if (templateFd == -1)
+                return VERR_OPEN_FAILED;
+        }
 # endif /* RT_OS_SOLARIS */
         pid = fork();
@@ -364 +368 @@
         {
 # ifdef RT_OS_SOLARIS
-            rtSolarisContractPostForkChild(templateFd);
+            if (!(fFlags & RTPROC_FLAGS_SAME_CONTRACT))
+                rtSolarisContractPostForkChild(templateFd);
 # endif /* RT_OS_SOLARIS */
             setsid(); /* see comment above */
@@ -374 +379 @@
         {
 #ifdef RT_OS_SOLARIS
-            rtSolarisContractPostForkParent(templateFd, pid);
+            if (!(fFlags & RTPROC_FLAGS_SAME_CONTRACT))
+                rtSolarisContractPostForkParent(templateFd, pid);
 #endif /* RT_OS_SOLARIS */
             if (pid > 0)
@@ -657 +663 @@
     /* Create new session, fix up the standard file descriptors and the
      * current working directory. */
+    /** @todo r=klaus the webservice uses this function and assumes that the
+     * contract id of the daemon is the same as that of the original process.
+     * Whenever this code is changed this must still remain possible. */
     pid_t newpgid = setsid();
     int SavedErrno = errno;