Changeset 177

Timestamp:

Mar 9, 2004, 3:04:39 PM (22 years ago)

Author:

rhl

Message:

1/ Added psTraceReset() to reset the trace facility to startup, and free memory
2/ Changed New/Del to Alloc/Free

File:

• trunk/archive/pslib/src/Utils/trace.c (modified) (6 diffs)

trunk/archive/pslib/src/Utils/trace.c

@@ -41 +41 @@
 /*****************************************************************************/
 
-static Component *componentNew(const char *name,
-                               int level)
+static Component *componentAlloc(const char *name,
+                                 int level)
 {
     Component *comp = psAlloc(sizeof(Component));
@@ -54 +54 @@
 }
 
-static void componentDel(Component *comp)
+static void componentFree(Component *comp)
 {
     if (comp == NULL) { return; }
 
     if (comp->subcomp != NULL) {
-        for (int i = 0; comp->subcomp[i] != NULL; i++) {
-            componentDel(comp->subcomp[i]);
+        for (int i = 0; i < comp->n; i++) {
+            componentFree(comp->subcomp[i]);
         }
         psFree(comp->subcomp);
     }
 
+    psFree((char *)comp->name);
     psFree(comp);
 }
@@ -76 +77 @@
 static void initTrace(void) {
     if (croot == NULL) {
-        croot = componentNew("", UNKNOWN_LEVEL);
-    }
+        croot = componentAlloc("", UNKNOWN_LEVEL);
+    }
+}
+
+/*****************************************************************************/
+/*
+ * Free the trace tree information
+ */
+void psTraceReset(void)
+{
+    componentFree(croot);
+    croot = NULL;
 }
 
@@ -128 +139 @@
     }
 
-    Component *fcpt0 = componentNew(cpt0, UNKNOWN_LEVEL);
+    Component *fcpt0 = componentAlloc(cpt0, UNKNOWN_LEVEL);
     int i;
     for (i = 0; i < comp->n; i++) {
@@ -295 +306 @@
 int main(void)
 {
+    psSetLogFormat("NM");               // suppress some of the psLogMsg verbosity
+    
 #if 0
     psSetTraceLevel("", 10);
@@ -322 +335 @@
     psTrace("aaa.bbb.eee", 2, "aaa.bbb.eee\n");
 
+    psTraceReset();
+    fprintf(stderr,"Checking for memory leaks:\n");
+    psMemCheckLeaks(0, NULL, stderr);
+    
+
     return 0;
 }