Changeset 1440 for trunk/psLib/src/sys/psMemory.c

Timestamp:

Aug 9, 2004, 1:34:58 PM (22 years ago)

Author:

desonia

Message:

cleanup of some indent-induced madness.

File:

• trunk/psLib/src/sys/psMemory.c (modified) (22 diffs)

trunk/psLib/src/sys/psMemory.c

@@ -9 +9 @@
 *  @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 +31 @@
 #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 +44 @@
 
 // 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 +69 @@
     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 +97 @@
 }
 
-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 +156 @@
  * isn't resignalled)
  */
-static psMemoryId memAllocateCallbackDefault(const psMemBlock * ptr)
+static psMemoryId memAllocateCallbackDefault(const psMemBlock* ptr)
 {
     static psMemoryId incr = 0; // "p_psMemAllocateID += incr"
@@ -163 +163 @@
 }
 
-static psMemoryId memFreeCallbackDefault(const psMemBlock * ptr)
+static psMemoryId memFreeCallbackDefault(const psMemBlock* ptr)
 {
     static psMemoryId incr = 0; // "p_psMemFreeID += incr"
@@ -222 +222 @@
  */
 
-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 +257 @@
     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 +280 @@
 {
 
-    psMemBlock *ptr = NULL;
+    psMemBlock* ptr = NULL;
 
     // memory is of the size I want to bother recycling?
@@ -327 +327 @@
     // increment the memory id safely.
     pthread_mutex_lock(&memBlockListMutex);
-    *(psMemoryId *) & ptr->id = ++memid;
+    *(psMemoryId* ) & ptr->id = ++memid;
     pthread_mutex_unlock(&memBlockListMutex);
 
@@ -363 +363 @@
         return p_psAlloc(size, file, lineno);
     } else {
-        psMemBlock *ptr = ((psMemBlock *) vptr) - 1;
+        psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
         bool isBlockLast = false;
 
@@ -376 +376 @@
         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 +415 @@
  * 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 +446 @@
     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 +466 @@
 psReferenceCount psMemGetRefCounter(void *vptr)
 {
-    psMemBlock *ptr;
+    psMemBlock* ptr;
     unsigned int refCount;
 
@@ -473 +473 @@
     }
 
-    ptr = ((psMemBlock *) vptr) - 1;
+    ptr = ((psMemBlock* ) vptr) - 1;
 
     if (checkMemBlock(ptr, __func__) != 0) {
@@ -489 +489 @@
 void *p_psMemIncrRefCounter(void *vptr, const char *file, int lineno)
 {
-    psMemBlock *ptr;
+    psMemBlock* ptr;
 
     if (vptr == NULL) {
@@ -495 +495 @@
     }
 
-    ptr = ((psMemBlock *) vptr) - 1;
+    ptr = ((psMemBlock* ) vptr) - 1;
 
     if (checkMemBlock(ptr, __func__)) {
@@ -515 +515 @@
     }
 
-    psMemBlock *ptr = ((psMemBlock *) vptr) - 1;
+    psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
 
     if (checkMemBlock(ptr, __func__) != 0) {
@@ -607 +607 @@
     }
 
-    psMemBlock *ptr = ((psMemBlock *) vptr) - 1;
+    psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
 
     if (checkMemBlock(ptr, __func__) != 0) {
@@ -622 +622 @@
     }
 
-    psMemBlock *ptr = ((psMemBlock *) vptr) - 1;
+    psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
 
     if (checkMemBlock(ptr, __func__) != 0) {