Changeset 2391

Timestamp:

Nov 22, 2004, 10:49:59 AM (22 years ago)

Author:

evanalst

Message:

Add additional parameter to psMemCheckLeaks.

Location:

trunk/psLib/src

Files:

• sys/psMemory.c (modified) (4 diffs)
• sys/psMemory.h (modified) (2 diffs)
• sysUtils/psMemory.c (modified) (4 diffs)
• sysUtils/psMemory.h (modified) (2 diffs)

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-11-04 01:05:00 $
+*  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-11-22 20:49:59 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -443 +443 @@
  * Check for memory leaks.
  */
-psS32 psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd)
+psS32 psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd, psBool persistence)
 {
     psS32 nleak = 0;
@@ -453 +453 @@
     for (psMemBlock* iter = topBlock; iter != NULL; iter = iter->nextBlock) {
         if ( (iter->refCounter > 0) &&
-                (! iter->persistent) &&
+                ( (persistence) || (!persistence && !iter->persistent) ) &&
                 (iter->id >= id0)) {
 
@@ -479 +479 @@
     for (psMemBlock* iter = topBlock; iter != NULL; iter = iter->nextBlock) {
         if ( (iter->refCounter > 0) &&
-                (! iter->persistent) &&
+                ( (persistence) || (!persistence && !iter->persistent) ) &&
                 (iter->id >= id0)) {
 

trunk/psLib/src/sys/psMemory.h

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-22 20:49:59 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -257 +257 @@
     psMemoryId id0,                    ///< don't list blocks with id < id0
     psMemBlock* ** arr,                ///< pointer to array of pointers to leaked blocks, or NULL
-    FILE * fd                          ///< print list of leaks to fd (or NULL)
+    FILE * fd,                         ///< print list of leaks to fd (or NULL)
+    psBool persistence                 ///< make check across all object even persistent ones
 );
 

trunk/psLib/src/sysUtils/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-11-04 01:05:00 $
+*  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-11-22 20:49:59 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -443 +443 @@
  * Check for memory leaks.
  */
-psS32 psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd)
+psS32 psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd, psBool persistence)
 {
     psS32 nleak = 0;
@@ -453 +453 @@
     for (psMemBlock* iter = topBlock; iter != NULL; iter = iter->nextBlock) {
         if ( (iter->refCounter > 0) &&
-                (! iter->persistent) &&
+                ( (persistence) || (!persistence && !iter->persistent) ) &&
                 (iter->id >= id0)) {
 
@@ -479 +479 @@
     for (psMemBlock* iter = topBlock; iter != NULL; iter = iter->nextBlock) {
         if ( (iter->refCounter > 0) &&
-                (! iter->persistent) &&
+                ( (persistence) || (!persistence && !iter->persistent) ) &&
                 (iter->id >= id0)) {
 

trunk/psLib/src/sysUtils/psMemory.h

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-22 20:49:59 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -257 +257 @@
     psMemoryId id0,                    ///< don't list blocks with id < id0
     psMemBlock* ** arr,                ///< pointer to array of pointers to leaked blocks, or NULL
-    FILE * fd                          ///< print list of leaks to fd (or NULL)
+    FILE * fd,                         ///< print list of leaks to fd (or NULL)
+    psBool persistence                 ///< make check across all object even persistent ones
 );