Changeset 7570

Timestamp:

Jun 14, 2006, 2:21:57 PM (20 years ago)

Author:

Paul Price

Message:

Cleaning up.

File:

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

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-02 21:33:34 $
+ *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-15 00:21:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -54 +54 @@
 
 static p_psComponent* cRoot = NULL; // The root of the trace component
-// static FILE *traceFP = NULL;        // File destination for messages.
 static psBool traceTime = false;     // Flag to include time info
 static psBool traceHost = false;     // Flag to include host info
@@ -445 +444 @@
     } else {
         if (comp->level == PS_DEFAULT_TRACE_LEVEL) {
-            // fprintf(traceFP,"%*s%-*s %d\n", depth, "", 20 - depth, comp->name, defLevel);
             sprintf(line,"%*s%-*s %d\n", depth, "", 20 - depth, comp->name, defLevel);
             write (traceFD, line, strlen(line));
         } else {
-            // fprintf(traceFP, "%*s%-*s %d\n", depth, "", 20 - depth, comp->name, comp->level);
             sprintf(line, "%*s%-*s %d\n", depth, "", 20 - depth, comp->name, comp->level);
             write (traceFD, line, strlen(line));
@@ -576 +573 @@
         *head_ptr = '\0';
 
-
-        // fputs(head, traceFP);
         write (traceFD, head, strlen(head));
 
@@ -590 +585 @@
             // We indent each message one space for each level of the message.
             for (i = 0; i < level; i++) {
-                //            fprintf(traceFP, " ");
-                // fprintf(traceFP, "%s", format);
-                // sprintf(line, "%s", format);
                 write (traceFD, " ", 1);
             }
-            // vfprintf(traceFP, fmt, ap);
             vsprintf(line, format, ap);
             write (traceFD, line, strlen(line));
@@ -601 +592 @@
                 write(traceFD, "\n", 1);
             }
-
-
-            //        vfprintf(traceFP, format, ap);
-            //        va_end(ap);
-            /*            char msg[1024];
-                        char* msgPtr;
-                        vsnprintf(msg,1024, format, ap);  // create message
-
-                        // detect multiple lines in message and indent each line by 4 spaces.
-                        char* line = strtok_r(msg,"\n",&msgPtr);
-                        while (line != NULL) {
-                            fprintf(logDest,"    %s\n",line);
-                            line = strtok_r(NULL,"\n",&msgPtr);
-                        }
-            */
         } else {
-            // fputc('\n', traceFP);
             write(traceFD, "\n", 1);
         }
@@ -654 +629 @@
 }
 
-// XXX EAM : I've added code to close the old traceFP (safely)
-void psTraceSetDestination(int fd)
-{
-
-
-    /*
-        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);
-        special |= (traceFP == stdin);
-        special |= (traceFP == stdout);
-        special |= (traceFP == stderr);
-
-        if (!special) {
-            fclose (traceFP);
-        }
-        traceFP = fp;
-    */
-    if (fd < 1) {
-        traceFD = 0;
+bool psTraceSetDestination(int fd)
+{
+    if (fd < 0) {
         return;
     }
-    if (fd == 1) {
-        traceFD = STDOUT_FILENO;
-    } else if (fd == 2) {
-        traceFD = STDERR_FILENO;
-    } else if (fd > 2) {
-        close (traceFD);
-        traceFD = fd;
-    }
+
+    if (traceFD > STDERR_FILENO) {
+        close(traceFD);
+    }
+    traceFD = fd;
 }