Changeset 23351 for branches/cnb_branches/cnb_branch_20090301/psModules/src/config

Timestamp:

Mar 17, 2009, 12:07:42 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301/psModules

Files:

• . (modified) (1 prop)
• src/config/Makefile.am (modified) (3 diffs)
• src/config/pmConfig.c (modified) (12 diffs)
• src/config/pmConfigCamera.c (modified) (2 diffs)
• src/config/pmConfigDump.c (modified) (1 diff)
• src/config/pmConfigRecipes.c (modified) (6 diffs)
• src/config/pmConfigRecipes.h (modified) (3 diffs)
• src/config/pmConfigRun.c (copied) (copied from trunk/psModules/src/config/pmConfigRun.c )
• src/config/pmConfigRun.h (copied) (copied from trunk/psModules/src/config/pmConfigRun.h )
• src/config/pmVersion.c (modified) (1 diff)
• src/config/pmVersion.h (modified) (3 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/Makefile.am

@@ -1 +1 @@
 noinst_LTLIBRARIES = libpsmodulesconfig.la
 
-libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS)
+# PSMODULES_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PSMODULES_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`
+# PSMODULES_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+
+# Force recompilation of pmVersion.c, since it gets the version information
+# pmVersion.c: FORCE
+#       touch pmVersion.c
+# FORCE: ;
+
+libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) -DPSMODULES_VERSION=$(SVN_VERSION) -DPSMODULES_BRANCH=$(SVN_BRANCH) -DPSMODULES_SOURCE=$(SVN_SOURCE)
 libpsmodulesconfig_la_LDFLAGS  = -release $(PACKAGE_VERSION)
 libpsmodulesconfig_la_SOURCES  = \
@@ -10 +19 @@
         pmConfigMask.c \
         pmConfigDump.c \
+        pmConfigRun.c \
         pmVersion.c \
         pmErrorCodes.c
@@ -20 +30 @@
         pmConfigMask.h \
         pmConfigDump.h \
+        pmConfigRun.h \
         pmVersion.h \
         pmErrorCodes.h

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfig.c

@@ -13 +13 @@
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <strings.h>            /* for strn?casecmp */
@@ -24 +25 @@
 #include <pslib.h>
 
-#include "pmConfig.h"
 #include "pmErrorCodes.h"
 #include "pmFPALevel.h"
 #include "pmConfigRecipes.h"
 #include "pmConfigCamera.h"
+#include "pmConfigRun.h"
+
+#include "pmConfig.h"
 
 #ifdef HAVE_NEBCLIENT
@@ -142 +145 @@
     config->format = NULL;
     config->formatName = NULL;
-    config->recipes = psMetadataAlloc();
+    config->recipes = NULL;
     config->recipesRead = PM_RECIPE_SOURCE_NONE;
     config->recipesCamera = psMetadataAlloc();
@@ -432 +435 @@
     // variable will contain the name of the configuration file.
 
-    char *configFile = NULL;
-    //
+    char *configFile = NULL;            // Name of configuration file
+
     // First, try command line
-    //
     psS32 argNum = psArgumentGet(*argc, argv, "-ipprc");
     if (argNum != 0) {
@@ -447 +449 @@
         }
     }
-    //
+
     // Next, try environment variable
-    //
     if (!configFile) {
         configFile = getenv(IPPRC_ENV);
         if (configFile) {
-            configFile = psStringCopy (configFile);
-        }
-    }
-
-    //
+            configFile = psStringCopy(configFile);
+        }
+    }
+
     // Last chance is ~/.ipprc
-    //
     if (!configFile) {
         char *home = getenv("HOME");
@@ -466 +465 @@
     }
 
-    // We have the configuration filename; now we read and parse the config
-    // file and store in psMetadata struct user.
+    // Read and parse the config file and store in struct user.
     // XXX move this section to pmConfigReadUser.c ?
-
     if (!pmConfigFileRead(&config->user, configFile, "user")) {
         psFree(config);
@@ -477 +474 @@
     psFree(configFile);
 
-    // XXX why was this being called here?  Is someone calling pmConfigRead multiple times?
-    // pmConfigDone();
-    assert (configPath == NULL);
+    pmConfigRunCommand(config, *argc, argv);
 
     // define the config-file search path (configPath).
+    psAssert(configPath == NULL, "Configuration path is already defined.");
     psString path = psMetadataLookupStr(NULL, config->user, "PATH");
-    pmConfigSet (path);
+    pmConfigSet(path);
 
     // read the SITE file
@@ -525 +521 @@
             psLogSetLevel(logLevel);
         }
