Changeset 1831

Timestamp:

Mar 13, 2005, 11:50:50 AM (20 years ago)

Author:

bird

Message:

Fixed open problem. Fixed pool allocation problem. Fixed big free item leak.

Location:

trunk/src/emx/src/lib/sys

Files:

• DosAllocSharedMemEx.c (modified) (1 diff, 1 prop)
• DosCreateEventSemEx.c (modified) (1 diff, 1 prop)
• DosCreateMutexSemEx.c (modified) (1 diff, 1 prop)
• DosEx.c (modified) (11 diffs, 1 prop)
• DosEx.h (modified) (3 diffs, 1 prop)
• DosGetNamedSharedMemEx.c (modified) (2 diffs, 1 prop)
• DosGetSharedMemEx.c (modified) (2 diffs, 1 prop)
• DosOpenEventSemEx.c (modified) (2 diffs, 1 prop)
• DosOpenMutexSemEx.c (modified) (2 diffs, 1 prop)

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

@@ -84 +84 @@
         pEntry->u.MemOpen.pv      = pv;
         pEntry->u.MemOpen.flFlags = flFlags & (PAG_READ | PAG_WRITE | PAG_EXECUTE | PAG_GUARD);
+#ifdef PER_PROCESS_OPEN_COUNTS
         pEntry->u.MemOpen.cOpens  = 1;
+#endif
     }
 

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

@@ -89 +89 @@
     {
         pDosEx->u.EventOpen.hev     = hev;
+#ifdef PER_PROCESS_OPEN_COUNTS
         pDosEx->u.EventOpen.cOpens  = 1;
+#endif
     }
 

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

@@ -89 +89 @@
     {
         pDosEx->u.MutexOpen.hmtx    = hmtx;
+#ifdef PER_PROCESS_OPEN_COUNTS
         pDosEx->u.MutexOpen.cOpens  = 1;
+#endif
     }
 

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

@@ -287 +287 @@
     LIBCLOG_MSG("Adding a pool of %d bytes.\n", cb);
     pPool->cb           = cb;
-    pPool->cbFreeSpace  = ((cb - sizeof(DOSEXHDR)) / DOSEX_BLOCK_SIZE) * DOSEX_BLOCK_SIZE;
+    pPool->cbFreeSpace  = ((cb - sizeof(*pPool)) / DOSEX_BLOCK_SIZE) * DOSEX_BLOCK_SIZE;
     pPool->pvFreeSpace  = pPool + 1;
 
@@ -296 +296 @@
     {
         gpPoolsTail->pNext = pPool;
-        gpPoolsTail = gpPoolsTail;
+        gpPoolsTail = pPool;
     }
     else
@@ -525 +525 @@
             if (rc && rc != ERROR_INVALID_HANDLE)
                 fUnlink = 0;
+#ifdef PER_PROCESS_OPEN_COUNTS
             else
             {
@@ -531 +532 @@
                     fUnlink = 0;
             }
+#endif
             break;
 
@@ -543 +545 @@
             if (rc && rc != ERROR_INVALID_HANDLE)
                 fUnlink = 0;
+#ifdef PER_PROCESS_OPEN_COUNTS
             else
             {
@@ -549 +552 @@
                     fUnlink = 0;
             }
+#endif
             break;
 
@@ -569 +573 @@
 
     /*
-     * Unlink it if requested.
+     * Unlink and put the free list it if requested.
      */
     if (fUnlink)
@@ -585 +589 @@
                 pPool->apTails[enmType] = NULL;
         }
+
+        pCur->pNext = pPool->apHeads[DOSEX_TYPE_FREE];
+        pPool->apHeads[DOSEX_TYPE_FREE] = pCur;
     }
 
