Changeset 1733

Timestamp:

Sep 8, 2004, 12:10:06 PM (22 years ago)

Author:

desonia

Message:

fixed bug where psTracePrintLevels didn't honor the destination set by psTraceSetDestination.

Location:

trunk/psLib/src

Files:

• sys/psTrace.c (modified) (3 diffs)
• sys/psTrace.h (modified) (2 diffs)
• sysUtils/psTrace.c (modified) (3 diffs)
• sysUtils/psTrace.h (modified) (2 diffs)

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 21:22:47 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 22:10:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -134 +134 @@
 void psTraceReset()
 {
-    componentFree(cRoot);
+    psFree(cRoot);
     cRoot = NULL;
 }
@@ -354 +354 @@
     } else {
         if (comp->level == PS_DEFAULT_TRACE_LEVEL) {
-            printf("%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
-                   defLevel);
+            if (traceFP == NULL) {
+                printf("%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
+                       defLevel);
+            } else {
+                fprintf(traceFP,"%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
+                        defLevel);
+            }
         } else {
-            printf("%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
-                   comp->level);
+            if (traceFP == NULL) {
+                printf("%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
+                       comp->level);
+            } else {
+                fprintf(traceFP, "%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
+                        comp->level);
+            }
         }
     }

trunk/psLib/src/sys/psTrace.h

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 21:22:47 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 22:10:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18 +18 @@
 
 #define PS_UNKNOWN_TRACE_LEVEL -9999   // we don't know this name's level
-#define PS_DEFAULT_TRACE_LEVEL -1
+#define PS_DEFAULT_TRACE_LEVEL 0
 
 /** \addtogroup LogTrace

trunk/psLib/src/sysUtils/psTrace.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 21:22:47 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 22:10:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -134 +134 @@
 void psTraceReset()
 {
-    componentFree(cRoot);
+    psFree(cRoot);
     cRoot = NULL;
 }
@@ -354 +354 @@
     } else {
         if (comp->level == PS_DEFAULT_TRACE_LEVEL) {
-            printf("%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
-                   defLevel);
+            if (traceFP == NULL) {
+                printf("%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
+                       defLevel);
+            } else {
+                fprintf(traceFP,"%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
+                        defLevel);
+            }
         } else {
-            printf("%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
-                   comp->level);
+            if (traceFP == NULL) {
+                printf("%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
+                       comp->level);
+            } else {
+                fprintf(traceFP, "%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
+                        comp->level);
+            }
         }
     }

trunk/psLib/src/sysUtils/psTrace.h

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 21:22:47 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 22:10:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18 +18 @@
 
 #define PS_UNKNOWN_TRACE_LEVEL -9999   // we don't know this name's level
-#define PS_DEFAULT_TRACE_LEVEL -1
+#define PS_DEFAULT_TRACE_LEVEL 0
 
 /** \addtogroup LogTrace