-
 
         // Set logging format
@@ -648 +643 @@
     }
 
+    // Set the random number generator seed
+    {
+        psU64 seed = 0;                 // RNG seed
+        int argNum = psArgumentGet(*argc, argv, "-seed"); // Argument number
+        if (argNum > 0) {
+            psArgumentRemove(argNum, argc, argv);
+            if (argNum >= *argc) {
+                psWarning("-seed command-line switch provided without the required seed value --- ignored.");
+            } else {
+                char *end = NULL;       // Pointer to end of consumed string
+                seed = strtoll(argv[argNum], &end, 0);
+                if (strlen(end) > 0) {
+                    psError(PS_ERR_IO, true, "Unable to read random number generator seed: %s", argv[argNum]);
+                    psFree(config);
+                    return NULL;
+                }
+                psArgumentRemove(argNum, argc, argv);
+            }
+        }
+        pmConfigRunSeed(config, seed);
+    }
+
     // Next, we do a similar thing for the camera configuration file.  The
     // file is read and parsed into psMetadata struct "camera".
@@ -1110 +1127 @@
 // camera.  If we are discovering the camera (config->camera == NULL), then we also load the
 // recipe files for the camera.
-psMetadata *pmConfigCameraFormatFromHeader(psMetadata **camera, psString *cameraName, psString *formatName, 
-                                           pmConfig *config, const psMetadata *header, bool readRecipes)
+psMetadata *pmConfigCameraFormatFromHeader(psMetadata **camera, psString *cameraName, psString *formatName,
+                                           pmConfig *config, const psMetadata *header, bool readRecipes)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
@@ -1672 +1689 @@
                 // if the object does not exist and create isn't set, then we
                 // should puke
-                psError(PM_ERR_SYS, true, "Unable to access file %s", filename);
+                psError(PM_ERR_SYS, true, "Unable to access file %s: %s", filename, nebErr(server));
                 nebServerFree(server);
                 return NULL;
@@ -1685 +1702 @@
         if (trunc) {
             if(truncate(path, 0) != 0) {
-                psError(PS_ERR_IO, true, "Failed to truncate Nebulous file %s (real name %s)\n", filename, path);
+                psError(PS_ERR_IO, true, "Failed to truncate Nebulous file %s (real name %s)\n",
+                        filename, path);
                 return NULL;
             }

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigCamera.c

@@ -213 +213 @@
     psStringAppend(&newName, "_%s-SKYCELL", name);
     if (psMetadataLookup(oldCameras, newName)) {
+        psFree(newName);
         return true;
     }
@@ -469 +470 @@
     psStringAppend(&newName, "_%s-%s", name, mosaicLevel == PM_FPA_LEVEL_CHIP ? "CHIP" : "FPA");
     if (psMetadataLookup(oldCameras, newName)) {
+        psFree(newName);
         return true;
     }

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigDump.c

@@ -54 +54 @@
     psArray *keep = psStringSplitArray(save, " ,;", false); // List of items to keep
 
-    bool result = configCull(config->recipes, keep); // Result of culling
+    if (!configCull(config->recipes, keep)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to cull system recipes.");
+        psFree(keep);
+        return false;
+    }
     psFree(keep);
 
-    return result;
+    // Need to cull recipes from all cameras as well
+    psMetadata *cameras = psMetadataLookupMetadata(NULL, config->system, "CAMERAS"); // Known cameras
+    if (!cameras) {
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find CAMERAS in the system configuration.\n");
+        return false;
+    }
+
+    psMetadataIterator *iter = psMetadataIteratorAlloc(cameras, PS_LIST_HEAD, NULL); // Iterator for cameras
+    psMetadataItem *item;               // Item from iteration
+    keep = psArrayAllocEmpty(1);
+    while ((item = psMetadataGetAndIncrement(iter))) {
+        psAssert(item->type == PS_DATA_METADATA, "Should only be metadata types on the camera list.");
+        psMetadata *camera = item->data.md; // Camera configuration
+        bool mdok;                      // Status of MD lookup
+        psMetadata *recipes = psMetadataLookupMetadata(&mdok, camera, "RECIPES"); // Recipe overrides
+        if (!recipes) {
+            continue;
+        }
+        if (!configCull(recipes, keep)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to cull recipes for camera %s", item->name);
+            psFree(iter);
+            psFree(keep);
+            return false;
+        }
+    }
+    psFree(iter);
+    psFree(keep);
+
+    return true;
 }
 

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigRecipes.c

