Changeset 2803 for trunk

Timestamp:

Aug 31, 2006, 1:24:20 AM (19 years ago)

Author:

bird

Message:

Log module handle when registering a fork module.

File:

• trunk/libc/src/kNIX/os2/libcfork.c (modified) (3 diffs)

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

@@ -277 +277 @@
 
 
+#ifdef DEBUG_LOGGING
+/**
+ * Logs the name, handle and stuff of the module which the give address belongs to.
+ *
+ * @param   pvInModule  Address within a module.
+ */
+static void forkLogModuleByAddr(PVOID pvInModule)
+{
+    HMODULE hmod = NULLHANDLE;
+    ULONG   offObj = 0;
+    ULONG   iObj   = 0;
+    CHAR    szName[32];
+    APIRET  rc = DosQueryModFromEIP(&hmod, &iObj, sizeof(szName), &szName[0], &offObj, (uintptr_t)pvInModule);
+    if (rc == NO_ERROR)
+    {
+        CHAR szFullName[CCHMAXPATH];
+        if (DosQueryModuleName(hmod, sizeof(szFullName), szFullName) != NO_ERROR)
+            szFullName[0] = '\0';
+        LIBCLOG_MSG2("pvInModule=%p: hmod=%lx iObj=%#lx offObj=%lx %s %s\n",
+                     pvInModule, hmod, iObj, offObj, szName, szFullName);
+    }
+    else
+        LIBCLOG_MSG2("pvInModule=%p: rc=%ld", pvInModule, rc);
+}
+#endif /* DEBUG_LOGGING */
+
+
 /**
  * Register a forkable module. Called by crt0 and dll0.
@@ -306 +333 @@
                   (void *)pModule, pModule->uVersion, (void *)pModule->pfnAtFork, (void *)pModule->papParent1, (void *)pModule->papChild1,
                   (void *)pModule->pvDataSegBase, (void *)pModule->pvDataSegEnd, pModule->fFlags, (void *)pModule->pNext, fExecutable);
+#ifdef DEBUG_LOGGING
+    forkLogModuleByAddr(pModule->pvDataSegBase);
+#endif
     int                 rc;
     __LIBC_PSPMPROCESS  pProcess;
@@ -449 +479 @@
                   (void *)pModule, pModule->uVersion, (void *)pModule->pfnAtFork, (void *)pModule->papParent1, (void *)pModule->papChild1,
                   (void *)pModule->pvDataSegBase, (void *)pModule->pvDataSegEnd, pModule->fFlags, (void *)pModule->pNext);
+#ifdef DEBUG_LOGGING
+    forkLogModuleByAddr(pModule->pvDataSegBase);
+#endif
 
     /*