Changeset 5118

Timestamp:

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

Author:

drobbin

Message:

Fixed psTrace to allow levels of 10 and higher

Location:

trunk/psLib

Files:

• src/sys/psTrace.c (modified) (5 diffs)
• test/mathtypes/tst_psVector.c (modified) (5 diffs)
• test/sys/tst_psTrace.c (modified) (3 diffs)
• test/sys/verified/tst_psTrace.stderr (modified) (1 diff)
• test/sys/verified/tst_psTrace.stdout (modified) (1 diff)

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);
 
     }

trunk/psLib/test/mathtypes/tst_psVector.c

@@ -14 +14 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-09-24 00:17:44 $
+ *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-09-24 01:33:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -152 +152 @@
     for(psS32 i = 0; i < 10; i++) {
         if (psVec->data.S32[i] != i*10) {
-            fprintf(stderr,"Elem %d = %d, expected %d\n", i, psVec->data.S32[i], i*10);
+            fprintf(stderr,"Elem %d = %d, expected %d\n", i,
+                    psVec->data.S32[i], i*10);
             return 5;
         }
@@ -174 +175 @@
     for(psS32 i = 0; i < 3; i++) {
         if (psVec->data.S32[i] != i*10) {
-            fprintf(stderr,"Elem %d = %d, expected %d\n", i, psVec->data.S32[i], i*10);
+            fprintf(stderr,"Elem %d = %d, expected %d\n", i,
+                    psVec->data.S32[i], i*10);
             return 12;
         }
@@ -374 +376 @@
     for (int i = 0; i < 10; i++) {
         if (test->data.S32[i] != i) {
-            fprintf(stderr, "Vector data does not match. i = %d, data=%d\n", i, test->data.S32[i]);
+            fprintf(stderr, "Vector data does not match. i = %d, data=%d\n",
+                    i, test->data.S32[i]);
             return 1;
         }
         if (test2->data.F32[i] != i*0.5) {
-            fprintf(stderr, "Vector data does not match. i = %d, data=%f\n", i, test->data.F32[i]);
+            fprintf(stderr, "Vector data does not match. i = %d, data=%f\n",
+                    i, test->data.F32[i]);
             return 1;
         }
@@ -400 +404 @@
         fprintf(stderr, "VectorSet Failed to set S32 at position 1\n");
     if ( (psS32)psVectorGet(vec, 0) != 10 )
-        fprintf(stderr, "VectorGet Failed to return the correct S32 from position 0\n");
+        fprintf(stderr,
+                "VectorGet Failed to return the correct S32 from position 0\n");
     if ( (psS32)psVectorGet(vec, -1) != 4 )
-        fprintf(stderr, "VectorGet Failed to return the correct S32 from tail using -1\n");
+        fprintf(stderr,
+                "VectorGet Failed to return the correct S32 from tail using -1\n");
 
     psFree(vec);

trunk/psLib/test/sys/tst_psTrace.c

@@ -69 +69 @@
         lev = psTraceGetLevel(".NODE00");
         if (lev != i) {
-            fprintf(stderr,"ERROR: (.NODE00) expected trace level was %d, actual was %d\n",
+            fprintf(stderr,
+                    "ERROR: (.NODE00) expected trace level was %d, actual was %d\n",
                     i, lev);
             return 2;
@@ -88 +89 @@
         lev = psTraceGetLevel(".NODE00.NODE01");
         if (lev != i) {
-            fprintf(stderr,"ERROR: (.NODE00.NODE01) expected trace level was %d, actual was %d\n",
+            fprintf(stderr,
+                    "ERROR: (.NODE00.NODE01) expected trace level was %d, actual was %d\n",
                     i, lev);
             return 4;
@@ -225 +227 @@
         (void)psTraceSetLevel(".a.b", 7);
         psTrace(".a.b", 5, "(2) This message should be displayed (%x)\n",
+                0xbeefface);
+        (void)psTraceSetLevel(".a.b.c", 12);
+        psTrace(".a.b.c", 11, "(3) This message should be displayed (%x)\n",
                 0xbeefface);
 

trunk/psLib/test/sys/verified/tst_psTrace.stderr

@@ -64 +64 @@
      (1) This message should be displayed (beefface)
      (2) This message should be displayed (beefface)
+           (3) This message should be displayed (beefface)
 
 ---> TESTPOINT PASSED (psTrace{psTrace()} | tst_psTrace.c)

trunk/psLib/test/sys/verified/tst_psTrace.stdout

@@ -2 +2 @@
      (1) This message should be displayed (beefface)
      (2) This message should be displayed (beefface)
+           (3) This message should be displayed (beefface)
 .                    9
  a                   8