Changeset 2211

Timestamp:

Jul 6, 2005, 5:45:59 AM (20 years ago)

Author:

bird

Message:

o Fixed spawn/fork + fork() + exec/spawn/fork in the child.
o Kill any known decentants to prevent them from being

adopted by our parent. (On UNIX processes begin made
orphants are adopted and killed by the init process.)

File:

• trunk/src/emx/src/lib/sys/b_processWait.c (modified) (8 diffs, 1 prop)

trunk/src/emx/src/lib/sys/b_processWait.c

@@ -50 +50 @@
 #include <InnoTekLIBC/backend.h>
 #include <InnoTekLIBC/FastInfoBlocks.h>
+
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_PROCESS
 #include <InnoTekLIBC/logstrict.h>
@@ -119 +120 @@
 /** List of known children. */
 static volatile PWAITCHILD  gpChildrenHead;
+
+
 /** Number of known child processes. */
 static volatile unsigned    gcChildren;
@@ -149 +152 @@
 static int  waitAllocInsert(const PWAITINFO pWaitInsert);
 static inline void waitInfoToSigInfo(const PWAITINFO pWait, siginfo_t *pSigInfo);
+
 
 
@@ -192 +196 @@
     if (gtidThread)
     {
-        /* kill the thread */
+        /* kill the thread */
         __atomic_xchg(&gfTerminate, 1);
         DosKillThread(gtidThread);
@@ -214 +218 @@
         DosPostEventSem(hev);
         DosCloseEventSem(hev);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 }
@@ -328 +369 @@
                     else
                         gpChildrenHead = pChild->pNext;
+
+
                     __atomic_decrement_min(&gcChildren, 0);
                     break;
@@ -570 +613 @@
 void __libc_back_processWaitNotifyExec(pid_t pid)
 {
-    PWAITCHILD pChild = _hmalloc(sizeof(*pChild));
-    waitSemRequest(0);
+    /*
+     * Allocate and enter semaphore protection.
+     */
+    PWAITCHILD pChild = NULL;
+    if (gpChildrenFree)
+    {
+        waitSemRequest(0);
+        pChild = gpChildrenFree;
+        if (pChild)
+            gpChildrenFree = pChild->pNext;
+        else
+            waitSemRelease();
+    }
+    if (!pChild)
+    {
+        pChild = _hmalloc(sizeof(*pChild));
+        waitSemRequest(0);
+    }
 
     /*
@@ -979 +1038 @@
                        rc, pSigInfo->si_pid, pSigInfo->si_code, pSigInfo->si_status);
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+