Changeset 3852 for trunk

Timestamp:

Mar 17, 2014, 5:24:58 AM (11 years ago)

Author:

bird

Message:

sharedpm.c: Fixed leak of pTerm of processes which didn't send any termination notification to their parent. Make sure we get inherit data, even locked, when the process is being freed or turned into a zombie. Use DosVerityPidTid to quickly weed out embryo process structures of non-libc processes.

File:

• trunk/libc/src/kNIX/os2/sharedpm.c (modified) (9 diffs)

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

@@ -5 +5 @@
  *
  * Copyright (c) 2004 nickk
- * Copyright (c) 2004-2005 knut st. osmundsen <bird-src-spam@anduin.net>
+ * Copyright (c) 2004-2014 knut st. osmundsen <bird-src-spam@anduin.net>
  *
  *
@@ -514 +514 @@
             SPM_ASSERT_PTR_NULL(pProcess->pPrev);
             SPM_ASSERT_PTR_NULL(pProcess->pNext);
-            if (    pProcess->pidParent == pidParent
-                &&  pProcess->cReferences == 0
-                &&  uTimestamp - pProcess->uTimestamp >= 1*60*1000)
+            if (   pProcess->pidParent == pidParent
+                && pProcess->cReferences == 0
+                && (   uTimestamp - pProcess->uTimestamp >= 1*60*1000
+                    || (   uTimestamp - pProcess->uTimestamp >= 8000
+                        && pProcess->pid != -1
+                        && DosVerifyPidTid(pProcess->pid, 1) == ERROR_INVALID_PROCID)
+                   )
+               )
             {
                 __LIBC_PSPMPROCESS      pProcessNext = pProcess->pNext;
@@ -2673 +2678 @@
     LIBCLOG_ENTER("pProcess=%p\n", (void *)pProcess);
     LIBC_ASSERT(pProcess->enmState != __LIBC_PROCSTATE_FREE);
+
     /*
      * Dereference it.
@@ -2698 +2704 @@
          */
         /* inherited data */
-        if (pProcess->pInherit)
-        {
-            spmFree(pProcess->pInherit);
+        void *pv = pProcess->pInheritLocked;
+        if (!pv)
+            pv = pProcess->pInherit;
+        if (pv)
+        {
             pProcess->pInherit = NULL;
+            pProcess->pInheritLocked = NULL;
+            spmFree(pv);
         }
 
@@ -2852 +2862 @@
     {
         pProcess = pProcessBest;
-        LIBCLOG_MSG("Found my embryo %p (pidParent=%#x pid=%#x cReferences=%d uTimestamp=%04x)\n",
-                    (void *)pProcess, pProcess->pidParent, pProcess->pid, pProcess->cReferences, pProcess->uTimestamp);
+        LIBCLOG_MSG("Found my embryo %p (pidParent=%#x pid=%#x cReferences=%d uTimestamp=%04x pInherit=%p/%p)\n",
+                    (void *)pProcess, pProcess->pidParent, pProcess->pid, pProcess->cReferences, pProcess->uTimestamp, pProcess->pInherit, pProcess->pInheritLocked);
 
         /* set data. */
@@ -3041 +3051 @@
                   pProcess->pvForkHandle, (void *)pProcess->pNext, (void *)pProcess->pPrev);
     /*
+     * Free inheritance info.
+     */
+    void *pv = pProcess->pInheritLocked;
+    if (!pv)
+        pv = pProcess->pInherit;
+    if (pv)
+    {
+        pProcess->pInherit = NULL;
+        pProcess->pInheritLocked = NULL;
+        spmFree(pv);
+    }
+
+    /*
      * Free signals.
      */
@@ -3062 +3085 @@
         pNotify = pNotify->pNext;
         spmFreeChildNotify(pFree);
+    }
+
+    /*
+     * Parent notification.
+     */
+    if (pProcess->pTerm)
+    {
+        spmFreeChildNotify(pProcess->pTerm);
+        pProcess->pTerm = NULL;
     }
 
@@ -3442 +3474 @@
 
         /*
-         * Free embryos which are more than 5 min old.
+         * Free embryos which are more than 5 min old or which processes no longer exists.
          */
         uTimestamp = spmTimestamp();
@@ -3454 +3486 @@
                 SPM_ASSERT_PTR_NULL(pProcess->pPrev);
                 if (    pProcess->cReferences == 0
-                    &&  uTimestamp - pProcess->uTimestamp >= 5*60*1000)
+                    &&  (   uTimestamp - pProcess->uTimestamp >= 5*60*1000
+                         || (   pProcess->pid != -1
+                             && DosVerifyPidTid(pProcess->pid, 1) == ERROR_INVALID_PROCID)
+                        )
+                    )
                 {
                     __LIBC_PSPMPROCESS      pProcessNext = pProcess->pNext;