Index: trunk/psLib/src/sysUtils/psMemory.c =================================================================== --- trunk/psLib/src/sysUtils/psMemory.c (revision 1426) +++ trunk/psLib/src/sysUtils/psMemory.c (revision 1440) @@ -9,6 +9,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -31,6 +31,6 @@ #define P_PS_LARGE_BLOCK_SIZE 65536 // size where under, we try to recycle -static int checkMemBlock(const psMemBlock * m, const char *funcName); -static psMemBlock *lastMemBlockAllocated = NULL; +static int checkMemBlock(const psMemBlock* m, const char *funcName); +static psMemBlock* lastMemBlockAllocated = NULL; static pthread_mutex_t memBlockListMutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t memIdMutex = PTHREAD_MUTEX_INITIALIZER; @@ -44,10 +44,10 @@ // N.B. recycleBinSize should be terminated by P_PS_LARGE_BLOCK_SIZE (simplifies search loops) -static psMemBlock *recycleMemBlockList[13] = { +static psMemBlock* recycleMemBlockList[13] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; #ifdef PS_MEM_DEBUG -static psMemBlock *deadBlockList; // a place to put dead memBlocks in debug mode. +static psMemBlock* deadBlockList; // a place to put dead memBlocks in debug mode. #endif @@ -69,5 +69,5 @@ while (level >= 0 && ptr == NULL) { while (recycleMemBlockList[level] != NULL && ptr == NULL) { - psMemBlock *old = recycleMemBlockList[level]; + psMemBlock* old = recycleMemBlockList[level]; recycleMemBlockList[level] = recycleMemBlockList[level]->nextBlock; @@ -97,5 +97,5 @@ } -static void memProblemCallbackDefault(const psMemBlock * ptr, const char *file, int lineno) +static void memProblemCallbackDefault(const psMemBlock* ptr, const char *file, int lineno) { if (ptr->refCounter < 1) { @@ -156,5 +156,5 @@ * isn't resignalled) */ -static psMemoryId memAllocateCallbackDefault(const psMemBlock * ptr) +static psMemoryId memAllocateCallbackDefault(const psMemBlock* ptr) { static psMemoryId incr = 0; // "p_psMemAllocateID += incr" @@ -163,5 +163,5 @@ } -static psMemoryId memFreeCallbackDefault(const psMemBlock * ptr) +static psMemoryId memFreeCallbackDefault(const psMemBlock* ptr) { static psMemoryId incr = 0; // "p_psMemFreeID += incr" @@ -222,5 +222,5 @@ */ -static int checkMemBlock(const psMemBlock * m, const char *funcName) +static int checkMemBlock(const psMemBlock* m, const char *funcName) { // n.b. since this is called by psMemCheckCorruption while the memblock list is mutex locked, @@ -257,5 +257,5 @@ pthread_mutex_lock(&memBlockListMutex); - for (psMemBlock * iter = lastMemBlockAllocated; iter != NULL; iter = iter->nextBlock) { + for (psMemBlock* iter = lastMemBlockAllocated; iter != NULL; iter = iter->nextBlock) { if (checkMemBlock(iter, __func__)) { nbad++; @@ -280,5 +280,5 @@ { - psMemBlock *ptr = NULL; + psMemBlock* ptr = NULL; // memory is of the size I want to bother recycling? @@ -327,5 +327,5 @@ // increment the memory id safely. pthread_mutex_lock(&memBlockListMutex); - *(psMemoryId *) & ptr->id = ++memid; + *(psMemoryId* ) & ptr->id = ++memid; pthread_mutex_unlock(&memBlockListMutex); @@ -363,5 +363,5 @@ return p_psAlloc(size, file, lineno); } else { - psMemBlock *ptr = ((psMemBlock *) vptr) - 1; + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; bool isBlockLast = false; @@ -376,5 +376,5 @@ isBlockLast = (ptr == lastMemBlockAllocated); - ptr = (psMemBlock *) realloc(ptr, sizeof(psMemBlock) + size + sizeof(void *)); + ptr = (psMemBlock* ) realloc(ptr, sizeof(psMemBlock) + size + sizeof(void *)); if (ptr == NULL) { @@ -415,13 +415,13 @@ * Check for memory leaks. */ -int psMemCheckLeaks(psMemoryId id0, psMemBlock *** arr, FILE * fd) +int psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd) { int nleak = 0; int j = 0; - psMemBlock *topBlock = lastMemBlockAllocated; + psMemBlock* topBlock = lastMemBlockAllocated; pthread_mutex_lock(&memBlockListMutex); - for (psMemBlock * iter = topBlock; iter != NULL; iter = iter->nextBlock) { + for (psMemBlock* iter = topBlock; iter != NULL; iter = iter->nextBlock) { if ((psMemGetRefCounter(iter + 1) > 0) && (iter->id >= id0)) { nleak++; @@ -446,5 +446,5 @@ pthread_mutex_lock(&memBlockListMutex); - for (psMemBlock * iter = topBlock; iter != NULL; iter = iter->nextBlock) { + for (psMemBlock* iter = topBlock; iter != NULL; iter = iter->nextBlock) { if ((psMemGetRefCounter(iter + 1) > 0) && (iter->id >= id0)) { (*arr)[j++] = iter; @@ -466,5 +466,5 @@ psReferenceCount psMemGetRefCounter(void *vptr) { - psMemBlock *ptr; + psMemBlock* ptr; unsigned int refCount; @@ -473,5 +473,5 @@ } - ptr = ((psMemBlock *) vptr) - 1; + ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__) != 0) { @@ -489,5 +489,5 @@ void *p_psMemIncrRefCounter(void *vptr, const char *file, int lineno) { - psMemBlock *ptr; + psMemBlock* ptr; if (vptr == NULL) { @@ -495,5 +495,5 @@ } - ptr = ((psMemBlock *) vptr) - 1; + ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__)) { @@ -515,5 +515,5 @@ } - psMemBlock *ptr = ((psMemBlock *) vptr) - 1; + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__) != 0) { @@ -607,5 +607,5 @@ } - psMemBlock *ptr = ((psMemBlock *) vptr) - 1; + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__) != 0) { @@ -622,5 +622,5 @@ } - psMemBlock *ptr = ((psMemBlock *) vptr) - 1; + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__) != 0) { Index: trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- trunk/psLib/src/sysUtils/psMemory.h (revision 1426) +++ trunk/psLib/src/sysUtils/psMemory.h (revision 1440) @@ -15,6 +15,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -64,6 +64,6 @@ { const void *startblock; ///< initialised to p_psMEMMAGIC - struct psMemBlock *previousBlock; ///< previous block in allocation list - struct psMemBlock *nextBlock; ///< next block allocation list + struct psMemBlock* previousBlock; ///< previous block in allocation list + struct psMemBlock* nextBlock; ///< next block allocation list psFreeFcn freeFcn; ///< deallocator. If NULL, use generic deallocation. size_t userMemorySize; ///< the size of the user-portion of the memory block @@ -82,5 +82,5 @@ * @ingroup memCallback */ -typedef psMemoryId(*psMemAllocateCallback) (const psMemBlock * ptr ///< the psMemBlock just allocated +typedef psMemoryId(*psMemAllocateCallback) (const psMemBlock* ptr ///< the psMemBlock just allocated ); @@ -90,5 +90,5 @@ * @ingroup memCallback */ -typedef psMemoryId(*psMemFreeCallback) (const psMemBlock * ptr ///< the psMemBlock being freed +typedef psMemoryId(*psMemFreeCallback) (const psMemBlock* ptr ///< the psMemBlock being freed ); @@ -100,5 +100,5 @@ * @ingroup memCallback */ -typedef void (*psMemProblemCallback) (const psMemBlock * ptr, ///< the pointer to the problematic memory +typedef void (*psMemProblemCallback) (const psMemBlock* ptr, ///< the pointer to the problematic memory // block. const char *file, ///< the file in which the problem originated @@ -195,5 +195,5 @@ */ int psMemCheckLeaks(psMemoryId id0, ///< don't list blocks with id < id0 - psMemBlock *** arr, ///< pointer to array of pointers to leaked blocks, or NULL + psMemBlock* ** arr, ///< pointer to array of pointers to leaked blocks, or NULL FILE * fd ///< print list of leaks to fd (or NULL) ); Index: trunk/psLib/src/sysUtils/psTrace.c =================================================================== --- trunk/psLib/src/sysUtils/psTrace.c (revision 1426) +++ trunk/psLib/src/sysUtils/psTrace.c (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -45,16 +45,16 @@ # include "psError.h" -static p_psComponent *p_psCroot = NULL; // The root of the trace component +static p_psComponent* p_psCroot = NULL; // The root of the trace component static FILE *p_psTraceFP = NULL; // File destination for messages. -static void componentFree(p_psComponent * comp); -static p_psComponent *componentAlloc(const char *name, int level); +static void componentFree(p_psComponent* comp); +static p_psComponent* componentAlloc(const char *name, int level); /***************************************************************************** componentAlloc(): allocate memory for a new node, and initialize members. *****************************************************************************/ -static p_psComponent *componentAlloc(const char *name, int level) -{ - p_psComponent *comp = psAlloc(sizeof(p_psComponent)); +static p_psComponent* componentAlloc(const char *name, int level) +{ + p_psComponent* comp = psAlloc(sizeof(p_psComponent)); p_psMemSetDeallocator(comp, (psFreeFcn) componentFree); @@ -70,5 +70,5 @@ nodes as well. *****************************************************************************/ -static void componentFree(p_psComponent * comp) +static void componentFree(p_psComponent* comp) { if (comp == NULL) { @@ -99,5 +99,5 @@ Set all trace levels to zero. *****************************************************************************/ -void p_psTraceReset(p_psComponent * currentNode) +void p_psTraceReset(p_psComponent* currentNode) { int i = 0; @@ -147,5 +147,5 @@ char *pname = name; char *firstComponent = NULL; // first component of name - p_psComponent *currentNode = p_psCroot; + p_psComponent* currentNode = p_psCroot; int nodeExists = 0; @@ -182,5 +182,5 @@ if (nodeExists == 0) { currentNode->subcomp = psRealloc(currentNode->subcomp, - (currentNode->n + 1) * sizeof(p_psComponent *)); + (currentNode->n + 1) * sizeof(p_psComponent* )); currentNode->n = (currentNode->n) + 1; @@ -234,5 +234,5 @@ char *pname = name; char *firstComponent = NULL; // first component of name - p_psComponent *currentNode = p_psCroot; + p_psComponent* currentNode = p_psCroot; int i = 0; @@ -303,5 +303,5 @@ null *****************************************************************************/ -static void doPrintTraceLevels(const p_psComponent * comp, int depth) +static void doPrintTraceLevels(const p_psComponent* comp, int depth) { int i = 0; Index: trunk/psLib/src/sysUtils/psTrace.h =================================================================== --- trunk/psLib/src/sysUtils/psTrace.h (revision 1426) +++ trunk/psLib/src/sysUtils/psTrace.h (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -53,5 +53,5 @@ int level; // trace level for this component int n; // number of subcomponents - struct p_psComponent **subcomp; // next level of subcomponents + struct p_psComponent* *subcomp; // next level of subcomponents } p_psComponent;