Changeset 5058 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Sep 26, 2007 4:35:25 PM (17 years ago)

Author:

vboxsync

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

24871

Message:

XPCOM: Fixed _PR_DetachOS2Process() which now uses DosStartSession(SSF_TYPE_PM) instead of DosExecPgm(EXEC_BACKGROUND).

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr/src

Files:

• md/os2/os2misc.c (modified) (13 diffs)
• misc/prinit.c (modified) (2 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/os2/os2misc.c

@@ -61 +61 @@
 
 
+/* see assembleEnvBlock() below */
+#define USE_DOSALLOCMEM
+
+
 /*
  **************************************************************************
@@ -204 +208 @@
     envBlockSize++;
 
+    /* It seems that the Environment parameter of DosStartSession() and/or
+     * DosExecPgm() wants a memory block that is completely within the 64K
+     * memory object; otherwise we will get the environment truncated on the
+     * 64K boundary in the child process. PR_MALLOC() cannot guarantee this,
+     * so use DosAllocMem directly. */
+#ifdef USE_DOSALLOCMEM
+    DosAllocMem((PPVOID) envBlock, envBlockSize, PAG_COMMIT | PAG_READ | PAG_WRITE);
+    p = *envBlock;
+#else
     p = *envBlock = PR_MALLOC(envBlockSize);
+#endif
     if (p == NULL) {
         return -1;
@@ -235 +249 @@
 
 /*
- * On OS/2, you can only detach a new process -- you cannot make it detached
- * after it has been started. This is why _PR_CreateOS2ProcessEx() is
- * necessary. This function is called directly from PR_CreateProcessDetached().
- */
+ * On OS/2, a process can be detached only when it is started -- you cannot
+ * make it detached afterwards. This is why _PR_CreateOS2ProcessEx() is
+ * necessary. This function is called directly from
+ * PR_CreateProcessDetached().  */
 PRProcess * _PR_CreateOS2ProcessEx(
     const char *path,
@@ -281 +295 @@
      * it into the envp array, so envp cannot be NULL.
      */
-    if ((envp == NULL) && attr && attr->fdInheritBuffer) {
+    if (envp == NULL && attr && attr->fdInheritBuffer) {
         envp = environ;
     }
@@ -342 +356 @@
     }
 
+    /* We don't want to use DosExecPgm for detached processes because
+     * they won't have stdin/stderr/stdout by default which will hang up
+     * the child process if it tries to write/read from there. Instead,
+     * we will detach console processes by starting them using the PM session
+     * (yes, it requires PM, but the whole XPCOM does so too).
+     */
+#if 0
     if (detached) {
         /* we don't care about parent/child process type matching,
@@ -384 +405 @@
         }
 
-        proc->md.pid = res.codeTerminate;
-    }
-    else {
+        /* use 0 to indicate the detached process in the internal
+         * process structure (I believe no process may have pid of 0) */
+        proc->md.pid = 0 /* res.codeTerminate */;
+    }
+    else
+#endif
+    {
         STARTDATA startData = {0};
 
@@ -393 +418 @@
         }
         else if (ulAppType & FAPPTYP_WINDOWCOMPAT) {
-            startData.SessionType = SSF_TYPE_WINDOWABLEVIO;
+            startData.SessionType = detached ? SSF_TYPE_PM
+                                             : SSF_TYPE_WINDOWABLEVIO;
+        }
+        else if (ulAppType & FAPPTYP_NOTWINDOWCOMPAT) {
+            startData.SessionType = detached ? SSF_TYPE_PM
+                                             : SSF_TYPE_DEFAULT;
         }
         else {
@@ -418 +448 @@
         startData.PgmName = pszEXEName;
 
+        startData.Related = detached ? SSF_RELATED_INDEPENDENT : SSF_RELATED_CHILD;
+
         startData.Length = sizeof(startData);
-        startData.Related = SSF_RELATED_INDEPENDENT;
         startData.ObjectBuffer = pszObjectBuffer;
         startData.ObjectBuffLen = CCHMAXPATH;
@@ -431 +462 @@
         }
 
-        proc->md.pid = pid;
+        /* if Related is SSF_RELATED_INDEPENDENT, we don't get pid of the started
+         * process and use 0 to indicate the detached process in the internal
+         * process structure (I believe no process may have pid of 0).
+         */
+        proc->md.pid = detached ? 0 : pid;
     }
 
@@ -444 +479 @@
     }
     if (envBlock) {
+#ifdef USE_DOSALLOCMEM
+        DosFreeMem(envBlock);
+#else
         PR_DELETE(envBlock);
+#endif
     }
     return proc;
@@ -459 +498 @@
     }
     if (envBlock) {
+#ifdef USE_DOSALLOCMEM
+        DosFreeMem(envBlock);
+#else
         PR_DELETE(envBlock);
+#endif
     }
     if (proc) {
@@ -481 +524 @@
      * You can't 'detach' it later on.
      */
-    PR_DELETE(process);
-    return PR_SUCCESS;
+    if (process->md.pid == 0) {
+        /* this is a detached process, just free memory */
+        PR_DELETE(process);
+        return PR_SUCCESS;
+    }
+    /* For a normal child process, we can't complete the request. Note that
+     * terminating the parent process w/o calling PR_WaitProcess() on the
+     * child will terminate the child as well (since it is not detached).
+     */
+    PR_SetError(PR_OPERATION_NOT_SUPPORTED_ERROR, 0);
+    return PR_FAILURE;
 }
 
@@ -510 +562 @@
 PRStatus _PR_KillOS2Process(PRProcess *process)
 {
-   ULONG ulRetVal;
+    ULONG ulRetVal;
     if ((ulRetVal = DosKillProcess(DKP_PROCESS, process->md.pid)) == NO_ERROR) {
         return PR_SUCCESS;

trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prinit.c

@@ -740 +740 @@
     const PRProcessAttr *attr)
 {
-#ifdef XP_OS2
-    PRProcess *process;
-    process = _PR_CreateOS2ProcessEx(path, argv, envp, attr, PR_TRUE);
-    if (NULL == process) {
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-#else
     PRProcess *process;
     PRStatus rv;
 
+#ifdef XP_OS2
+    process = _PR_CreateOS2ProcessEx(path, argv, envp, attr, PR_TRUE);
+#else
     process = PR_CreateProcess(path, argv, envp, attr);
+#endif
     if (NULL == process) {
         return PR_FAILURE;
@@ -762 +758 @@
     }
     return PR_SUCCESS;
-#endif
 }