@@ -11 +11 @@
 #include "pmConfigRecipes.h"
 
-static bool loadRecipeSystem(bool *status, pmConfig *config, psMetadata *source);
+static bool loadRecipeSystem(bool *status, pmConfig *config);
 static bool loadRecipeCamera(bool *status, pmConfig *config, psMetadata *source);
 static bool loadRecipeSymbols(bool *status, pmConfig *config, pmRecipeSource source);
@@ -56 +56 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    if (!config->recipes) {
-        config->recipes = psMetadataAlloc();
-    }
-
     // Read the recipe file names from the system configuration and camera configuration
     // It is an error for config->system:recipes not to exist.  all programs install their
     // master recipe files in the system:recipe location when they are built.
     psAssert(config->system, "base config data defined");
-    if (source & PM_RECIPE_SOURCE_SYSTEM) {
-        if (!loadRecipeSystem(&status, config, config->system)) {
+    if (!config->recipes || (source & PM_RECIPE_SOURCE_SYSTEM)) {
+        if (!loadRecipeSystem(&status, config)) {
             psError(PS_ERR_IO, false, "Failed to read recipes from system config");
             return false;
@@ -321 +317 @@
 // Load the recipe files for SYSTEM : REQUIRED
 static bool loadRecipeSystem(bool *status,
-                           pmConfig *config, // The configuration into which to read the recipes
-                           psMetadata *source // The source configuration, from which to read the filenames
+                           pmConfig *config // The configuration into which to read the recipes
     )
 {
@@ -329 +324 @@
     *status = false;
 
-    if (!source) {
+    if (!config->system) {
         psError(PS_ERR_IO, true,
                 "The system configuration has not been read --- cannot read recipes from this location.\n");
@@ -336 +331 @@
     }
 
-    psMetadata *recipes = psMetadataLookupMetadata(NULL, source, "RECIPES"); // The list of recipes
-    if (!recipes) {
-        psError(PS_ERR_IO, false, "RECIPES not found in the system configuration\n");
-        return false;
-    }
-
-    // Copy contents of the filenames to config->recipes from the "RECIPES" metadata in the source.
-    // We could use psMetadataCopy for this, but it's better to check that everything's of the correct type.
-    // If it's not of the correct type, we can tell the user which file it's in, so they can find it easier.
-    psMetadataIterator *recipesIter = psMetadataIteratorAlloc(recipes, PS_LIST_HEAD, NULL); // Iterator
+    if (!config->recipes) {
+        config->recipes = psMemIncrRefCounter(psMetadataLookupMetadata(NULL, config->system, "RECIPES")); // The list of recipes
+        if (!config->recipes) {
+            psError(PS_ERR_IO, false, "RECIPES not found in the system configuration\n");
+            return false;
+        }
+    }
+
+    // Read in the component recipes
+    psMetadataIterator *recipesIter = psMetadataIteratorAlloc(config->recipes, PS_LIST_HEAD, NULL); // Iterator
     psMetadataItem *item = NULL;        // MD item containing the filename, from recipe iteration
     while ((item = psMetadataGetAndIncrement(recipesIter))) {
@@ -353 +348 @@
             psFree(recipesIter);
             return false;
-        }
-
-        // add the contents of this recipe file to config->recipes
-        psMetadataAdd(config->recipes, PS_LIST_TAIL, item->name, PS_DATA_METADATA | PS_META_REPLACE,
-                      item->comment, item->data.md);
+        }
     }
     psFree(recipesIter);

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigRecipes.h

@@ -1 +1 @@
 /*  @file pmConfigRecipes.h
  *  @brief Configuration Recipe functions
- * 
+ *
  *  @author ?, MHPCC
  *  @author Paul Price, IfA
  *  @author Eugene Magnier, IfA
- * 
+ *
  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
  *  @date $Date: 2007-04-19 02:10:12 $
@@ -13 +13 @@
 #ifndef PM_CONFIG_RECIPES_H
 #define PM_CONFIG_RECIPES_H
+
+#include <pmConfig.h>
 
 /// @addtogroup Config Configuration System
@@ -26 +28 @@
 
 
-bool pmConfigLoadRecipeArguments (int *argc, char **argv, pmConfig *config);
-bool pmConfigLoadRecipeOptions (int *argc, char **argv, pmConfig *config, char *flag);
-psMetadata *pmConfigRecipeOptions (pmConfig *config, char *recipe);
+bool pmConfigLoadRecipeArguments(int *argc, char **argv, pmConfig *config);
+bool pmConfigLoadRecipeOptions(int *argc, char **argv, pmConfig *config, char *flag);
+psMetadata *pmConfigRecipeOptions(pmConfig *config, char *recipe);
 
 /// @}

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmVersion.c

@@ -8 +8 @@
 #include "pmVersion.h"
 
-static const char *cvsTag = "$Name: not supported by cvs2svn $";// CVS tag name
+#ifndef PSMODULES_VERSION
+#error "PSMODULES_VERSION is not set"
+#endif
+#ifndef PSMODULES_BRANCH
+#error "PSMODULES_BRANCH is not set"
+#endif
+#ifndef PSMODULES_SOURCE
+#error "PSMODULES_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
 
 psString psModulesVersion(void)
 {
-    psString version = NULL;            // Version, to return
-    psStringAppend(&version, "%s-%s",PACKAGE_NAME,PACKAGE_VERSION);
-    return version;
+    char *value = NULL;
+    psStringAppend(&value, "%s@%s", xstr(PSMODULES_BRANCH), xstr(PSMODULES_VERSION));
+    return value;
 }
+
+psString psModulesSource(void)
+{
+    return psStringCopy(xstr(PSMODULES_SOURCE));
+}
+
 
 psString psModulesVersionLong(void)
 {
-    psString version = psModulesVersion(); // Version, to return
-    psString tag = psStringStripCVS(cvsTag, "Name"); // CVS tag
+    psString version = psModulesVersion();  // Version, to return
+    psString source = psModulesSource();    // Source
 
-    psStringAppend(&version, " (cvs tag %s) %s, %s", tag, __DATE__, __TIME__);
+    psStringPrepend(&version, "psModules ");
+    psStringAppend(&version, " from %s, built %s, %s", source, __DATE__, __TIME__);
+    psFree(source);
 
-    psFree(tag);
+#ifdef __OPTIMIZE__
+    psStringAppend(&version, " optimised");
+#else
+    psStringAppend(&version, " unoptimised");
+#endif
+
+#ifdef HAVE_NEBCLIENT
+    psStringAppend(&version, " with nebclient");
+#else
+    psStringAppend(&version, " without nebclient");
+#endif
+
     return version;
+};
+
+
+bool psModulesVersionHeader(psMetadata *header)
+{
+    PS_ASSERT_METADATA_NON_NULL(header, false);
+
+    psString version = psModulesVersion(); // Software version
+    psString source = psModulesSource();   // Software source
+
+    psStringPrepend(&version, "psModules version: ");
+    psStringPrepend(&source, "psModules source: ");
+
+    psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, version);
+    psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, source);
+
+    psFree(version);
+    psFree(source);
+
+    return true;
 }

branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmVersion.h

@@ -1 +1 @@
 /*  @file pmVersion.h
  *  @brief Version functions
- * 
+ *
  *  @author Paul Price, IfA
  *  @author Eugene Magnier, IfA
- * 
+ *
  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
  *  @date $Date: 2007-03-30 21:12:56 $
@@ -22 +22 @@
  *  @return psString: String with version name.
  */
-psString psModulesVersion(
-    void
-);
+psString psModulesVersion(void);
+
+/** Get current psModules source
+ *
+ *  Returns the current psModules source as a string.
+ *
+ *  @return psString: String with source.
+ */
+psString psModulesSource(void);
 
 /** Get current psModules version (full identification)
@@ -34 +40 @@
 psString psModulesVersionLong(void);
 
+/// Populate a header with version information
+bool psModulesVersionHeader(
+    psMetadata *header                  ///< Header to populate
+    );
+
+
 /// @}
 #endif