Changeset 13950 for trunk/psLib/src/astro/psTime.c

Timestamp:

Jun 21, 2007, 4:28:48 PM (19 years ago)

Author:

jhoblitt

Message:

change psLibInit() to return a boolean status
change psLibFinalize() to abort on error as psError() may not/should not be working after invoking this function
change psTimeInitialize() to return a bool status
change psTimeInitialize() to deffer the actual loading of the "time tables"
rename psTimeInitialize() -> psTimeInit()
rename p_psTimeConfigFileName() -> p_psTimeConfigFilename()
change p_psTimeConfigFilename() to accept a filename argument
p_psTimeConfigFilename() now either return's the current conf files name when passed NULL or sets it to the "filename" parameter that is passed in
change all psTime* functions to make sure that the "time tables" have been initalized before using them

File:

• trunk/psLib/src/astro/psTime.c (modified) (11 diffs)

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.112 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-06-21 18:46:38 $
+ *  @version $Revision: 1.113 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-06-22 02:28:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -68 +68 @@
 #define NSEC_PER_DAY 86400000000000.0
 
+// Time config file path
+static char *timeConfig = NULL;
+
 /** Time metadata read from config file */
 static psMetadata *timeMetadata = NULL;
@@ -96 +99 @@
 static psTime* convertTimeUTCUT1(psTime* time);
 
+static bool p_psTimeInit(const char *fileName);
 
 /** Removes leading and trailing whitespace and # characters from a string. The cleaned string is a new null
@@ -164 +168 @@
 }
 
-// get the pslib.config filename by checking environment variable first, then original installation area.
-const char* p_psTimeConfigFileName()
-{
-    const char* filename = getenv("PS_CONFIG_FILE");
-
-    if (filename == NULL) { // environment variable not found
-        filename = PS_CONFIG_FILE_DEFAULT; // this should come from configure.ac
-    }
-
-    return filename;
+// get the pslib.config filename by checking environment variable first, then
+// the possiblity set config file name, then the original installation area.
+const char *p_psTimeConfigFilename(const char *filename)
+{
+    // if filename is provided, set timeConfig to this value
+    if (filename) {
+        psFree(timeConfig);
+        timeConfig = psStringCopy(filename);
+        psMemSetPersistent(timeConfig, true);
+        return timeConfig;
+    }
+
+    // check the env var first
+    const char *PS_CONFIG_FILE = getenv("PS_CONFIG_FILE");
+    if (PS_CONFIG_FILE) {
+        return PS_CONFIG_FILE;
+    }
+
+    // check timeConfig var 2nd
+    if (timeConfig) {
+        return timeConfig;
+    }
+
+    // fall back to the default, this should come from configure.ac
+    return PS_CONFIG_FILE_DEFAULT;
 }
 
@@ -191 +210 @@
 
     // Check if psTime tables are already loaded
-    if(!p_psTimeInit(p_psTimeConfigFileName())) {
+    if(!p_psTimeInit(p_psTimeConfigFilename(NULL))) {
         *status = PS_LOOKUP_ERROR;
         return NAN;
@@ -269 +288 @@
     }
 
+    // XXX this is not thread safe as the persistence setting is global
     const bool initialPersistence =
         p_psMemAllocatePersistent(true); // All memory allocated below is "persistent"
@@ -881 +901 @@
     if((bulletin != PS_IERS_A) && (bulletin != PS_IERS_B)) {
         psError(PS_ERR_BAD_PARAMETER_VALUE,true,"Invalid bulletin specified %d",bulletin);
+        return NAN;
+    }
+
+    // Check if psTime tables are already loaded
+    if(!p_psTimeInit(p_psTimeConfigFilename(NULL))) {
+        psError(PS_ERR_UNKNOWN, true, "failed to init time tables.");
         return NAN;
     }
@@ -1065 +1091 @@
     }
 
+    // Check if psTime tables are already loaded
+    if(!p_psTimeInit(p_psTimeConfigFilename(NULL))) {
+        psError(PS_ERR_UNKNOWN, true, "failed to init time tables.");
+        return NULL;
+    }
+
     // Attempt to find value through table lookup and interpolation
     mjd = psTimeToMJD(time);
@@ -1194 +1226 @@
 
     // Check if psTime tables are loaded/loadable
-    if(!p_psTimeInit(p_psTimeConfigFileName())) {
+    if (!p_psTimeInit(p_psTimeConfigFilename(NULL))) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Failed to open file %s."),
-                p_psTimeConfigFileName());
+                p_psTimeConfigFilename(NULL));
         return NAN;
     }
@@ -1712 +1744 @@
     // Error checks
     PS_ASSERT_PTR_NON_NULL(time,NULL);
-    PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,(psU32)((1e9)-1),NULL);
+    PS_ASSERT_INT_WITHIN_RANGE(time->nsec, (psU32)0, (psU32)((1e9)-1), NULL);
 
     // Convert time to TAI if necessary, but without changing input arguments
@@ -1796 +1828 @@
 }
 
-void psTimeInitialize(const char *timeConfig)
-{
-    p_psTimeInit(timeConfig);
+// delay actual init until a timefunction is used
+bool psTimeInit(const char *filename)
+{
+    // at present, this function can not fail
+    p_psTimeConfigFilename(filename);
+
+    return true;
 }