Index: trunk/psLib/src/sysUtils/psAbort.h =================================================================== --- trunk/psLib/src/sysUtils/psAbort.h (revision 1420) +++ trunk/psLib/src/sysUtils/psAbort.h (revision 1426) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 22:44:25 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -37,6 +37,6 @@ * */ -void psAbort(const char *name, // /< Source of abort such as file or function detected - const char *fmt, // /< A printf style formatting statement defining msg +void psAbort(const char *name, ///< Source of abort such as file or function detected + const char *fmt, ///< A printf style formatting statement defining msg ... ); Index: trunk/psLib/src/sysUtils/psError.h =================================================================== --- trunk/psLib/src/sysUtils/psError.h (revision 1420) +++ trunk/psLib/src/sysUtils/psError.h (revision 1426) @@ -13,6 +13,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 22:44:25 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -35,6 +35,6 @@ * */ -void psError(const char *name, // /< Source of error such as file or function detected - const char *fmt, // /< A printf style formatting statement defining msg +void psError(const char *name, ///< Source of error such as file or function detected + const char *fmt, ///< A printf style formatting statement defining msg ... ); Index: trunk/psLib/src/sysUtils/psLogMsg.h =================================================================== --- trunk/psLib/src/sysUtils/psLogMsg.h (revision 1420) +++ trunk/psLib/src/sysUtils/psLogMsg.h (revision 1426) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 22:44:25 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -30,5 +30,5 @@ /// In future versions, this procedure will take a character string as an /// argument which can specify more general log destinations. -int psLogSetDestination(const char *dest // /< Specifies where to send messages. +int psLogSetDestination(const char *dest ///< Specifies where to send messages. ); @@ -38,5 +38,5 @@ /// Ie. higher values set by this procedure will cause more log messages to /// be displayed. -int psLogSetLevel(int level // /< Specifies the system log level +int psLogSetLevel(int level ///< Specifies the system log level ); @@ -46,5 +46,5 @@ /// Deleting a letter from the string will cause the associated information /// to not be logged. -void psLogSetFormat(const char *fmt // /< Specifies the system log format +void psLogSetFormat(const char *fmt ///< Specifies the system log format ); @@ -53,15 +53,15 @@ /// specified by a prior call to psLogSetLevel(). The message is specified /// with a printf-stype string an arguments. -void psLogMsg(const char *name, // /< name of the log source - int myLevel, // /< severity level of this log message - const char *fmt, ... // /< printf-style format command +void psLogMsg(const char *name, ///< name of the log source + int myLevel, ///< severity level of this log message + const char *fmt, ... ///< printf-style format command ); /// This procedure is functionally equivalent to psLogMsg(), except that /// it takes a va_list as the message parameter, not a printf-style string. -void psLogMsgV(const char *name, // /< name of the log source - int myLevel, // /< severity level of this log message - const char *fmt, // /< printf-style format command - va_list ap // /< varargs argument list +void psLogMsgV(const char *name, ///< name of the log source + int myLevel, ///< severity level of this log message + const char *fmt, ///< printf-style format command + va_list ap ///< varargs argument list ); Index: trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- trunk/psLib/src/sysUtils/psMemory.h (revision 1420) +++ trunk/psLib/src/sysUtils/psMemory.h (revision 1426) @@ -15,6 +15,6 @@ * @ingroup MemoryManagement * - * @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 22:44:25 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -63,15 +63,15 @@ typedef struct psMemBlock { - const void *startblock; // /< initialised to p_psMEMMAGIC - struct psMemBlock *previousBlock; // /< previous block in allocation list - struct psMemBlock *nextBlock; // /< next block allocation list - psFreeFcn freeFcn; // /< deallocator. If NULL, use generic deallocation. - size_t userMemorySize; // /< the size of the user-portion of the memory block - const psMemoryId id; // /< a unique ID for this allocation - const char *file; // /< set from __FILE__ in e.g. p_psAlloc - const int lineno; // /< set from __LINE__ in e.g. p_psAlloc - pthread_mutex_t refCounterMutex; // /< mutex to ensure exclusive access to reference counter - psReferenceCount refCounter; // /< how many times pointer is referenced - const void *endblock; // /< initialised to p_psMEMMAGIC + const void *startblock; ///< initialised to p_psMEMMAGIC + struct psMemBlock *previousBlock; ///< previous block in allocation list + struct psMemBlock *nextBlock; ///< next block allocation list + psFreeFcn freeFcn; ///< deallocator. If NULL, use generic deallocation. + size_t userMemorySize; ///< the size of the user-portion of the memory block + const psMemoryId id; ///< a unique ID for this allocation + const char *file; ///< set from __FILE__ in e.g. p_psAlloc + const int lineno; ///< set from __LINE__ in e.g. p_psAlloc + pthread_mutex_t refCounterMutex; ///< mutex to ensure exclusive access to reference counter + psReferenceCount refCounter; ///< how many times pointer is referenced + const void *endblock; ///< initialised to p_psMEMMAGIC } psMemBlock; @@ -82,5 +82,5 @@ * @ingroup memCallback */ -typedef psMemoryId(*psMemAllocateCallback) (const psMemBlock * ptr // /< the psMemBlock just allocated +typedef psMemoryId(*psMemAllocateCallback) (const psMemBlock * ptr ///< the psMemBlock just allocated ); @@ -90,5 +90,5 @@ * @ingroup memCallback */ -typedef psMemoryId(*psMemFreeCallback) (const psMemBlock * ptr // /< the psMemBlock being freed +typedef psMemoryId(*psMemFreeCallback) (const psMemBlock * ptr ///< the psMemBlock being freed ); @@ -100,8 +100,8 @@ * @ingroup memCallback */ -typedef void (*psMemProblemCallback) (const psMemBlock * ptr, // /< the pointer to the problematic memory +typedef void (*psMemProblemCallback) (const psMemBlock * ptr, ///< the pointer to the problematic memory // block. - const char *file, // /< the file in which the problem originated - int lineno // /< the line number in which the problem originated + const char *file, ///< the file in which the problem originated + int lineno ///< the line number in which the problem originated ); @@ -123,10 +123,11 @@ */ # ifdef DOXYGEN -void *psAlloc(size_t size // /< Size required +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 + + void *p_psAlloc(size_t size, ///< Size required + const char *file, ///< File of call + int lineno ///< Line number of call ); @@ -144,12 +145,13 @@ */ # ifdef DOXYGEN -void *psRealloc(void *ptr // /< Pointer to re-allocate - size_t size, // /< Size required +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 + + 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 ); @@ -164,10 +166,11 @@ */ # ifdef DOXYGEN -void psFree(void *ptr, // /< Pointer to free, if NULL, function returns immediately. +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 + + void p_psFree(void *ptr, ///< Pointer to free + const char *file, ///< File of call + int lineno ///< Line number of call ); @@ -191,7 +194,7 @@ * @ingroup memTracing */ -int psMemCheckLeaks(psMemoryId id0, // /< don't list blocks with id < id0 - psMemBlock *** arr, // /< pointer to array of pointers to leaked blocks, or NULL - FILE * fd // /< print list of leaks to fd (or NULL) +int psMemCheckLeaks(psMemoryId id0, ///< don't list blocks with id < id0 + psMemBlock *** arr, ///< pointer to array of pointers to leaked blocks, or NULL + FILE * fd ///< print list of leaks to fd (or NULL) ); @@ -201,5 +204,5 @@ * @ingroup memTracing */ -int psMemCheckCorruption(bool abort_on_error // /< Abort on detecting corruption? +int psMemCheckCorruption(bool abort_on_error ///< Abort on detecting corruption? ); @@ -208,5 +211,5 @@ * @ingroup memRefCount */ -psReferenceCount psMemGetRefCounter(void *vptr // /< Pointer to get refCounter for +psReferenceCount psMemGetRefCounter(void *vptr ///< Pointer to get refCounter for ); @@ -216,10 +219,11 @@ */ # ifdef DOXYGEN -void *psMemIncrRefCounter(void *vptr // /< Pointer to increment refCounter, and return +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 + + void *p_psMemIncrRefCounter(void *vptr, ///< Pointer to increment refCounter, and return + const char *file, ///< File of call + int lineno ///< Line number of call ); @@ -232,10 +236,11 @@ */ # ifdef DOXYGEN -void *psMemDecrRefCounter(void *vptr // /< Pointer to decrement refCounter, and return +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 + + void *p_psMemDecrRefCounter(void *vptr, ///< Pointer to decrement refCounter, and return + const char *file, ///< File of call + int lineno ///< Line number of call ); @@ -246,5 +251,5 @@ * @ingroup memCallback */ -psMemProblemCallback psMemProblemCallbackSet(psMemProblemCallback func // /< Function to run +psMemProblemCallback psMemProblemCallbackSet(psMemProblemCallback func ///< Function to run ); @@ -253,5 +258,5 @@ * @ingroup memCallback */ -psMemExhaustedCallback psMemExhaustedCallbackSet(psMemExhaustedCallback func // /< Function to run +psMemExhaustedCallback psMemExhaustedCallbackSet(psMemExhaustedCallback func ///< Function to run ); @@ -260,5 +265,5 @@ * @ingroup memCallback */ -psMemAllocateCallback psMemAllocateCallbackSet(psMemAllocateCallback func // /< Function to run +psMemAllocateCallback psMemAllocateCallbackSet(psMemAllocateCallback func ///< Function to run ); @@ -267,5 +272,5 @@ * @ingroup memCallback */ -psMemFreeCallback psMemFreeCallbackSet(psMemFreeCallback func // /< Function to run +psMemFreeCallback psMemFreeCallbackSet(psMemFreeCallback func ///< Function to run ); @@ -280,5 +285,5 @@ * @ingroup memCallback */ -psMemoryId psMemAllocateCallbackSetID(psMemoryId id // /< ID to set +psMemoryId psMemAllocateCallbackSetID(psMemoryId id ///< ID to set ); @@ -287,5 +292,5 @@ * @ingroup memCallback */ -psMemoryId psMemFreeCallbackSetID(psMemoryId id // /< ID to set +psMemoryId psMemFreeCallbackSetID(psMemoryId id ///< ID to set ); Index: trunk/psLib/src/sysUtils/psTrace.h =================================================================== --- trunk/psLib/src/sysUtils/psTrace.h (revision 1420) +++ trunk/psLib/src/sysUtils/psTrace.h (revision 1426) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 22:44:25 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -59,17 +59,17 @@ # ifndef DOXYGEN /// Send a trace message -void p_psTrace(const char *facil, // /< facilty of interest - int myLevel, // /< desired trace level - ...) // /< trace message arguments +void p_psTrace(const char *facil, ///< facilty of interest + int myLevel, ///< desired trace level + ...) ///< trace message arguments ; # endif /// Set trace level -int psTraceSetLevel(const char *facil, // /< facilty of interest - int level) // /< desired trace level +int psTraceSetLevel(const char *facil, ///< facilty of interest + int level) ///< desired trace level ; /// Get the trace level -int psTraceGetLevel(const char *facil) // /< facilty of interest +int psTraceGetLevel(const char *facil) ///< facilty of interest ; Index: trunk/psLib/src/sysUtils/psType.h =================================================================== --- trunk/psLib/src/sysUtils/psType.h (revision 1420) +++ trunk/psLib/src/sysUtils/psType.h (revision 1426) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 22:44:25 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -40,40 +40,40 @@ */ -typedef uint8_t psU8; // /< 8-bit unsigned int -typedef uint16_t psU16; // /< 16-bit unsigned int -typedef uint32_t psU32; // /< 32-bit unsigned int -typedef uint64_t psU64; // /< 64-bit unsigned int -typedef int8_t psS8; // /< 8-bit signed int -typedef int16_t psS16; // /< 16-bit signed int -typedef int32_t psS32; // /< 32-bit signed int -typedef int64_t psS64; // /< 64-bit signed int -typedef float psF32; // /< 32-bit floating point -typedef double psF64; // /< 64-bit floating point -typedef complex float psC32; // /< complex with 32-bit floating point Real and Imagary numbers -typedef complex double psC64; // /< complex with 64-bit floating point Real and Imagary numbers -typedef void *psPTR; // /< void pointer +typedef uint8_t psU8; ///< 8-bit unsigned int +typedef uint16_t psU16; ///< 16-bit unsigned int +typedef uint32_t psU32; ///< 32-bit unsigned int +typedef uint64_t psU64; ///< 64-bit unsigned int +typedef int8_t psS8; ///< 8-bit signed int +typedef int16_t psS16; ///< 16-bit signed int +typedef int32_t psS32; ///< 32-bit signed int +typedef int64_t psS64; ///< 64-bit signed int +typedef float psF32; ///< 32-bit floating point +typedef double psF64; ///< 64-bit floating point +typedef complex float psC32; ///< complex with 32-bit floating point Real and Imagary numbers +typedef complex double psC64; ///< complex with 64-bit floating point Real and Imagary numbers +typedef void *psPTR; ///< void pointer typedef enum { - PS_TYPE_S8 = 0x0101, // /< Character. - PS_TYPE_S16 = 0x0102, // /< Short integer. - PS_TYPE_S32 = 0x0104, // /< Integer. - PS_TYPE_S64 = 0x0108, // /< Long integer. - PS_TYPE_U8 = 0x0301, // /< Unsigned character. - PS_TYPE_U16 = 0x0302, // /< Unsigned short integer. - PS_TYPE_U32 = 0x0304, // /< Unsigned integer. - PS_TYPE_U64 = 0x0308, // /< Unsigned long integer. - PS_TYPE_F32 = 0x0404, // /< Single-precision Floating point. - PS_TYPE_F64 = 0x0408, // /< Double-precision floating point. - PS_TYPE_C32 = 0x0808, // /< Complex numbers consisting of single-precision floating + PS_TYPE_S8 = 0x0101, ///< Character. + PS_TYPE_S16 = 0x0102, ///< Short integer. + PS_TYPE_S32 = 0x0104, ///< Integer. + PS_TYPE_S64 = 0x0108, ///< Long integer. + PS_TYPE_U8 = 0x0301, ///< Unsigned character. + PS_TYPE_U16 = 0x0302, ///< Unsigned short integer. + PS_TYPE_U32 = 0x0304, ///< Unsigned integer. + PS_TYPE_U64 = 0x0308, ///< Unsigned long integer. + PS_TYPE_F32 = 0x0404, ///< Single-precision Floating point. + PS_TYPE_F64 = 0x0408, ///< Double-precision floating point. + PS_TYPE_C32 = 0x0808, ///< Complex numbers consisting of single-precision floating // point. - PS_TYPE_C64 = 0x0810, // /< Complex numbers consisting of double-precision floating + PS_TYPE_C64 = 0x0810, ///< Complex numbers consisting of double-precision floating // point. - PS_TYPE_PTR = 0x0000 // /< Something else that's not supported for arithmetic. + PS_TYPE_PTR = 0x0000 ///< Something else that's not supported for arithmetic. } 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 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 +typedef psU8 psMaskType; ///< the C datatype for a mask image # define PS_MIN_S8 INT8_MIN @@ -132,9 +132,9 @@ */ typedef enum { - PS_DIMEN_SCALAR, // /< Scalar. - PS_DIMEN_VECTOR, // /< Vector. - PS_DIMEN_TRANSV, // /< Transposed vector. - PS_DIMEN_IMAGE, // /< Image. - PS_DIMEN_OTHER // /< Something else that's not supported for arithmetic. + PS_DIMEN_SCALAR, ///< Scalar. + PS_DIMEN_VECTOR, ///< Vector. + PS_DIMEN_TRANSV, ///< Transposed vector. + PS_DIMEN_IMAGE, ///< Image. + PS_DIMEN_OTHER ///< Something else that's not supported for arithmetic. } psDimen; @@ -147,6 +147,6 @@ typedef struct { - psElemType type; // /< Primitive type. - psDimen dimen; // /< Dimensionality. + psElemType type; ///< Primitive type. + psDimen dimen; ///< Dimensionality. } psType;