Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppStats/src

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppStats/src (modified) (1 prop)
• ppStats/src/Makefile.am (modified) (1 diff)
• ppStats/src/ppStatsErrorCodes.dat (modified) (1 diff)
• ppStats/src/ppStatsErrorCodes.h.in (modified) (1 diff)
• ppStats/src/ppStatsFromMetadataStats.c (modified) (1 diff)
• ppStats/src/ppStatsReadout.c (modified) (1 diff)
• ppStats/src/ppStatsVersion.c (modified) (3 diffs)
• ppStats/src/ppStatsVersionDefinitions.h.in (copied) (copied from trunk/ppStats/src/ppStatsVersionDefinitions.h.in )

branches/cnb_branches/cnb_branch_20090301/ppStats/src

@@ -10 +10 @@
 config.h.in
 stamp-h1
+ppStatsVersionDefinitions.h

@@ -10 +10 @@
 config.h.in
 stamp-h1
+ppStatsVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppStats/src/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libppStats.la
 
-# PPSTATS_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPSTATS_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-# PPSTATS_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppStatsVersion.c, since it gets the version information
-# ppStatsVersion.c: FORCE
-#       touch ppStatsVersion.c
-# FORCE: ;
+if HAVE_SVNVERSION
+PPSTATS_VERSION=`$(SVNVERSION) ..`
+else
+PPSTATS_VERSION="UNKNOWN"
+endif
 
-libppStats_la_CFLAGS = $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPSTATS_VERSION=$(SVN_VERSION) -DPPSTATS_BRANCH=$(SVN_BRANCH) -DPPSTATS_SOURCE=$(SVN_SOURCE)
+if HAVE_SVN
+PPSTATS_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
+PPSTATS_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+else
+PPSTATS_BRANCH="UNKNOWN"
+PPSTATS_SOURCE="UNKNOWN"
+endif
+
+# Force recompilation of ppStatsVersion.c, since it gets the version information
+ppStatsVersion.c: ppStatsVersionDefinitions.h
+ppStatsVersionDefinitions.h: ppStatsVersionDefinitions.h.in FORCE
+        -$(RM) ppStatsVersionDefinitions.h
+        $(SED) -e "s|@PPSTATS_VERSION@|\"$(PPSTATS_VERSION)\"|" -e "s|@PPSTATS_BRANCH@|\"$(PPSTATS_BRANCH)\"|" -e "s|@PPSTATS_SOURCE@|\"$(PPSTATS_SOURCE)\"|" ppStatsVersionDefinitions.h.in > ppStatsVersionDefinitions.h
+FORCE: ;
+
+libppStats_la_CFLAGS = $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
 libppStats_la_LDFLAGS = $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 

branches/cnb_branches/cnb_branch_20090301/ppStats/src/ppStatsErrorCodes.dat

@@ -2 +2 @@
 # This file is used to generate ppStatsErrorClasses.h
 #
-BASE = 400              First value we use; lower values belong to psLib
+BASE = 2000             First value we use; lower values belong to psLib
 # these errors correspond to standard exit conditions
 ARGUMENTS               Incorrect arguments

branches/cnb_branches/cnb_branch_20090301/ppStats/src/ppStatsErrorCodes.h.in

@@ -9 +9 @@
  */
 typedef enum {
-    PPSTATS_ERR_BASE = 512,
+    PPSTATS_ERR_BASE = 2000,
     PPSTATS_ERR_${ErrorCode},
     PPSTATS_ERR_NERROR

branches/cnb_branches/cnb_branch_20090301/ppStats/src/ppStatsFromMetadataStats.c

@@ -38 +38 @@
 
         psStats *stats = psStatsAlloc(option);
-        psVectorStats(stats, entry->vector, NULL, NULL, 0);
+        if (!psVectorStats(stats, entry->vector, NULL, NULL, 0)) {
+            psError(PS_ERR_UNKNOWN, false, "failure to measure stats for %s", entry->statistic);
+            continue;
+        }
 
         double value;

branches/cnb_branches/cnb_branch_20090301/ppStats/src/ppStatsReadout.c

@@ -92 +92 @@
         }
         if (!psVectorStats(data->stats, sampleValues, NULL, sampleMask, 1)) {
-            psWarning("Unable to perform statistics on readout %s.\n", readoutName);
-            psErrorClear();
-        }
+            psError(PS_ERR_UNKNOWN, false, "failure to measure stats for readout %s", readoutName);
+        }
+        // XXX raise if we get a NAN? psWarning("Unable to perform statistics on readout %s.\n", readoutName);
         psFree(sampleValues);
         psFree(sampleMask);

branches/cnb_branches/cnb_branch_20090301/ppStats/src/ppStatsVersion.c

@@ -1 +1 @@
 #include "ppStatsInternal.h"
+#include "ppStatsVersionDefinitions.h"
 
 #ifndef PPSTATS_VERSION
@@ -11 +12 @@
 #endif
 
-#define xstr(s) str(s)
-#define str(s) #s
-
 psString ppStatsVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", xstr(PPSTATS_BRANCH), xstr(PPSTATS_VERSION));
+    psStringAppend(&value, "%s@%s", PPSTATS_BRANCH, PPSTATS_VERSION);
     return value;
 }
@@ -23 +21 @@
 psString ppStatsSource(void)
 {
-    return psStringCopy(xstr(PPSTATS_SOURCE));
+    return psStringCopy(PPSTATS_SOURCE);
 }
 

@@ -10 +10 @@
 config.h.in
 stamp-h1
+ppStatsVersionDefinitions.h