Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/psLib/src/sys

Timestamp:

Mar 17, 2009, 12:08:50 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psLib/src/sys/Makefile.am (modified) (1 diff)
• psLib/src/sys/psConfigure.c (modified) (3 diffs)
• psLib/src/sys/psConfigure.h (modified) (2 diffs)
• psLib/src/sys/psLogMsg.c (modified) (2 diffs)
• psLib/src/sys/psMemory.c (modified) (1 diff)
• psLib/src/sys/psMemory.h (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/psLib/src/sys/Makefile.am

@@ -3 +3 @@
 noinst_LTLIBRARIES = libpslibsys.la
 
-libpslibsys_la_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) $(CFITSIO_CFLAGS)
+# PSLIB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
+# PSLIB_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`
+# PSLIB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+
+# Force recompilation of psConfigure.c, since it gets the version information
+psConfigure.c: FORCE
+        touch psConfigure.c
+FORCE: ;
+
+libpslibsys_la_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) $(CFITSIO_CFLAGS) -DPSLIB_VERSION=$(SVN_VERSION) -DPSLIB_BRANCH=$(SVN_BRANCH) -DPSLIB_SOURCE=$(SVN_SOURCE)
 libpslibsys_la_SOURCES = \
         psAbort.c \

branches/cnb_branches/cnb_branch_20090301/psLib/src/sys/psConfigure.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *  @author Robert DeSonia, MHPCC
+ *  @author Paul Price, IfA
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-08 18:05:08 $
- *
- *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
+ *  Copyright 2004-2009 Institute for Astronomy, University of Hawaii
  */
 
@@ -26 +24 @@
 #include <stdlib.h>
 #include <string.h>
+
+#include <fitsio.h>
+#include <longnam.h>
+#include <fftw3.h>
+#include <gsl/gsl_version.h>
+#ifdef HAVE_PSDB
+#include <mysql.h>
+#endif
 
 #include "psAbort.h"
@@ -41 +47 @@
 static FILE *memCheckFile = NULL;       // File to which to write results of mem check
 
-static const char *cvsTag = "$Name: not supported by cvs2svn $"; // CVS tag name
+#ifndef PSLIB_VERSION
+#error "PSLIB_VERSION is not set"
+#endif
+#ifndef PSLIB_BRANCH
+#error "PSLIB_BRANCH is not set"
+#endif
+#ifndef PSLIB_SOURCE
+#error "PSLIB_SOURCE is not set"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
 
 psString psLibVersion(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(PSLIB_BRANCH), xstr(PSLIB_VERSION));
+    return value;
+}
+
+psString psLibSource(void)
+{
+    return psStringCopy(xstr(PSLIB_SOURCE));
+}
+
+psString psLibDependencies(void)
+{
+    psString deps = NULL;               // Dependencies, to return
+    float cfitsioVersion;               // CFITSIO version number
+    psStringAppend(&deps, "cfitsio-%.3f gsl-%s %s",
+                   fits_get_version(&cfitsioVersion), gsl_version, fftwf_version);
+
+#ifdef HAVE_PSDB
+    psStringAppend(&deps, " mysql-%s", mysql_get_client_info());
+#endif
+
+    return deps;
 }
 
 psString psLibVersionLong(void)
 {
-    psString version = psLibVersion();    // Version, to return
-    psString tag = psStringStripCVS(cvsTag, "Name"); // CVS tag
+    psString version = psLibVersion();  // Version, to return
+    psString source = psLibSource();    // Source
+    psString deps = psLibDependencies();// Dependencies
 
-#ifdef HAVE_PSDB
-    psStringAppend(&version, " (cvs tag %s), %s, %s with psDB", tag, __DATE__, __TIME__);
+    psStringPrepend(&version, "psLib ");
+    psStringAppend(&version, " from %s, built %s, %s with %s",
+                   source, __DATE__, __TIME__, deps);
+    psFree(source);
+    psFree(deps);
+
+#ifdef __OPTIMIZE__
+    psStringAppend(&version, " optimised");
 #else
-    psStringAppend(&version, " (cvs tag %s), %s, %s without psDB", tag, __DATE__, __TIME__);
+    psStringAppend(&version, " unoptimised");
 #endif
-    psFree(tag);
+
+#ifdef PS_NO_TRACE
+    psStringAppend(&version, " without trace");
+#else
+    psStringAppend(&version, " with trace");
+#endif
+
     return version;
-}
+};
 
 // Check the memory; intended for use on exit, but might be used elsewhere

branches/cnb_branches/cnb_branch_20090301/psLib/src/sys/psConfigure.h

@@ -20 +20 @@
 #define PS_CONFIGURE_H
 
+#include <psString.h>
+
 /// @addtogroup SysUtils System Utilities
 /// @{
@@ -29 +31 @@
  *  @return psString: String with version name.
  */
-psString psLibVersion(
-    void
-);
+psString psLibVersion(void);
 
+/** Get current psLib source
+ *
+ * Returns the current psLib source name as a string.
+ *
+ * @return psString: String with source name.
+ */
+psString psLibSource(void);
+
+/** Get psLib dependencies' versions
+ *
+ * Returns the psLib dependency versions as a string.
+ *
+ * @return psString: String with dependencies.
+ */
+psString psLibDependencies(void);
 
 /** Get current psLib version (full identification)

branches/cnb_branches/cnb_branch_20090301/psLib/src/sys/psLogMsg.c

@@ -195 +195 @@
     }
 
-    int fileD = creat(dest, 0666);
+    int fileD = open(dest, O_WRONLY | O_CREAT, 0666);
     if (fileD == 0) {
         psError(PS_ERR_IO, true, _("Could not open file '%s' for output."), dest);
@@ -316 +316 @@
 
     if (write(logFD, head, strlen(head))) {;} // ignore return value
-    
+
     if (logMsg) {
         psString msg = NULL;            // Message to print

branches/cnb_branches/cnb_branch_20090301/psLib/src/sys/psMemory.c

@@ -1069 +1069 @@
                    memBlock->func, memBlock->file, memBlock->lineno, (unsigned long)memBlock->tid);
 }
+
+bool psMemTypeEqual (void *ptr1, void *ptr2) {
+
+    // if ptr is a psAlloc()'d memory, find the actual address of the memBlock
+    psMemBlock *memBlock1 = ((psMemBlock *)ptr1) - 1;
+    HANDLE_BAD_BLOCK(memBlock1, __FILE__, __LINE__, __func__);
+    if (!memBlock1->freeFunc) return false;
+
+    // if ptr is a psAlloc()'d memory, find the actual address of the memBlock
+    psMemBlock *memBlock2 = ((psMemBlock *)ptr2) - 1;
+    HANDLE_BAD_BLOCK(memBlock2, __FILE__, __LINE__, __func__);
+    if (!memBlock2->freeFunc) return false;
+
+    return (memBlock1->freeFunc == memBlock2->freeFunc);
+}

branches/cnb_branches/cnb_branch_20090301/psLib/src/sys/psMemory.h

@@ -636 +636 @@
 );
 
+/** test for matching types (equal free functions)
+ *
+ * This function returns true if the two pointers have matching, non-NULL free functions.
+ * Supplied pointers must have been allocated within the psLib memory system (ie, with a psAlloc) or the function will abort. (XXX just return false?)
+ * Supplied pointers must have been provided with free function or the function returns false.
+ */
+bool psMemTypeEqual (void *ptr1, ///< pointer to first psMemory object
+                     void *ptr2 ///< pointer to second psMemory object
+  );
+
 // Ensure this is a psLib pointer
 #define PS_ASSERT_PTR_HEAVY(PTR, RVAL) \