Index: /trunk/psLib/src/sys/psMemory.c =================================================================== --- /trunk/psLib/src/sys/psMemory.c (revision 4396) +++ /trunk/psLib/src/sys/psMemory.c (revision 4397) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.55 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 02:02:05 $ +* @version $Revision: 1.56 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-25 03:32:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -55,5 +55,5 @@ * Unique ID for allocated blocks */ -static psMemoryId memid = 0; +static psMemId memid = 0; /** @@ -88,14 +88,14 @@ * isn't resignalled) */ -static psMemoryId memAllocateCallbackDefault(const psMemBlock* ptr) -{ - static psMemoryId incr = 0; // "p_psMemAllocateID += incr" +static psMemId memAllocateCallbackDefault(const psMemBlock* ptr) +{ + static psMemId incr = 0; // "p_psMemAllocateID += incr" return incr; } -static psMemoryId memFreeCallbackDefault(const psMemBlock* ptr) -{ - static psMemoryId incr = 0; // "p_psMemFreeID += incr" +static psMemId memFreeCallbackDefault(const psMemBlock* ptr) +{ + static psMemId incr = 0; // "p_psMemFreeID += incr" return incr; @@ -194,10 +194,10 @@ * Call the callbacks when these IDs are allocated/freed */ -psMemoryId p_psMemAllocateID = 0; // notify user this block is allocated -psMemoryId p_psMemFreeID = 0; // notify user this block is freed - -psMemoryId psMemAllocateCallbackSetID(psMemoryId id) -{ - psMemoryId old = p_psMemAllocateID; +psMemId p_psMemAllocateID = 0; // notify user this block is allocated +psMemId p_psMemFreeID = 0; // notify user this block is freed + +psMemId psMemAllocateCallbackSetID(psMemId id) +{ + psMemId old = p_psMemAllocateID; p_psMemAllocateID = id; @@ -206,7 +206,7 @@ } -psMemoryId psMemFreeCallbackSetID(psMemoryId id) -{ - psMemoryId old = p_psMemFreeID; +psMemId psMemFreeCallbackSetID(psMemId id) +{ + psMemId old = p_psMemFreeID; p_psMemFreeID = id; @@ -244,7 +244,7 @@ * Return memory ID counter for next block to be allocated */ -psMemoryId psMemGetId(void) -{ - psMemoryId id; +psMemId psMemGetId(void) +{ + psMemId id; pthread_mutex_lock(&memIdMutex); @@ -338,5 +338,5 @@ // increment the memory id safely. pthread_mutex_lock(&memBlockListMutex); - *(psMemoryId* ) & ptr->id = ++memid; + *(psMemId* ) & ptr->id = ++memid; pthread_mutex_unlock(&memBlockListMutex); @@ -448,5 +448,5 @@ * Check for memory leaks. */ -psS32 psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd, psBool persistence) +psS32 psMemCheckLeaks(psMemId id0, psMemBlock* ** arr, FILE * fd, psBool persistence) { psS32 nleak = 0; Index: /trunk/psLib/src/sys/psMemory.h =================================================================== --- /trunk/psLib/src/sys/psMemory.h (revision 4396) +++ /trunk/psLib/src/sys/psMemory.h (revision 4397) @@ -12,6 +12,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-25 02:02:05 $ + * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 03:32:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -49,5 +49,5 @@ /// typedef for memory identification numbers. Guaranteed to be some variety of integer. -typedef psU64 psMemoryId; +typedef psU64 psMemId; /// typedef for a memory block's reference count. Guaranteed to be some variety of integer. @@ -69,5 +69,5 @@ psFreeFunc freeFcn; ///< deallocator. If NULL, use generic deallocation. size_t userMemorySize; ///< the size of the user-portion of the memory block - const psMemoryId id; ///< a unique ID for this allocation + const psMemId id; ///< a unique ID for this allocation const char *file; ///< set from __FILE__ in e.g. p_psAlloc const psS32 lineno; ///< set from __LINE__ in e.g. p_psAlloc @@ -84,5 +84,5 @@ * @ingroup memCallback */ -typedef psMemoryId(*psMemAllocateCallback) ( +typedef psMemId(*psMemAllocateCallback) ( const psMemBlock* ptr ///< the psMemBlock just allocated ); @@ -93,5 +93,5 @@ * @ingroup memCallback */ -typedef psMemoryId(*psMemFreeCallback) ( +typedef psMemId(*psMemFreeCallback) ( const psMemBlock* ptr ///< the psMemBlock being freed ); @@ -259,5 +259,5 @@ */ psS32 psMemCheckLeaks( - psMemoryId id0, ///< don't list blocks with id < id0 + psMemId id0, ///< don't list blocks with id < id0 psMemBlock* ** arr, ///< pointer to array of pointers to leaked blocks, or NULL FILE * fd, ///< print list of leaks to fd (or NULL) @@ -394,7 +394,7 @@ * @ingroup memCallback * - * @return psMemoryId the next memory ID to be used - */ -psMemoryId psMemGetId(void); + * @return psMemId the next memory ID to be used + */ +psMemId psMemGetId(void); /** set p_psMemAllocateID to specific id @@ -407,10 +407,10 @@ * @ingroup memCallback * - * @return psMemoryId + * @return psMemId * * @see psMemAllocateCallbackSet */ -psMemoryId psMemAllocateCallbackSetID( - psMemoryId id ///< ID to set +psMemId psMemAllocateCallbackSetID( + psMemId id ///< ID to set ); @@ -424,10 +424,10 @@ * @ingroup memCallback * - * @return psMemoryId the old p_psMemFreeID + * @return psMemId the old p_psMemFreeID * * @see psMemFreeCallbackSet */ -psMemoryId psMemFreeCallbackSetID( - psMemoryId id ///< ID to set +psMemId psMemFreeCallbackSetID( + psMemId id ///< ID to set ); Index: /trunk/psLib/src/sysUtils/psMemory.c =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.c (revision 4396) +++ /trunk/psLib/src/sysUtils/psMemory.c (revision 4397) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.55 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 02:02:05 $ +* @version $Revision: 1.56 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-25 03:32:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -55,5 +55,5 @@ * Unique ID for allocated blocks */ -static psMemoryId memid = 0; +static psMemId memid = 0; /** @@ -88,14 +88,14 @@ * isn't resignalled) */ -static psMemoryId memAllocateCallbackDefault(const psMemBlock* ptr) -{ - static psMemoryId incr = 0; // "p_psMemAllocateID += incr" +static psMemId memAllocateCallbackDefault(const psMemBlock* ptr) +{ + static psMemId incr = 0; // "p_psMemAllocateID += incr" return incr; } -static psMemoryId memFreeCallbackDefault(const psMemBlock* ptr) -{ - static psMemoryId incr = 0; // "p_psMemFreeID += incr" +static psMemId memFreeCallbackDefault(const psMemBlock* ptr) +{ + static psMemId incr = 0; // "p_psMemFreeID += incr" return incr; @@ -194,10 +194,10 @@ * Call the callbacks when these IDs are allocated/freed */ -psMemoryId p_psMemAllocateID = 0; // notify user this block is allocated -psMemoryId p_psMemFreeID = 0; // notify user this block is freed - -psMemoryId psMemAllocateCallbackSetID(psMemoryId id) -{ - psMemoryId old = p_psMemAllocateID; +psMemId p_psMemAllocateID = 0; // notify user this block is allocated +psMemId p_psMemFreeID = 0; // notify user this block is freed + +psMemId psMemAllocateCallbackSetID(psMemId id) +{ + psMemId old = p_psMemAllocateID; p_psMemAllocateID = id; @@ -206,7 +206,7 @@ } -psMemoryId psMemFreeCallbackSetID(psMemoryId id) -{ - psMemoryId old = p_psMemFreeID; +psMemId psMemFreeCallbackSetID(psMemId id) +{ + psMemId old = p_psMemFreeID; p_psMemFreeID = id; @@ -244,7 +244,7 @@ * Return memory ID counter for next block to be allocated */ -psMemoryId psMemGetId(void) -{ - psMemoryId id; +psMemId psMemGetId(void) +{ + psMemId id; pthread_mutex_lock(&memIdMutex); @@ -338,5 +338,5 @@ // increment the memory id safely. pthread_mutex_lock(&memBlockListMutex); - *(psMemoryId* ) & ptr->id = ++memid; + *(psMemId* ) & ptr->id = ++memid; pthread_mutex_unlock(&memBlockListMutex); @@ -448,5 +448,5 @@ * Check for memory leaks. */ -psS32 psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd, psBool persistence) +psS32 psMemCheckLeaks(psMemId id0, psMemBlock* ** arr, FILE * fd, psBool persistence) { psS32 nleak = 0; Index: /trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.h (revision 4396) +++ /trunk/psLib/src/sysUtils/psMemory.h (revision 4397) @@ -12,6 +12,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-25 02:02:05 $ + * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 03:32:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -49,5 +49,5 @@ /// typedef for memory identification numbers. Guaranteed to be some variety of integer. -typedef psU64 psMemoryId; +typedef psU64 psMemId; /// typedef for a memory block's reference count. Guaranteed to be some variety of integer. @@ -69,5 +69,5 @@ psFreeFunc freeFcn; ///< deallocator. If NULL, use generic deallocation. size_t userMemorySize; ///< the size of the user-portion of the memory block - const psMemoryId id; ///< a unique ID for this allocation + const psMemId id; ///< a unique ID for this allocation const char *file; ///< set from __FILE__ in e.g. p_psAlloc const psS32 lineno; ///< set from __LINE__ in e.g. p_psAlloc @@ -84,5 +84,5 @@ * @ingroup memCallback */ -typedef psMemoryId(*psMemAllocateCallback) ( +typedef psMemId(*psMemAllocateCallback) ( const psMemBlock* ptr ///< the psMemBlock just allocated ); @@ -93,5 +93,5 @@ * @ingroup memCallback */ -typedef psMemoryId(*psMemFreeCallback) ( +typedef psMemId(*psMemFreeCallback) ( const psMemBlock* ptr ///< the psMemBlock being freed ); @@ -259,5 +259,5 @@ */ psS32 psMemCheckLeaks( - psMemoryId id0, ///< don't list blocks with id < id0 + psMemId id0, ///< don't list blocks with id < id0 psMemBlock* ** arr, ///< pointer to array of pointers to leaked blocks, or NULL FILE * fd, ///< print list of leaks to fd (or NULL) @@ -394,7 +394,7 @@ * @ingroup memCallback * - * @return psMemoryId the next memory ID to be used - */ -psMemoryId psMemGetId(void); + * @return psMemId the next memory ID to be used + */ +psMemId psMemGetId(void); /** set p_psMemAllocateID to specific id @@ -407,10 +407,10 @@ * @ingroup memCallback * - * @return psMemoryId + * @return psMemId * * @see psMemAllocateCallbackSet */ -psMemoryId psMemAllocateCallbackSetID( - psMemoryId id ///< ID to set +psMemId psMemAllocateCallbackSetID( + psMemId id ///< ID to set ); @@ -424,10 +424,10 @@ * @ingroup memCallback * - * @return psMemoryId the old p_psMemFreeID + * @return psMemId the old p_psMemFreeID * * @see psMemFreeCallbackSet */ -psMemoryId psMemFreeCallbackSetID( - psMemoryId id ///< ID to set +psMemId psMemFreeCallbackSetID( + psMemId id ///< ID to set ); Index: /trunk/psLib/src/sysUtils/sysUtils.i =================================================================== --- /trunk/psLib/src/sysUtils/sysUtils.i (revision 4396) +++ /trunk/psLib/src/sysUtils/sysUtils.i (revision 4397) @@ -40,8 +40,8 @@ } -psS32 psMemCheckLeaksToStderr(psMemoryId id0, psMemBlock*** arr, psBool persistence) { +psS32 psMemCheckLeaksToStderr(psMemId id0, psMemBlock*** arr, psBool persistence) { return psMemCheckLeaks(id0, arr, stderr, persistence); } -psS32 psMemCheckLeaksToStdout(psMemoryId id0, psMemBlock*** arr, psBool persistence) { +psS32 psMemCheckLeaksToStdout(psMemId id0, psMemBlock*** arr, psBool persistence) { return psMemCheckLeaks(id0, arr, stdout, persistence); } Index: /trunk/psLib/test/sysUtils/tst_psMemory.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psMemory.c (revision 4396) +++ /trunk/psLib/test/sysUtils/tst_psMemory.c (revision 4397) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-17 23:44:22 $ +* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-25 03:32:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -30,6 +30,6 @@ static psS32 TPrealloc( void ); static psS32 TPallocCallback( void ); -static psMemoryId memAllocateCallback( const psMemBlock *ptr ); -static psMemoryId memFreeCallback( const psMemBlock *ptr ); +static psMemId memAllocateCallback( const psMemBlock *ptr ); +static psMemId memFreeCallback( const psMemBlock *ptr ); static psS32 TPcheckLeaks( void ); static psS32 TPmemCorruption( void ); @@ -497,5 +497,5 @@ } -psMemoryId memAllocateCallback( const psMemBlock *ptr ) +psMemId memAllocateCallback( const psMemBlock *ptr ) { psLogMsg( __func__, PS_LOG_INFO, "block %lld was (re)allocated", ptr->id ); @@ -504,5 +504,5 @@ } -psMemoryId memFreeCallback( const psMemBlock *ptr ) +psMemId memFreeCallback( const psMemBlock *ptr ) { psLogMsg( __func__, PS_LOG_INFO, "block %lld was freed", ptr->id );