Changeset 4401 for trunk/psLib/src/sys

Timestamp:

Jun 27, 2005, 10:38:12 AM (21 years ago)

Author:

drobbin

Message:

made required changes based on apidelta-report-cycle6

Location:

trunk/psLib/src/sys

Files:

• psMemory.c (modified) (5 diffs)
• psMemory.h (modified) (3 diffs)

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-25 03:32:42 $
+*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-27 20:38:12 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -342 +342 @@
 
     ptr->file = file;
-    ptr->freeFcn = NULL;
+    ptr->freeFunc = NULL;
     ptr->persistent = false;
     *(psU32 *)&ptr->lineno = lineno;
@@ -576 +576 @@
         pthread_mutex_unlock(&ptr->refCounterMutex);
 
-        if (ptr->freeFcn != NULL) {
-            ptr->freeFcn(vptr);
+        if (ptr->freeFunc != NULL) {
+            ptr->freeFunc(vptr);
         }
 
@@ -640 +640 @@
 }
 
-void psMemSetDeallocator(psPtr vptr, psFreeFunc freeFcn)
+void psMemSetDeallocator(psPtr ptr, psFreeFunc freeFunc)
+{
+    if (ptr == NULL) {
+        return;
+    }
+
+    psMemBlock* PTR = ((psMemBlock* ) ptr) - 1;
+
+    if (checkMemBlock(PTR, __func__) != 0) {
+        memProblemCallback(PTR, __func__, __LINE__);
+    }
+
+    PTR->freeFunc = freeFunc;
+
+}
+psFreeFunc psMemGetDeallocator(psPtr ptr)
+{
+    if (ptr == NULL) {
+        return NULL;
+    }
+
+    psMemBlock* PTR = ((psMemBlock* ) ptr) - 1;
+
+    if (checkMemBlock(PTR, __func__) != 0) {
+        memProblemCallback(PTR, __func__, __LINE__);
+    }
+
+    return PTR->freeFunc;
+}
+
+bool p_psMemGetPersistent(psPtr vptr)
+{
+    if (vptr == NULL) {
+        return NULL;
+    }
+
+    psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
+
+    if (checkMemBlock(ptr, __func__) != 0) {
+        memProblemCallback(ptr, __func__, __LINE__);
+    }
+
+    return ptr->persistent;
+}
+
+void p_psMemSetPersistent(psPtr vptr, bool value)
 {
     if (vptr == NULL) {
@@ -652 +697 @@
     }
 
-    ptr->freeFcn = freeFcn;
-
-}
-psFreeFunc psMemGetDeallocator(psPtr vptr)
-{
-    if (vptr == NULL) {
-        return NULL;
-    }
-
-    psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
-
-    if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, __func__, __LINE__);
-    }
-
-    return ptr->freeFcn;
-}
-
-bool p_psMemGetPersistent(psPtr vptr)
-{
-    if (vptr == NULL) {
-        return NULL;
-    }
-
-    psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
-
-    if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, __func__, __LINE__);
-    }
-
-    return ptr->persistent;
-}
-
-void p_psMemSetPersistent(psPtr vptr, bool value)
-{
-    if (vptr == NULL) {
-        return;
-    }
-
-    psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
-
-    if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, __func__, __LINE__);
-    }
-
     ptr->persistent = value;
 }

trunk/psLib/src/sys/psMemory.h

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-25 03:32:42 $
+ *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-27 20:38:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -67 +67 @@
     struct psMemBlock* previousBlock;  ///< previous block in allocation list
     struct psMemBlock* nextBlock;      ///< next block allocation list
-    psFreeFunc freeFcn;                 ///< deallocator.  If NULL, use generic deallocation.
+    psFreeFunc freeFunc;               ///< deallocator.  If NULL, use generic deallocation.
     size_t userMemorySize;             ///< the size of the user-portion of the memory block
-    const psMemId 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
+    const psS32 lineno;                ///< set from __LINE__ in e.g. p_psAlloc
     pthread_mutex_t refCounterMutex;   ///< mutex to ensure exclusive access to reference counter
     psReferenceCount refCounter;       ///< how many times pointer is referenced
-    psBool persistent;                   ///< marks if this non-user persistent data like error stack, etc.
+    psBool persistent;                 ///< marks if this non-user persistent data like error stack, etc.
     const psPtr endblock;              ///< initialised to p_psMEMMAGIC
 }
@@ -152 +152 @@
 void psMemSetDeallocator(
     psPtr ptr,                         ///< the memory block to operate on
-    psFreeFunc freeFcn                  ///< the function to be executed at deallocation
+    psFreeFunc freeFunc                ///< the function to be executed at deallocation
 );