Changeset 11265 for trunk/psLib/src/sys/psTrace.c

Timestamp:

Jan 24, 2007, 12:14:48 PM (19 years ago)

Author:

jhoblitt

Message:

merge jch-memory branch - overhaul of memory subsystem

File:

• trunk/psLib/src/sys/psTrace.c (modified) (5 diffs)

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.79 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 22:04:58 $
+ *  @version $Revision: 1.80 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-24 22:14:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
  
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #ifndef PS_NO_TRACE
@@ -80 +84 @@
     p_psComponent* comp = psAlloc(sizeof(p_psComponent));
 
-    p_psMemSetPersistent(comp,true);
+    psMemSetPersistent(comp,true);
     psMemSetDeallocator(comp, (psFreeFunc) componentFree);
     comp->name = psStringCopy(name);
-    p_psMemSetPersistent((psPtr)comp->name,true);
+    psMemSetPersistent((psPtr)comp->name,true);
     comp->level = level;
     comp->n = 0;
@@ -103 +107 @@
     if (comp->subcomp != NULL) {
         for (psS32 i = 0; i < comp->n; i++) {
-            p_psMemSetPersistent(comp->subcomp[i],false);
+            psMemSetPersistent(comp->subcomp[i],false);
             psFree(comp->subcomp[i]);
         }
-        p_psMemSetPersistent(comp->subcomp,false);
+        psMemSetPersistent(comp->subcomp,false);
         psFree(comp->subcomp);
     }
 
-    p_psMemSetPersistent((psPtr)comp->name,false);
+    psMemSetPersistent((psPtr)comp->name,false);
     psFree(comp->name);
 }
@@ -232 +236 @@
             currentNode->subcomp = psRealloc(currentNode->subcomp,
                                              (currentNode->n + 1) * sizeof(p_psComponent* ));
-            p_psMemSetPersistent(currentNode->subcomp,true);
+            psMemSetPersistent(currentNode->subcomp,true);
 
             currentNode->n = (currentNode->n) + 1;