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

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.

File:

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

trunk/psLib/src/sys/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;
+}