Changeset 10900

Timestamp:

Jan 4, 2007, 11:39:00 AM (19 years ago)

Author:

jhoblitt

Message:

change psMemCheckCorruption() to accept an output param

Location:

branches/jch-memory/psLib/src/sys

Files:

• psMemory.c (modified) (4 diffs)
• psMemory.h (modified) (2 diffs)

branches/jch-memory/psLib/src/sys/psMemory.c

@@ -9 +9 @@
 *  @author Joshua Hoblitt, University of Hawaii
 *
-*  @version $Revision: 1.88.2.10 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-04 21:09:32 $
+*  @version $Revision: 1.88.2.11 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-01-04 21:39:00 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -199 +199 @@
     bool abort_on_error = false;
 
-    if (psMemCheckCorruption(abort_on_error) > 0) {
-        fprintf(stderr,"Detected memory corruption\n"); // somewhere to set a breakpoint
+    if (psMemCheckCorruption(stderr, abort_on_error) > 0) {
+        fprintf(stderr, "Detected memory corruption\n"); // somewhere to set a breakpoint
     }
 
@@ -322 +322 @@
 }
 
-int psMemCheckCorruption(bool abort_on_error)
+int psMemCheckCorruption(FILE *output, bool abort_on_error)
 {
     psS32 nbad = 0;               // number of bad blocks
@@ -333 +333 @@
         if (badMemBlock(memBlock)) {
             nbad++;
+
+            fprintf(output,
+                    "Memory corruption detected in memBlock %lu\n"
+                    "\tSize %zd\n"
+                    "\tPosts: %p %p %p\n"
+                    "\tAllocated at %s (%s:%d) by thread %lu\n",
+                    memBlock->id,
+                    memBlock->userMemorySize,
+                    memBlock->startblock, memBlock->endblock, (memBlock + 1 + memBlock->userMemorySize),
+                    memBlock->func, memBlock->file, memBlock->lineno, memBlock->tid);
 
             if (abort_on_error) {

branches/jch-memory/psLib/src/sys/psMemory.h

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.61.2.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-04 21:09:32 $
+ *  @version $Revision: 1.61.2.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-04 21:39:00 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -320 +320 @@
  */
 int psMemCheckCorruption(
-    bool abort_on_error                ///< Abort on detecting corruption?
+    FILE *output,                       ///< FILE to write corrupted blocks too
+    bool abort_on_error                 ///< Abort on detecting corruption?
 );