@@ -1013 +1020 @@
 static int dosexForkPreMemOpen(PDOSEX pEntry)
 {
+#ifdef PER_PROCESS_OPEN_COUNTS
     unsigned    cOpens = pEntry->u.MemOpen.cOpens;
-    while (cOpens)
+#else
+    unsigned    cOpens = 1;
+#endif
+    while (cOpens-- > 0)
     {
         int rc = DosGetSharedMem(pEntry->u.MemOpen.pv, pEntry->u.MemOpen.flFlags);
@@ -1111 +1122 @@
 static int dosexForkPreMutexOpen(PDOSEX pEntry)
 {
-    int cOpens = pEntry->u.MutexOpen.cOpens;
+#ifdef PER_PROCESS_OPEN_COUNTS
+    unsigned cOpens = pEntry->u.MutexOpen.cOpens;
+#else
+    unsigned cOpens = 1;
+#endif
     while (cOpens-- > 0)
     {
@@ -1209 +1224 @@
 static int dosexForkPreEventOpen(PDOSEX pEntry)
 {
-    int cOpens = pEntry->u.EventOpen.cOpens;
+#ifdef PER_PROCESS_OPEN_COUNTS
+    unsigned cOpens = pEntry->u.EventOpen.cOpens;
+#else
+    unsigned cOpens = 1;
+#endif
     while (cOpens-- > 0)
     {

trunk/src/emx/src/lib/sys/DosEx.h

@@ -98 +98 @@
             /** Open flags. */
             ULONG       flFlags;
+#ifdef PER_PROCESS_OPEN_COUNTS
             /** Open count. */
             unsigned    cOpens;
+#endif
         }   MemOpen;
 
@@ -124 +126 @@
             /** Mutex handle. */
             HMTX        hmtx;
+#ifdef PER_PROCESS_OPEN_COUNTS
             /** Open count. */
             unsigned    cOpens;
+#endif
         }   MutexOpen;
 
@@ -150 +154 @@
             /** Mutex handle. */
             HEV         hev;
+#ifdef PER_PROCESS_OPEN_COUNTS
             /** Open count. */
             unsigned    cOpens;
+#endif
         }   EventOpen;
 

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

@@ -80 +80 @@
             {
                 pEntry->u.MemOpen.flFlags |= flFlags & ~(OBJ_FORK);
+#ifdef PER_PROCESS_OPEN_COUNTS
                 pEntry->u.MemOpen.cOpens++;
+#endif
                 __libc_dosexRelease(pEntry);
             }
@@ -94 +96 @@
                 pEntry->u.MemOpen.pv      = pv;
                 pEntry->u.MemOpen.flFlags = flFlags & ~(OBJ_FORK);
+#ifdef PER_PROCESS_OPEN_COUNTS
                 pEntry->u.MemOpen.cOpens  = 1;
+#endif
             }
         }

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

@@ -75 +75 @@
         {
             pEntry->u.MemOpen.flFlags |= flFlags & ~(OBJ_FORK);
+#ifdef PER_PROCESS_OPEN_COUNTS
             pEntry->u.MemOpen.cOpens++;
+#endif
             __libc_dosexRelease(pEntry);
         }
@@ -89 +91 @@
             pEntry->u.MemOpen.pv      = pv;
             pEntry->u.MemOpen.flFlags = flFlags & ~(OBJ_FORK);
+#ifdef PER_PROCESS_OPEN_COUNTS
             pEntry->u.MemOpen.cOpens  = 1;
+#endif
         }
     }

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

@@ -69 +69 @@
     if (pDosEx)
     {
+#ifdef PER_PROCESS_OPEN_COUNTS
         pDosEx->u.EventOpen.cOpens++;
+#endif
         __libc_dosexRelease(pDosEx);
     }
@@ -89 +91 @@
          */
         pDosEx->u.EventOpen.hev     = hev;
+#ifdef PER_PROCESS_OPEN_COUNTS
         pDosEx->u.EventOpen.cOpens  = 1;
+#endif
     }
 

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

@@ -69 +69 @@
     if (pDosEx)
     {
+#ifdef PER_PROCESS_OPEN_COUNTS
         pDosEx->u.MutexOpen.cOpens++;
+#endif
         __libc_dosexRelease(pDosEx);
     }
@@ -89 +91 @@
          */
         pDosEx->u.MutexOpen.hmtx    = hmtx;
+#ifdef PER_PROCESS_OPEN_COUNTS
         pDosEx->u.MutexOpen.cOpens  = 1;
+#endif
     }