Changeset 1582

Timestamp:

Oct 12, 2004, 12:56:56 AM (21 years ago)

Author:

bird

Message:

Fixed two fork related bugs.

Location:

trunk/src/emx/src/lib/sys

Files:

• DosAllocMemEx.c (modified) (4 diffs, 1 prop)
• DosEx.c (modified) (1 diff, 1 prop)
• libcfork.c (modified) (3 diffs, 1 prop)

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

@@ -45 +45 @@
 *******************************************************************************/
 static int allocAtAddress(void *pvReq, ULONG cbReq, ULONG fReq);
+#ifdef DEBUG_ME
+static void dumpMemFlags(void *pvIn);
+#endif
+
 
 
@@ -82 +86 @@
      */
     FS_SAVE_LOAD();
+#ifdef DEBUG_ME
+    LIBCLOG_MSG2("Before:\n");
+    if (flFlags & OBJ_LOCATION)
+        dumpMemFlags(*ppv);
+    else if (flFlags & OBJ_ANY)
+        dumpMemFlags((void *)0x20000001);
+    else
+        dumpMemFlags((void *)0x10000001);
+#endif
     if (flFlags & OBJ_LOCATION)
         rc = allocAtAddress(*ppv, cb, flFlags & ~(OBJ_LOCATION | OBJ_FORK));
     else
         rc = DosAllocMem(ppv, cb, flFlags & ~(OBJ_FORK));
+#ifdef DEBUG_ME
+    LIBCLOG_MSG2("After:\n");
+    dumpMemFlags(*ppv);
+#endif
     if (rc)
     {
@@ -193 +210 @@
             }
 
-            rc = DosAllocMem(pvNew, cbReq, fReq);
+            rc = DosAllocMem(&pvNew, cbReq, fReq);
             if (rc || (char *)pvNew > (char *)pvReq)
                 break; /* we failed! */
@@ -222 +239 @@
 }
 
+#ifdef DEBUG_ME
+/**
+ * Dumps the flags of a memory region.
+ * @param   pv      Address in that region.
+ */
+static void dumpMemFlags(void *pvIn)
+{
+    LIBCLOG_MSG2("address  size     flags (dumpMemFlags)\n");
+    void *pv    = (uintptr_t)pvIn < 0x20000000 ?  (char *)0x10000 : (char *)0x20000000;
+    void *pvMax = (uintptr_t)pvIn < 0x20000000 ?  (char *)0x20000000 : (char *)0xc0000000;
+    int fLastErr = 0;
+    while ((uintptr_t)pv < (uintptr_t)pvMax)
+    {
+        ULONG flRegion = ~0;
+        ULONG cbRegion = ~0;
+        APIRET rc = DosQueryMem(pv, &cbRegion, &flRegion);
+        if (!rc)
+        {
+            LIBCLOG_MSG2("%08lx %08lx %08lx\n", (ULONG)pv, cbRegion, flRegion);
+            pv = (char *)pv + ((cbRegion + 0xfff) & ~0xfff);
+            fLastErr = 0;
+        }
+        else
+        {
+            if (!fLastErr)
+                LIBCLOG_MSG2("%08lx rc=%ld\n", (ULONG)pv, rc);
+            fLastErr = 1;
+            pv = (char *)(((uintptr_t)pv + 0x1fff) & ~0xfff);
+        }
+    }
+}
+#endif

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

@@ -976 +976 @@
 {
     int rc;
-    rc = DosAllocMemEx(&pEntry->u.MemAlloc.pv, pEntry->u.MemAlloc.cb, pEntry->u.MemAlloc.flFlags);
-    LIBC_ASSERTM(!rc, "DosAllocMemEx(={%p},%#lx,%#lx) -> rc=%d\n",
+    rc = DosAllocMemEx(&pEntry->u.MemAlloc.pv, pEntry->u.MemAlloc.cb, (pEntry->u.MemAlloc.flFlags & ~OBJ_FORK) | OBJ_LOCATION);
+    LIBC_ASSERTM(!rc, "DosAllocMemEx(={%p},%#lx,%#lx | OBJ_LOCATION) -> rc=%d\n",
                  pEntry->u.MemAlloc.pv, pEntry->u.MemAlloc.cb, pEntry->u.MemAlloc.flFlags, rc);
     if (rc)

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

@@ -134 +134 @@
 static int                  forkBthCallbacksCompare(const void *pv1, const void *pv2);
 static int                  forkBthCallbacksCall(__LIBC_PFORKCALLBACK *papCallbacks, __LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation);
+static void                 forkBthDumpMemFlags(void *pv);
+
 
 
@@ -2058 +2060 @@
                 if (rc)
                 {
+                    forkBthDumpMemFlags(pChunk->pv);
                     LIBC_ASSERTM_FAILED("DosSetMem(%p, %08x, %08lx) failed with rc=%d\n", pChunk->pv, pChunk->cbVirt, flFlags, rc);
                     rc = -__libc_native2errno(rc);
@@ -2433 +2436 @@
 }
 
+/**
+ * Dumps the flags of a memory region.
+ * @param   pv      Address in that region.
+ */
+static void forkBthDumpMemFlags(void *pvIn)
+{
+#if 0
+    LIBCLOG_MSG2("address  size     flags (forkBthDumpMemFlags)\n");
+    void *pv    = (uintptr_t)pvIn < 0x20000000 ?  (char *)0x10000 : (char *)0x20000000;
+    void *pvMax = (uintptr_t)pvIn < 0x20000000 ?  (char *)0x20000000 : (char *)0xc0000000;
+    int fLastErr = 0;
+    while ((uintptr_t)pv < (uintptr_t)pvMax)
+    {
+        ULONG flRegion = ~0;
+        ULONG cbRegion = ~0;
+        APIRET rc = DosQueryMem(pv, &cbRegion, &flRegion);
+        if (!rc)
+        {
+            LIBCLOG_MSG2("%08lx %08lx %08lx\n", (ULONG)pv, cbRegion, flRegion);
+            pv = (char *)pv + ((cbRegion + 0xfff) & ~0xfff);
+            fLastErr = 0;
+        }
+        else
+        {
+            if (!fLastErr)
+                LIBCLOG_MSG2("%08lx rc=%ld\n", (ULONG)pv, rc);
+            fLastErr = 1;
+            pv = (char *)(((uintptr_t)pv + 0x1fff) & ~0xfff);
+        }
+    }
+#endif
+}
+