Changeset 11265 for trunk/psLib/src/sys/psConfigure.c

Timestamp:

Jan 24, 2007, 12:14:48 PM (19 years ago)

Author:

jhoblitt

Message:

merge jch-memory branch - overhaul of memory subsystem

File:

• trunk/psLib/src/sys/psConfigure.c (modified) (4 diffs)

trunk/psLib/src/sys/psConfigure.c

@@ -13 +13 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-06 03:01:42 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-24 22:14:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
@@ -28 +33 @@
 #include "psError.h"
 #include "psConfigure.h"
-
-#include "config.h"
 
 static char *memCheckName = NULL;       // Filename to which to write results of mem check
@@ -58 +61 @@
 }
 
-// Print details of a memory problem to the appropriate file
-static void memoryProblem(const psMemBlock *ptr, // the pointer to the problematic memory block.
-                          const char *file, // the file in which the problem originated
-                          int lineno    // the line number in which the problem originated
-                         )
-{
-    fprintf(memCheckFile,
-            "Memory corruption detected in memBlock %lu\n"
-            "\tFile %s, line %d, size %zd\n"
-            "\tPosts: %p %p %p\n",
-            ptr->id, file, lineno, ptr->userMemorySize, ptr->startblock, ptr->endblock,
-            (ptr + 1 + ptr->userMemorySize));
-}
-
 // Check the memory; intended for use on exit, but might be used elsewhere
 void p_psMemoryCheck(void)
@@ -93 +82 @@
 
     int nCorrupted;                     // Number of corrupted memory blocks
-    (void)psMemProblemCallbackSet((psMemProblemCallback)memoryProblem); // Set callback for corruption
-    nCorrupted = psMemCheckCorruption(false);
+    nCorrupted = psMemCheckCorruption(memCheckFile, false);
     if (nCorrupted > 0) {
         psError(PS_ERR_UNKNOWN, true, "%d memory blocks corrupted; list written to %s.\n", nCorrupted, memCheckName);