Changeset 3783

Timestamp:

Mar 22, 2012, 7:10:19 PM (13 years ago)

Author:

bird

Message:

0.6/sharedpm.c: Disabled some racy/buggy code in libc_spmSelf.

File:

• branches/libc-0.6/src/emx/src/lib/sys/sharedpm.c (modified) (10 diffs)

branches/libc-0.6/src/emx/src/lib/sys/sharedpm.c

@@ -384 +384 @@
         if (spmRequestMutexErrno(&RegRec))
             LIBCLOG_RETURN_P(NULL);
+        /* bird: The following code is broken (bad test). Since it never worked
+           and the fix on trunk involves adding another parameter, I'll just
+           disable the path that will screw up badly and leave the result NULL
+           like most calls already returns. See r2937. */
+#if 0
         if (!gpSPMSelf)
             pProcess = gpSPMSelf;
@@ -403 +408 @@
             FS_RESTORE();
         }
+#else
+        pProcess = gpSPMSelf;
+#endif
         spmReleaseMutex(&RegRec);
     }
@@ -629 +637 @@
 
 /**
- * Wait for a embryo to become a live process and complete 
+ * Wait for a embryo to become a live process and complete
  * inheriting (file handles / sockets issues).
  *
@@ -646 +654 @@
     DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT, &ulStart, sizeof(ulStart));
 
-    /* 
+    /*
      * Wait for the process to become ready, 8 ms max.
-     * However, if it becomes alive in that period we know it's a libc 
+     * However, if it becomes alive in that period we know it's a libc
      * process and will wait a bit more (130 ms) for it to finishing
      * initialization and inheritance.
      */
-    for (cLoops = 0; ; cLoops++) 
-    {
-        /* 
-         * Reset the notification event sem. 
+    for (cLoops = 0; ; cLoops++)
+    {
+        /*
+         * Reset the notification event sem.
          */
         spmRequestMutex(&RegRec);
         fAlive = pEmbryo->enmState > __LIBC_PROCSTATE_ALIVE
-              || (   pEmbryo->pInherit == NULL 
+              || (   pEmbryo->pInherit == NULL
                   && pEmbryo->pInheritLocked == NULL
                   && pEmbryo->enmState == __LIBC_PROCSTATE_ALIVE);
@@ -668 +676 @@
             break; /* done */
 
-        /* 
-         * Calc the time we should sleep. 
+        /*
+         * Calc the time we should sleep.
          */
         ULONG ulNow = 0;
@@ -688 +696 @@
             LIBCLOG_MSG("libc child - wait %lu ms (cLoops=%d rc=%ld)\n", ulSleep, cLoops, rc);
         }
-        else 
+        else
             break; /* giving up */
 
-        /* 
-         * Recheck before going to sleep on the event sem. 
+        /*
+         * Recheck before going to sleep on the event sem.
          */
         fAlive = pEmbryo->enmState > __LIBC_PROCSTATE_ALIVE
-              || (   pEmbryo->pInherit == NULL 
+              || (   pEmbryo->pInherit == NULL
                   && pEmbryo->pInheritLocked == NULL
                   && pEmbryo->enmState == __LIBC_PROCSTATE_ALIVE);
@@ -701 +709 @@
             break; /* done */
 
-        if (    gpSPMHdr->hevNotify 
+        if (    gpSPMHdr->hevNotify
             &&  (rc == NO_ERROR || rc == ERROR_TIMEOUT || rc == ERROR_SEM_TIMEOUT))
             rc = DosWaitEventSem(gpSPMHdr->hevNotify, ulSleep);
@@ -2667 +2675 @@
                     *pParent->ppChildNotifyTail = pTerm;
                     pParent->ppChildNotifyTail = &pTerm->pNext;
-                    
+
                     LIBCLOG_MSG("posting %#lx\n", gpSPMHdr->hevNotify);
                     APIRET rc2 = DosPostEventSem(gpSPMHdr->hevNotify);
@@ -3496 +3504 @@
                     spmFreeProcess(pProcess);
                     pProcess = pProcessNext;
-                    
+
                     /* Wake up the embryo waiters (paranoia). */
                     LIBCLOG_MSG("posting %#lx\n", gpSPMHdr->hevNotify);
@@ -3592 +3600 @@
                         spmFreeProcess(pProcess);
                         pProcess = pProcessNext;
-                        
+
                         /* Wake up the embryo waiters (paranoia). */
                         LIBCLOG_MSG("posting %#lx\n", gpSPMHdr->hevNotify);