Changeset 5909

Timestamp:

Jan 5, 2006, 3:01:39 PM (21 years ago)

Author:

magnier

Message:

updates to log

Location:

branches/eam_rel9_b1/psLib/src

Files:

• sys/psLogMsg.h (modified) (2 diffs)
• types/psMetadata.c (modified) (2 diffs)

branches/eam_rel9_b1/psLib/src/sys/psLogMsg.h

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-20 02:43:53 $
+ *  @version $Revision: 1.34.16.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-06 01:01:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -115 +115 @@
     PS_LOG_ERROR,                      ///< log message is an error, but don't abort
     PS_LOG_WARN,                       ///< log message is a warning
-    PS_LOG_INFO                        ///< log message is informational only
+    PS_LOG_INFO,                       ///< log message is informational only
+    PS_LOG_NOTE,                       ///< log message is informational only
+    PS_LOG_DETAIL                      ///< log message is informational only
 };
 

branches/eam_rel9_b1/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.92 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-18 01:51:03 $
+ *  @version $Revision: 1.92.6.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-06 01:01:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1237 +1237 @@
         // Only doing a representative set of types
     case PS_DATA_S32:
-        return arg->data.S32 >= 0 ? (int)log10f((float)arg->data.S32) + 1 :
-               (int)log10f(-(float)arg->data.S32) + 2;
+        // XXX : this had a seriously bad result for value == 0!
+        if (arg->data.S32 == 0)
+            return 1;
+        if (arg->data.S32 < 0)
+            return (int)log10f(-(float)arg->data.S32) + 2;
+        return (int)log10f((float)arg->data.S32) + 1;
         // XXX: Other numerical types
     case PS_DATA_F32: