Changeset 10899 for branches/jch-memory/psLib/src/sys/psMemory.h

Timestamp:

Jan 4, 2007, 11:09:32 AM (20 years ago)

Author:

jhoblitt

Message:

comment/doc updates
add PS_MEM_ABORT_CORRUPT macro to replace several calls to memProblemCallBack()
remove the funcname parameter from badMemBlock()
remove memIdMutex (use memBlockListMutex instead)
remove PS_MEM_DEBUG & deadBlockList (unused)
improve naming consistency of variables & function parameters
remove memProblemCallbackDefault()
remove psMemProblemCallbackSet()
add mutex locking all over the place
add func parameter to p_psAlloc()
add func parameter to p_psRealloc(0
reorganize p_psAlloc(), p_psRealloc()
remove p_psFree, superseded by p_psMemDecrRefCounter()
tidy up psMemCheckType() to reduce the number of lines of code
add tid (thread ID) & func (function name) fields to psMemBlock
change psFree macro to call p_psMemDecrRefCounter()

File:

• branches/jch-memory/psLib/src/sys/psMemory.h (modified) (7 diffs)

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

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.61.2.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-03 22:25:33 $
+ *  @version $Revision: 1.61.2.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-04 21:09:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -72 +72 @@
     size_t userMemorySize;             ///< the size of the user-portion of the memory block
     const psMemId id;                  ///< a unique ID for this allocation
+    const pthread_t tid;               ///< set from pthread_self();
     const char *file;                  ///< set from __FILE__ in e.g. p_psAlloc
     const unsigned int lineno;         ///< set from __LINE__ in e.g. p_psAlloc
+    const char *func;                  ///< set from __func__
     psReferenceCount refCounter;       ///< how many times pointer is referenced
     bool persistent;                   ///< marks if this non-user persistent data like error stack, etc.
@@ -137 +139 @@
 psPtr p_psAlloc(
     size_t size,                       ///< Size required
-    const char *filename,              ///< File of call
-    unsigned int lineno                ///< Line number of call
+    const char *filename,              ///< File of caller
+    unsigned int lineno,               ///< Line number of caller
+    const char *func                   ///< Function name of caller
 );
 
 /// Memory allocation. psAlloc sends file and line number to p_psAlloc.
 #ifndef SWIG
-#define psAlloc(size) p_psAlloc(size, __FILE__, __LINE__)
+#define psAlloc(size) \
+p_psAlloc(size, __FILE__, __LINE__, __func__)
 #endif // ! SWIG
 
@@ -256 +260 @@
     psPtr ptr,                         ///< Pointer to re-allocate
     size_t size,                       ///< Size required
-    const char *filename,              ///< File of call
-    unsigned int lineno                ///< Line number of call
+    const char *filename,              ///< File of caller
+    unsigned int lineno,               ///< Line number of caller
+    const char *func                   ///< Function name of caller
 );
 
 /// Memory re-allocation.  psRealloc sends file and line number to p_psRealloc.
 #ifndef SWIG
-#define psRealloc(ptr, size) p_psRealloc(ptr, size, __FILE__, __LINE__)
+#define psRealloc(ptr, size) \
+p_psRealloc(ptr, size, __FILE__, __LINE__, __func__)
 #endif // ! SWIG
 
@@ -276 +282 @@
 );
 #else // #ifdef DOXYGEN
-void p_psFree(
-    psPtr ptr,                         ///< Pointer to free
-    const char *filename,              ///< File of call
-    unsigned int lineno                ///< Line number of call
-);
 
 /// Free memory.  psFree sends file and line number to p_psFree.
 #ifndef SWIG
-//#define psFree(ptr) { p_psFree((psPtr)ptr, __FILE__, __LINE__); *(void**)&(ptr) = NULL; }
-#define psFree(ptr) { p_psFree((psPtr)ptr, __FILE__, __LINE__); }
+//#define psFree(ptr) { p_psMemDecrRefCounter((psPtr)ptr, __FILE__, __LINE__); *(void**)&(ptr) = NULL; }
+#define psFree(ptr) { p_psMemDecrRefCounter((psPtr)ptr, __FILE__, __LINE__); }
 #endif // ! SWIG
 
@@ -379 +380 @@
 #endif // !DOXYGEN
 
+#if 0 // psMemSetRefCounter
 /** Set reference counter and return the pointer
  *
@@ -404 +406 @@
 
 #endif // !DOXYGEN
+#endif // psMemSetRefCounter
 
 /** Set callback for problems.