Changeset 1810 for trunk/psLib/src/sysUtils

Timestamp:

Sep 14, 2004, 1:48:25 PM (22 years ago)

Author:

desonia

Message:

adjustments to coorespond to adding persistent flag to psMemBlock, i.e.,
exclusion of internal library blocks in memory leak checks.

Location:

trunk/psLib/src/sysUtils

Files:

• psError.c (modified) (3 diffs)
• psMemory.c (modified) (6 diffs)
• psMemory.h (modified) (3 diffs)
• psTrace.c (modified) (4 diffs)

trunk/psLib/src/sysUtils/psError.c

@@ -10 +10 @@
  *  @author Eric Van Alst, MHPCC
  *   
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-14 20:01:52 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-14 23:48:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40 +40 @@
         errorStack[errorStackSize] = psMemIncrRefCounter(err);
         errorStackSize++;
+        p_psMemSetPersistent(err,true);
+        p_psMemSetPersistent(err->msg,true);
+        p_psMemSetPersistent(err->name,true);
     }
 
@@ -83 +86 @@
     pthread_mutex_lock(&lockErrorStack);
     for (int lcv=0;lcv<errorStackSize;lcv++) {
+        p_psMemSetPersistent(errorStack[lcv]->msg,false);
+        p_psMemSetPersistent(errorStack[lcv]->name,false);
+        p_psMemSetPersistent(errorStack[lcv],false);
         psFree(errorStack[lcv]);
     }

trunk/psLib/src/sysUtils/psMemory.c

@@ -1 @@
-
 /** @file  psMemory.c
 *
@@ -9 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-08 21:06:00 $
+*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-14 23:48:25 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -341 +340 @@
     ptr->file = file;
     ptr->freeFcn = NULL;
+    ptr->persistent = false;
     *(unsigned int *)&ptr->lineno = lineno;
     *(void **)((int8_t *) (ptr + 1) + size) = P_PS_MEMMAGIC;
@@ -446 +446 @@
 
     for (psMemBlock* iter = topBlock; iter != NULL; iter = iter->nextBlock) {
-        if ((psMemGetRefCounter(iter + 1) > 0) && (iter->id >= id0)) {
+        if ( (iter->refCounter > 0) &&
+                (! iter->persistent) &&
+                (iter->id >= id0)) {
+
             nleak++;
 
@@ -469 +472 @@
 
     for (psMemBlock* iter = topBlock; iter != NULL; iter = iter->nextBlock) {
-        if ((psMemGetRefCounter(iter + 1) > 0) && (iter->id >= id0)) {
+        if ( (iter->refCounter > 0) &&
+                (! iter->persistent) &&
+                (iter->id >= id0)) {
+
             (*arr)[j++] = iter;
             if (j == nleak) {              // found them all
@@ -651 +657 @@
     return ptr->freeFcn;
 }
+
+bool p_psMemGetPersistent(void *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(void *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/sysUtils/psMemory.h

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-23 22:36:03 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-14 23:48:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -73 +73 @@
     pthread_mutex_t refCounterMutex;   ///< mutex to ensure exclusive access to reference counter
     psReferenceCount refCounter;       ///< how many times pointer is referenced
+    bool persistent;                   ///< marks if this non-user persistent data like error stack, etc.
     const void *endblock;              ///< initialised to p_psMEMMAGIC
 }
@@ -163 +164 @@
     void *ptr                          ///< the memory block
 );
+
+/** Set the memory as persistent so that it is ignored when detecting memory leaks.
+ *
+ *  Used to mark a memory block as persistent data within the library, 
+ *  i.e., non user-level data used to hold psLib's state or cache data.  Such
+ *  examples of this class of memory is psTrace's trace-levels and dynamic
+ *  error codes.
+ *
+ *  Memory marked as persistent is excluded from memory leak checks.
+ *
+ */
+void p_psMemSetPersistent(
+    void *ptr,                         ///< the memory block to operate on
+    bool value                         ///< true if memory is persistent, otherwise false
+);
+
+/** Get the memory's persistent flag.
+ *
+ *  Checks if a memory block has been marked as persistent by 
+ *  p_psMemSetPresistent.
+ *
+ *  Memory marked as persistent is excluded from memory leak checks.
+ *
+ *  @return bool    true if memory is marked persistent, otherwise false.
+ */
+bool p_psMemGetPersistent(
+    void *ptr                          ///< the memory block to check.
+);
+
 
 /** Memory re-allocation.  This operates much like realloc(), but is guaranteed to return a non-NULL value.

trunk/psLib/src/sysUtils/psTrace.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-09 01:46:15 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-14 23:48:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -65 +65 @@
     p_psComponent* comp = psAlloc(sizeof(p_psComponent));
 
+    p_psMemSetPersistent(comp,true);
     p_psMemSetDeallocator(comp, (psFreeFcn) componentFree);
     comp->name = psStringCopy(name);
+    p_psMemSetPersistent((void*)comp->name,true);
     comp->level = level;
     comp->n = 0;
@@ -85 +87 @@
     if (comp->subcomp != NULL) {
         for (int i = 0; i < comp->n; i++) {
+            p_psMemSetPersistent(comp->subcomp[i],false);
             psFree(comp->subcomp[i]);
         }
+        p_psMemSetPersistent(comp->subcomp,false);
         psFree(comp->subcomp);
     }
 
-    psFree((char *)comp->name);
+    p_psMemSetPersistent((void*)comp->name,false);
+    psFree((void*)comp->name);
 }
 
@@ -195 +200 @@
             currentNode->subcomp = psRealloc(currentNode->subcomp,
                                              (currentNode->n + 1) * sizeof(p_psComponent* ));
+            p_psMemSetPersistent(currentNode->subcomp,true);
+
             currentNode->n = (currentNode->n) + 1;