Index: trunk/psLib/src/sysUtils/psAbort.h =================================================================== --- trunk/psLib/src/sysUtils/psAbort.h (revision 1440) +++ trunk/psLib/src/sysUtils/psAbort.h (revision 1441) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:40:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,5 +19,5 @@ #ifndef PS_ABORT_H -# define PS_ABORT_H +#define PS_ABORT_H // Doxygen grouping tags Index: trunk/psLib/src/sysUtils/psError.h =================================================================== --- trunk/psLib/src/sysUtils/psError.h (revision 1440) +++ trunk/psLib/src/sysUtils/psError.h (revision 1441) @@ -13,6 +13,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:40:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,5 +20,5 @@ #ifndef PS_ERROR_H -# define PS_ERROR_H +#define PS_ERROR_H /** @addtogroup ErrorHandling Index: trunk/psLib/src/sysUtils/psLogMsg.c =================================================================== --- trunk/psLib/src/sysUtils/psLogMsg.c (revision 1440) +++ trunk/psLib/src/sysUtils/psLogMsg.c (revision 1441) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:40:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -216,5 +216,5 @@ #if !defined(HOST_NAME_MAX) // should be in limits.h -# define HOST_NAME_MAX 256 +#define HOST_NAME_MAX 256 #endif Index: trunk/psLib/src/sysUtils/psLogMsg.h =================================================================== --- trunk/psLib/src/sysUtils/psLogMsg.h (revision 1440) +++ trunk/psLib/src/sysUtils/psLogMsg.h (revision 1441) @@ -12,12 +12,12 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:40:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ #if !defined(PS_LOG_MSG_H) -# define PS_LOG_MSG_H -# include +#define PS_LOG_MSG_H +#include /** @addtogroup LogTrace Index: trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- trunk/psLib/src/sysUtils/psMemory.h (revision 1440) +++ trunk/psLib/src/sysUtils/psMemory.h (revision 1441) @@ -1,4 +1,4 @@ #if !defined(PS_MEMORY_H) -# define PS_MEMORY_H +#define PS_MEMORY_H /** @file psMemory.h @@ -15,13 +15,13 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 23:34:58 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:40:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ -# include // needed for FILE -# include -# include // we need a mutex to make this stuff thread safe. +#include // needed for FILE +#include +#include // we need a mutex to make this stuff thread safe. /** @addtogroup MemoryManagement @@ -122,13 +122,13 @@ * @see psFree */ -# ifdef DOXYGEN +#ifdef DOXYGEN void *psAlloc(size_t size ///< Size required ); -# else - - void *p_psAlloc(size_t size, ///< Size required - const char *file, ///< File of call - int lineno ///< Line number of call - ); +#else + +void *p_psAlloc(size_t size, ///< Size required + const char *file, ///< File of call + int lineno ///< Line number of call + ); void p_psMemSetDeallocator(void *ptr, psFreeFcn freeFcn); @@ -136,6 +136,6 @@ /// Memory allocation. psAlloc sends file and line number to p_psAlloc. -# define psAlloc(size) p_psAlloc(size, __FILE__, __LINE__) -# endif +#define psAlloc(size) p_psAlloc(size, __FILE__, __LINE__) +#endif /** Memory re-allocation. This operates much like realloc(), but is guaranteed to return a non-NULL value. @@ -144,20 +144,20 @@ * @see psAlloc, psFree */ -# ifdef DOXYGEN +#ifdef DOXYGEN void *psRealloc(void *ptr ///< Pointer to re-allocate size_t size, ///< Size required ); -# else - - void *p_psRealloc(void *ptr, ///< Pointer to re-allocate - size_t size, ///< Size required - const char *file, ///< File of call - int lineno ///< Line number of call - ); +#else + +void *p_psRealloc(void *ptr, ///< Pointer to re-allocate + size_t size, ///< Size required + const char *file, ///< File of call + int lineno ///< Line number of call + ); /// Memory re-allocation. psRealloc sends file and line number to p_psRealloc. -# define psRealloc(ptr, size) p_psRealloc(ptr, size, __FILE__, __LINE__) - -# endif +#define psRealloc(ptr, size) p_psRealloc(ptr, size, __FILE__, __LINE__) + +#endif /** Free memory. This operates much like free(). @@ -165,18 +165,18 @@ * @see psAlloc, psRealloc */ -# ifdef DOXYGEN +#ifdef DOXYGEN void psFree(void *ptr, ///< Pointer to free, if NULL, function returns immediately. ); -# else - - void p_psFree(void *ptr, ///< Pointer to free - const char *file, ///< File of call - int lineno ///< Line number of call - ); +#else + +void p_psFree(void *ptr, ///< Pointer to free + const char *file, ///< File of call + int lineno ///< Line number of call + ); /// Free memory. psFree sends file and line number to p_psFree. -# define psFree(size) p_psFree(size, __FILE__, __LINE__) - -# endif +#define psFree(size) p_psFree(size, __FILE__, __LINE__) + +#endif /** Check for memory leaks. This scans for allocated memory buffers not freed with an ID not less than id0. @@ -218,16 +218,16 @@ * @ingroup memRefCount */ -# ifdef DOXYGEN +#ifdef DOXYGEN void *psMemIncrRefCounter(void *vptr ///< Pointer to increment refCounter, and return ); -# else - - void *p_psMemIncrRefCounter(void *vptr, ///< Pointer to increment refCounter, and return - const char *file, ///< File of call - int lineno ///< Line number of call - ); - -# define psMemIncrRefCounter(vptr) p_psMemIncrRefCounter(vptr, __FILE__, __LINE__) -# endif +#else + +void *p_psMemIncrRefCounter(void *vptr, ///< Pointer to increment refCounter, and return + const char *file, ///< File of call + int lineno ///< Line number of call + ); + +#define psMemIncrRefCounter(vptr) p_psMemIncrRefCounter(vptr, __FILE__, __LINE__) +#endif /** Decrement reference counter and return the pointer @@ -235,16 +235,16 @@ * @ingroup memRefCount */ -# ifdef DOXYGEN +#ifdef DOXYGEN void *psMemDecrRefCounter(void *vptr ///< Pointer to decrement refCounter, and return ); -# else - - void *p_psMemDecrRefCounter(void *vptr, ///< Pointer to decrement refCounter, and return - const char *file, ///< File of call - int lineno ///< Line number of call - ); - -# define psMemDecrRefCounter(vptr) p_psMemDecrRefCounter(vptr, __FILE__, __LINE__) -# endif +#else + +void *p_psMemDecrRefCounter(void *vptr, ///< Pointer to decrement refCounter, and return + const char *file, ///< File of call + int lineno ///< Line number of call + ); + +#define psMemDecrRefCounter(vptr) p_psMemDecrRefCounter(vptr, __FILE__, __LINE__) +#endif /** Set callback for problems @@ -297,22 +297,22 @@ //@} End of Memory Management Functions -# ifndef DOXYGEN +#ifndef DOXYGEN /* * Ensure that any program using malloc/realloc/free will fail to compile */ -# ifndef PS_ALLOW_MALLOC -# ifdef __GNUC__ -# pragma GCC poison malloc realloc calloc free -# else - # define malloc(S) _Pragma("error Use of malloc is not allowed. Use psAlloc instead.") - # define realloc(P,S) _Pragma("error Use of realloc is not allowed. Use psRealloc instead.") - # define calloc(S) _Pragma("error Use of calloc is not allowed. Use psAlloc instead.") - # define free(P) _Pragma("error Use of free is not allowed. Use psFree instead.") - # endif - # endif - - # endif - // doxygen skip - - #endif // end of header file +#ifndef PS_ALLOW_MALLOC +#ifdef __GNUC__ +#pragma GCC poison malloc realloc calloc free +#else +# define malloc(S) _Pragma("error Use of malloc is not allowed. Use psAlloc instead.") +# define realloc(P,S) _Pragma("error Use of realloc is not allowed. Use psRealloc instead.") +# define calloc(S) _Pragma("error Use of calloc is not allowed. Use psAlloc instead.") +# define free(P) _Pragma("error Use of free is not allowed. Use psFree instead.") +# endif +# endif + +# endif +// doxygen skip + +#endif // end of header file Index: trunk/psLib/src/sysUtils/psString.h =================================================================== --- trunk/psLib/src/sysUtils/psString.h (revision 1440) +++ trunk/psLib/src/sysUtils/psString.h (revision 1441) @@ -11,6 +11,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:40:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -18,5 +18,5 @@ #ifndef PS_STRING_H -# define PS_STRING_H +#define PS_STRING_H /******************************************************************************/ @@ -27,5 +27,5 @@ /** This macro will convert the arguement to a quoted string */ -# define PS_STRING(S) #S +#define PS_STRING(S) #S /******************************************************************************/ Index: trunk/psLib/src/sysUtils/psTrace.c =================================================================== --- trunk/psLib/src/sysUtils/psTrace.c (revision 1440) +++ trunk/psLib/src/sysUtils/psTrace.c (revision 1441) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 23:34:58 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:40:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -36,12 +36,12 @@ #ifndef PS_NO_TRACE -# include -# include -# include -# include -# include "psMemory.h" -# include "psTrace.h" -# include "psString.h" -# include "psError.h" +#include +#include +#include +#include +#include "psMemory.h" +#include "psTrace.h" +#include "psString.h" +#include "psError.h" static p_psComponent* p_psCroot = NULL; // The root of the trace component Index: trunk/psLib/src/sysUtils/psTrace.h =================================================================== --- trunk/psLib/src/sysUtils/psTrace.h (revision 1440) +++ trunk/psLib/src/sysUtils/psTrace.h (revision 1441) @@ -10,14 +10,14 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 23:34:58 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:40:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ #if !defined(PS_TRACE_H) -# define PS_TRACE_H 1 +#define PS_TRACE_H 1 -# define PS_UNKNOWN_TRACE_LEVEL -9999 // we don't know this name's level -# define PS_DEFAULT_TRACE_LEVEL 0 +#define PS_UNKNOWN_TRACE_LEVEL -9999 // we don't know this name's level +#define PS_DEFAULT_TRACE_LEVEL 0 /** \addtogroup LogTrace @@ -29,33 +29,33 @@ //#define PS_NO_TRACE 1 ///< to turn off all tracing -# if defined(PS_NO_TRACE) - # define psTrace(facil, level, ...) (void)0 - /* do nothing */ - # define p_psTrace(facil, level, ...) (void)0 - /* do nothing */ - # define psTraceSetLevel(facil,level) 0 - # define psTraceGetLevel(facil) 0 - # define psTraceReset() (void)0 /* do nothing */ - # define psTraceFree() (void)0 /* do nothing */ - # define psTracePrintLevels() (void)0 - /* do nothing */ - # define psTraceSetDestination(fp) (void)0 - /* do nothing */ - # else +#if defined(PS_NO_TRACE) +# define psTrace(facil, level, ...) (void)0 +/* do nothing */ +# define p_psTrace(facil, level, ...) (void)0 +/* do nothing */ +# define psTraceSetLevel(facil,level) 0 +# define psTraceGetLevel(facil) 0 +# define psTraceReset() (void)0 /* do nothing */ +# define psTraceFree() (void)0 /* do nothing */ +# define psTracePrintLevels() (void)0 +/* do nothing */ +# define psTraceSetDestination(fp) (void)0 +/* do nothing */ +# else - /** Basic structure for the component tree. A component is a string of the - form aaa.bbb.ccc, and may itself contain further subcomponents. The - Component structure doesn't in fact contain it's full name, but only the - last part. */ - typedef struct p_psComponent - { - const char *name; // last part of name of component - int level; // trace level for this component - int n; // number of subcomponents - struct p_psComponent* *subcomp; // next level of subcomponents - } + /** Basic structure for the component tree. A component is a string of the + form aaa.bbb.ccc, and may itself contain further subcomponents. The + Component structure doesn't in fact contain it's full name, but only the + last part. */ + typedef struct p_psComponent + { + const char *name; // last part of name of component + int level; // trace level for this component + int n; // number of subcomponents + struct p_psComponent* *subcomp; // next level of subcomponents + } p_psComponent; -# ifndef DOXYGEN +#ifndef DOXYGEN /// Send a trace message void p_psTrace(const char *facil, ///< facilty of interest @@ -63,5 +63,5 @@ ...) ///< trace message arguments ; -# endif +#endif /// Set trace level @@ -88,6 +88,6 @@ /* \} */// End of SystemGroup Functions -# define psTrace(facil, level, ...) p_psTrace(facil, level, __VA_ARGS__) -# endif +#define psTrace(facil, level, ...) p_psTrace(facil, level, __VA_ARGS__) +#endif #endif Index: trunk/psLib/src/sysUtils/psType.h =================================================================== --- trunk/psLib/src/sysUtils/psType.h (revision 1440) +++ trunk/psLib/src/sysUtils/psType.h (revision 1441) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:40:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -18,9 +18,9 @@ #ifndef PS_TYPE_H -# define PS_TYPE_H +#define PS_TYPE_H -# include -# include -# include +#include +#include +#include /// @addtogroup DataContainer @@ -72,43 +72,43 @@ } psElemType; -# define PS_TYPE_MASK PS_TYPE_U8 ///< the psElemType to use for mask image -# define PS_TYPE_MASK_DATA U8 ///< the data member to use for mask image -# define PS_TYPE_MASK_NAME "psU8" +#define PS_TYPE_MASK PS_TYPE_U8 ///< the psElemType to use for mask image +#define PS_TYPE_MASK_DATA U8 ///< the data member to use for mask image +#define PS_TYPE_MASK_NAME "psU8" typedef psU8 psMaskType; ///< the C datatype for a mask image -# define PS_MIN_S8 INT8_MIN -# define PS_MIN_S16 INT16_MIN -# define PS_MIN_S32 INT32_MIN -# define PS_MIN_S64 INT64_MIN -# define PS_MIN_U8 0 -# define PS_MIN_U16 0 -# define PS_MIN_U32 0 -# define PS_MIN_U64 0 -# define PS_MIN_F32 -FLT_MAX -# define PS_MIN_F64 -DBL_MAX -# define PS_MIN_C32 -FLT_MAX -# define PS_MIN_C64 -DBL_MAX +#define PS_MIN_S8 INT8_MIN +#define PS_MIN_S16 INT16_MIN +#define PS_MIN_S32 INT32_MIN +#define PS_MIN_S64 INT64_MIN +#define PS_MIN_U8 0 +#define PS_MIN_U16 0 +#define PS_MIN_U32 0 +#define PS_MIN_U64 0 +#define PS_MIN_F32 -FLT_MAX +#define PS_MIN_F64 -DBL_MAX +#define PS_MIN_C32 -FLT_MAX +#define PS_MIN_C64 -DBL_MAX -# define PS_MAX_S8 INT8_MAX -# define PS_MAX_S16 INT16_MAX -# define PS_MAX_S32 INT32_MAX -# define PS_MAX_S64 INT64_MAX -# define PS_MAX_U8 UINT8_MAX -# define PS_MAX_U16 UINT16_MAX -# define PS_MAX_U32 UINT32_MAX -# define PS_MAX_U64 UINT64_MAX -# define PS_MAX_F32 FLT_MAX -# define PS_MAX_F64 DBL_MAX -# define PS_MAX_C32 FLT_MAX -# define PS_MAX_C64 DBL_MAX +#define PS_MAX_S8 INT8_MAX +#define PS_MAX_S16 INT16_MAX +#define PS_MAX_S32 INT32_MAX +#define PS_MAX_S64 INT64_MAX +#define PS_MAX_U8 UINT8_MAX +#define PS_MAX_U16 UINT16_MAX +#define PS_MAX_U32 UINT32_MAX +#define PS_MAX_U64 UINT64_MAX +#define PS_MAX_F32 FLT_MAX +#define PS_MAX_F64 DBL_MAX +#define PS_MAX_C32 FLT_MAX +#define PS_MAX_C64 DBL_MAX /// Macro to get the bad pixel reason code (stored as part of mask value) -# define PS_BADPIXEL_BITMASK 0x0f -# define PS_GET_BADPIXEL(maskValue) (maskValue & PS_BADPIXEL_BITMASK) +#define PS_BADPIXEL_BITMASK 0x0f +#define PS_GET_BADPIXEL(maskValue) (maskValue & PS_BADPIXEL_BITMASK) -# define PS_IS_BADPIXEL(maskValue) (PS_GET_BADPIXEL(maskValue) != 0) +#define PS_IS_BADPIXEL(maskValue) (PS_GET_BADPIXEL(maskValue) != 0) /// Macro to apply a bad pixel reason code to mask image -# define PS_SET_BADPIXEL(maskValue, reasonCode) \ +#define PS_SET_BADPIXEL(maskValue, reasonCode) \ { \ maskValue = (psMaskType)((reasonCode & PS_BADPIXEL_BITMASK) | (maskValue & ~PS_BADPIXEL_BITMASK)); \ @@ -116,13 +116,13 @@ /// Macro to determine if the psElemType is an integer. -# define PS_IS_PSELEMTYPE_INT(x) ((x & 0x100) == 0x100) +#define PS_IS_PSELEMTYPE_INT(x) ((x & 0x100) == 0x100) /// Macro to determine if the psElemType is unsigned. -# define PS_IS_PSELEMTYPE_UNSIGNED(x) ((x & 0x200) == 0x200) +#define PS_IS_PSELEMTYPE_UNSIGNED(x) ((x & 0x200) == 0x200) /// Macro to determine if the psElemType is a real (non-complex) floating-point type. -# define PS_IS_PSELEMTYPE_REAL(x) ((x & 0x400) == 0x400) +#define PS_IS_PSELEMTYPE_REAL(x) ((x & 0x400) == 0x400) /// Macro to determine if the psElemType is complex number type. -# define PS_IS_PSELEMTYPE_COMPLEX(x) ((x & 0x800) == 0x800) +#define PS_IS_PSELEMTYPE_COMPLEX(x) ((x & 0x800) == 0x800) /// Macro to determine the storage size, in bytes, of the psElemType. -# define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(void*) :(x & 0xFF) ) +#define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(void*) :(x & 0xFF) ) /** Dimensions of a data type.