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

Timestamp:

Sep 6, 2005, 2:15:51 PM (21 years ago)

Author:

drobbin

Message:

Updated/changed psTrace & psLog fxns to use fd (were FILE*) as described in SDRS

File:

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

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-02 21:32:06 $
+ *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-07 00:15:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -245 +245 @@
  zero
 *****************************************************************************/
-psBool psTraceSetLevel(const char *comp,   // component of interest
-                       int level)  // desired trace level
+int psTraceSetLevel(const char *comp,   // component of interest
+                    int level)  // desired trace level
 {
     char *compName = NULL;
+    int prevLevel = -1;
 
     // If the root component tree does not exist, then initialize it.
@@ -267 +268 @@
         compName = (char *) comp;
     }
-
+    prevLevel = psTraceGetLevel(compName);
     // Add the new component to the component tree.
     if ( !componentAdd(compName, level) ) {
@@ -278 +279 @@
             psFree(compName);
         }
-        return false;
+        //        return false;
+        return -1;
     }
 
@@ -285 +287 @@
     }
 
-    return true;
+    //    return true;
+    return prevLevel;
 }
 
@@ -489 +492 @@
 void p_psTrace(const char *comp,        // component being traced
                int level,               // desired trace level
+               const char *format,
                ...)                     // arguments
 {
@@ -508 +512 @@
     // of it's associatedcomponent.
     if (level <= psTraceGetLevel(comp)) {
-        va_start(ap, level);
+        va_start(ap, format);
 
         // The following functions get the variable list of parameters with
@@ -517 +521 @@
         // We indent each message one space for each level of the message.
         for (i = 0; i < level; i++) {
-            fprintf(traceFP, " ");
+            //            fprintf(traceFP, " ");
+            fprintf(traceFP, "%s", format);
         }
         vfprintf(traceFP, fmt, ap);
+        //        vfprintf(traceFP, format, ap);
         va_end(ap);
     }
@@ -532 +538 @@
     /*
         bool special;
-     
+
         // XXX EAM perhaps return an error?
         if (fp == NULL) {
             return;
         }
-     
+
         // cannot close traceFP if one of the special FILE ptrs
         special  = (traceFP == NULL);
@@ -543 +549 @@
         special |= (traceFP == stdout);
         special |= (traceFP == stderr);
-     
+
         if (!special) {
             fclose (traceFP);