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

Timestamp:

Sep 23, 2005, 3:33:12 PM (21 years ago)

Author:

drobbin

Message:

Fixed psTrace to allow levels of 10 and higher

File:

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

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-23 21:57:12 $
+ *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-24 01:33:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -216 +216 @@
             if (pname == NULL) {
                 // This is the final component to add.
-                currentNode->subcomp[(currentNode->n) - 1] = componentAlloc(firstComponent, level);
+                currentNode->subcomp[(currentNode->n) - 1] =
+                    componentAlloc(firstComponent, level);
             } else {
                 // We are adding an intermediate component.  The trace level
@@ -224 +225 @@
                 // static, one-time, type of behavior.
 
-                currentNode->subcomp[(currentNode->n) - 1] = componentAlloc(firstComponent, PS_DEFAULT_TRACE_LEVEL);
+                currentNode->subcomp[(currentNode->n) - 1] =
+                    componentAlloc(firstComponent, PS_DEFAULT_TRACE_LEVEL);
             }
             currentNode = currentNode->subcomp[(currentNode->n) - 1];
@@ -514 +516 @@
         gethostname(hostname, 256);
     }
-    switch (level) {
-    case PS_LOG_ABORT:
+
+    if (level == PS_LOG_ABORT) {
         clevel = 'A';
-        break;
-
-    case PS_LOG_ERROR:
+    } else if (level == PS_LOG_ERROR) {
         clevel = 'E';
-        break;
-
-    case PS_LOG_WARN:
+    } else if (level == PS_LOG_WARN) {
         clevel = 'W';
-        break;
-
-    case PS_LOG_INFO:
+    } else if (level == PS_LOG_INFO) {
         clevel = 'I';
-        break;
-
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-    case 9:
+    } else if (level >= 4) {
         clevel = level + '0';
-        break;
-
-    default:
+    } else {
         psTrace("utils.logMsg", 2, "Invalid logMsg level: %d (%s)\n", level, format);
         level = (level < 0) ? 0 : 9;
         clevel = level + '0';
-        break;
     }
 
@@ -772 +758 @@
     // XXX: If one must at least log error messages, why don't we set logMsg = true here?
     if (!traceMsg) {
-        psTrace("utils.traceMsg", 1, "You must at least trace error messages (You chose \"%s\")", format);
+        psTrace("utils.traceMsg", 1,
+                "You must at least trace error messages (You chose \"%s\")", format);
 
     }