Changeset 3641 for trunk

Timestamp:

May 18, 2008, 2:11:03 PM (18 years ago)

Author:

bird

Message:

Moved the spawn wait hack into spm and made it a passive wait.

Location:

trunk/libc

Files:

• include/InnoTekLIBC/sharedpm.h (modified) (1 diff)
• src/kNIX/os2/__spawnve.c (modified) (2 diffs)
• src/kNIX/os2/sharedpm.c (modified) (9 diffs)

trunk/libc/include/InnoTekLIBC/sharedpm.h

@@ -697 +697 @@
 
 /**
+
+
+
+
+
+
+
+
+
  * Searches for a process given by pid.
  *

trunk/libc/src/kNIX/os2/__spawnve.c

@@ -531 +531 @@
                  * If we figure that it's a libc child, we can wait a good deal longer.
                  */
-                /** @todo add a SPM notification for when inherit is completed. */
-                __LIBC_SPMLOADAVG LoadAvg;
-                unsigned uLoadAvgTS;
-                int fDoneInherit;
-                ULONG ulStart = fibGetMsCount();
-                rc = 0;
-                while (     (fDoneInherit = pEmbryo->enmState >= __LIBC_PROCSTATE_ALIVE
-                                         || (pEmbryo->pInherit == NULL && pEmbryo->pInheritLocked == NULL)
-                            ) == 0
-                       &&   fibGetMsCount() - ulStart <= 8)
-                {
-                    DosSleep(rc++ > 4);
-                    __libc_spmGetLoadAvg(&LoadAvg, &uLoadAvgTS); /* SMP HACK */
-                }
-                if (    !fDoneInherit
-                    &&  pEmbryo->enmState == __LIBC_PROCSTATE_ALIVE)
-                {
-                    LIBCLOG_MSG("libc child - wait some more (rc=%d)\n", rc);
-                    rc = 0;
-                    __libc_spmGetLoadAvg(&LoadAvg, &uLoadAvgTS); /* SMP HACK */
-                    while (     (fDoneInherit = pEmbryo->enmState >= __LIBC_PROCSTATE_ALIVE
-                                             || (pEmbryo->pInherit == NULL && pEmbryo->pInheritLocked == NULL)
-                                ) == 0
-                           &&   fibGetMsCount() - ulStart <= 100)
-                    {
-                        DosSleep(rc++ > 4);
-                        __libc_spmGetLoadAvg(&LoadAvg, &uLoadAvgTS); /* SMP HACK */
-                    }
-                }
-                LIBCLOG_MSG("fDoneInherit=%d rc=%d enmState=%d inh=%p,%p - waited %d ms\n",
-                            fDoneInherit, rc, pEmbryo->enmState, pEmbryo->pInherit, pEmbryo->pInheritLocked, fibGetMsCount() - ulStart);
+                int fDoneInherit = __libc_spmWaitForChildToBecomeAlive(pEmbryo);
+                LIBCLOG_MSG("fDoneInherit=%d enmState=%d inh=%p,%p\n",
+                            fDoneInherit, pEmbryo->enmState, pEmbryo->pInherit, pEmbryo->pInheritLocked);
 
                 /*
@@ -634 +606 @@
                         {
                             LIBCLOG_MSG("waiting some more...\n");
-                            do
-                            {
-                                DosSleep(!(rc++ % 3));
-                                __libc_spmGetLoadAvg(&LoadAvg, &uLoadAvgTS); /* SMP HACK */
-                                fDoneInherit = pEmbryo->enmState > __LIBC_PROCSTATE_ALIVE
-                                            || (pEmbryo->pInherit == NULL && pEmbryo->pInheritLocked == NULL);
-                            } while (!fDoneInherit
-                                  && fibGetMsCount() - ulStart <= 200);
-                            LIBCLOG_MSG("fDoneInherit=%d rc=%d enmState=%d inh=%p,%p - waited %d ms\n",
-                                        fDoneInherit, rc, pEmbryo->enmState, pEmbryo->pInherit, pEmbryo->pInheritLocked, fibGetMsCount() - ulStart);
+                            fDoneInherit = __libc_spmWaitForChildToBecomeAlive(pEmbryo);
+                            LIBCLOG_MSG("fDoneInherit=%d enmState=%d inh=%p,%p\n",
+                                        fDoneInherit, pEmbryo->enmState, pEmbryo->pInherit, pEmbryo->pInheritLocked);
                         }
 

trunk/libc/src/kNIX/os2/sharedpm.c

@@ -25 +25 @@
  *
  */
+
 
 /** @todo
@@ -461 +462 @@
             LIBC_ASSERTM(!gpSPMSelf->pInheritLocked, "Trying to free a locked inherit struct!\n");
 
-            spmReleaseMutex(&RegRec);
+            LIBCLOG_MSG("posting %#lx\n", gpSPMHdr->hevNotify);
+            APIRET rc2 = DosPostEventSem(gpSPMHdr->hevNotify);
+            spmReleaseMutex(&RegRec); 
+            LIBC_ASSERTM(!rc2, "rc2=%ld!\n", rc2); rc2 = rc2;
         }
     }
@@ -596 +600 @@
 
 /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
  * Searches for a process given by pid.
  *
@@ -2282 +2375 @@
             if (!gpSPMHdr->cSigMaxActive)
                 gpSPMHdr->cSigMaxActive = 1024;
+
+
+
+
         }
         else
@@ -2343 +2440 @@
         {
             /*
-             * Register the current process and increment open counter.
+             * Register the current process, increment open counter,
+             * and notify everyone that spm data has changed.
              */
             PLINFOSEG pLIS = GETLINFOSEG();
             spmRegisterSelf(pPib->pib_ulpid, pPib->pib_ulppid, pLIS->sgCurrent);
             if (gpSPMSelf)
+
                 gpSPMSelf->cSPMOpens++;
+
+
+
+
+
 
             /*
@@ -2529 +2633 @@
                     *pParent->ppChildNotifyTail = pTerm;
                     pParent->ppChildNotifyTail = &pTerm->pNext;
-                    DosPostEventSem(gpSPMHdr->hevNotify);
+                    
+                    LIBCLOG_MSG("posting %#lx\n", gpSPMHdr->hevNotify);
+                    APIRET rc2 = DosPostEventSem(gpSPMHdr->hevNotify);
+                    LIBC_ASSERTM(!rc2, "rc2=%ld!\n", rc2); rc2 = rc2;
                 }
                 else
@@ -3151 +3258 @@
 
                 /* post notification sem. */
-                DosPostEventSem(gpSPMHdr->hevNotify);
+                LIBCLOG_MSG("posting %#lx\n", gpSPMHdr->hevNotify);
+                APIRET rc2 = DosPostEventSem(gpSPMHdr->hevNotify);
+                LIBC_ASSERTM(!rc2, "rc2=%ld!\n", rc2); rc2 = rc2;
             }
             else
@@ -3353 +3462 @@
                     spmFreeProcess(pProcess);
                     pProcess = pProcessNext;
+
+
+
+
+
                     continue;
                 }
@@ -3444 +3558 @@
                         spmFreeProcess(pProcess);
                         pProcess = pProcessNext;
+
+
+
+
+
                         continue;
                     }