Changeset 1459 for trunk/src

Timestamp:

Sep 5, 2004, 11:15:44 PM (21 years ago)

Author:

bird

Message:

bugfixing.

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/sharedpm.h (modified) (1 diff, 1 prop)
• src/lib/sys/sharedpm.c (modified) (3 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/sharedpm.h

@@ -500 +500 @@
 int     __libc_spmSocketDeref(int iSocket);
 
+/**
+ * Checks the SPM memory for trouble.
+ *
+ * @returns 0 on perfect state.
+ * @returns -1 and errno on mutex failure.
+ * @returns Number of failures if SPM is broken.
+ * @param   fBreakpoint Raise breakpoint exception if a problem is encountered.
+ * @param   fVerbose    Log everything.
+ */
+int     __libc_SpmCheck(int fBreakpoint, int fVerbose);
+
 __END_DECLS
 

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

@@ -742 +742 @@
 }
 
+
+
+/**
+ * Checks the SPM memory for trouble.
+ *
+ * @returns 0 on perfect state.
+ * @returns -1 and errno on mutex failure.
+ * @returns Number of failures if SPM is broken.
+ * @param   fBreakpoint Raise breakpoint exception if a problem is encountered.
+ * @param   fVerbose    Log everything.
+ */
+int __libc_SpmCheck(int fBreakpoint, int fVerbose)
+{
+    __LIBC_SPMXCPTREGREC    RegRec;
+    int                     rc;
+
+    rc = spmRequestMutex(&RegRec);
+    if (rc)
+        return rc;
+    rc = spmCheck(fBreakpoint, fVerbose);
+    spmReleaseMutex(&RegRec);
+    return rc;
+}
 
 
@@ -1685 +1708 @@
         SPM_ASSERT_PTR_NULL(pLeft->core.pPrev);
 
-        if (pLeft->core.pNext == pFree->core.pPrev)
+        if (pLeft == pFree->core.pPrev)
         {   /* merge with left free chunk. */
             pLeft->core.pNext = pFree->core.pNext;
@@ -1710 +1733 @@
 
     /* Check if we can merge with right hand free chunk. */
-    if (pRight && pRight->core.pPrev == pFree->core.pNext)
+    if (pRight && pRight == pFree->core.pNext)
     {   /* merge with right free chunk. */
         pFree->core.pNext = pRight->core.pNext;