Changeset 11416 for trunk/psLib/src/sys/psMemory.h

Timestamp:

Jan 29, 2007, 5:00:50 PM (19 years ago)

Author:

jhoblitt

Message:

rename psMemCheckCorruption() -> p_psMemCheckCorruption() & add a macro wrapper to pass in the the 3-coords
rename psMemCheckLeaks() -> p_psMemCheckLeaks() & add a macro wrapper to pass in the the 3-coords
change p_psMemCheckLeaks() to invoke p_psMemCheckCorruption() before crawling the block list in an attempt to prevent segfaults

File:

• trunk/psLib/src/sys/psMemory.h (modified) (4 diffs)

trunk/psLib/src/sys/psMemory.h

@@ -15 +15 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-24 22:14:48 $
+ *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-30 03:00:50 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -391 +391 @@
  *  @see psAlloc, psFree, psgetMemId, psMemProblemCallbackSet
  */
+#ifdef DOXYGEN
 int psMemCheckLeaks(
     psMemId id0,                       ///< don't list blocks with id < id0
@@ -397 +398 @@
     bool persistence                   ///< make check across all object even persistent ones
 );
+#else // ifdef DOXYGEN
+int p_psMemCheckLeaks(
+    psMemId id0,                       ///< don't list blocks with id < id0
+    psMemBlock ***array,               ///< pointer to array of pointers to leaked blocks, or NULL
+    FILE * fd,                         ///< print list of leaks to fd (or NULL)
+    bool persistence,                  ///< make check across all object even persistent ones
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func                    ///< Function name of caller
+);
+#ifndef SWIG
+#define psMemCheckLeaks(id0, array, fd, persistence) \
+p_psMemCheckLeaks(id0, array, fd, persistence, __FILE__, __LINE__, __func__)
+#endif // ifndef SWIG
+#endif // ifdef DOXYGEN
+
 
 /** Check for memory corruption.  Scans all currently allocated memory buffers and checks for corruptions,
@@ -404 +421 @@
  *
  */
+#ifdef DOXYGEN
 int psMemCheckCorruption(
     FILE *output,                       ///< FILE to write corrupted blocks too
     bool abort_on_error                 ///< Abort on detecting corruption?
 );
+#else // ifdef DOXYGEN
+int p_psMemCheckCorruption(
+    FILE *output,                       ///< FILE to write corrupted blocks too
+    bool abort_on_error,                ///< Abort on detecting corruption?
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func                    ///< Function name of caller
+);
+#ifndef SWIG
+#define psMemCheckCorruption(output, abort_on_error) \
+p_psMemCheckCorruption(output, abort_on_error, __FILE__, __LINE__, __func__)
+#endif // ifndef SWIG
+#endif // ifdef DOXYGEN
+
 
 /** Return reference counter