Changeset 19056
- Timestamp:
- Aug 13, 2008, 5:18:41 PM (18 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 1 added
- 10 edited
-
mathtypes/psImage.h (modified) (3 diffs)
-
mathtypes/psVector.h (modified) (3 diffs)
-
pslib_strict.h (modified) (2 diffs)
-
sys/Makefile.am (modified) (1 diff)
-
sys/psMutex.h (added)
-
types/psArray.h (modified) (3 diffs)
-
types/psBitSet.h (modified) (3 diffs)
-
types/psHash.h (modified) (3 diffs)
-
types/psList.h (modified) (3 diffs)
-
types/psMetadata.h (modified) (4 diffs)
-
types/psPixels.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/mathtypes/psImage.h
r15760 r19056 9 9 * @author Joshua Hoblitt, University of Hawaii 10 10 * 11 * @version $Revision: 1.9 6$ $Name: not supported by cvs2svn $12 * @date $Date: 200 7-12-07 19:33:19$11 * @version $Revision: 1.97 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2008-08-14 03:18:41 $ 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii 14 14 */ … … 24 24 #include "psArray.h" 25 25 #include "psConstants.h" 26 26 #include "psMutex.h" 27 27 28 28 /** Basic image data structure. … … 56 56 psPtr p_rawDataBuffer; ///< Raw data buffer for Allocating/Freeing Images; private 57 57 psArray* children; ///< Children of this region. 58 void *lock;///< Optional lock for thread safety58 psMutex lock; ///< Optional lock for thread safety 59 59 } 60 60 psImage; -
trunk/psLib/src/mathtypes/psVector.h
r18311 r19056 10 10 * @author Joshua Hoblitt, University of Hawaii 11 11 * 12 * @version $Revision: 1.7 1$ $Name: not supported by cvs2svn $13 * @date $Date: 2008-0 6-24 21:32:52$12 * @version $Revision: 1.72 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2008-08-14 03:18:41 $ 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii 15 15 */ … … 23 23 #include <stdio.h> 24 24 #include "psType.h" 25 #include "psMutex.h" 25 26 26 27 /** An vector to support primitive types. … … 46 47 psF64* F64; ///< Double-precision float data. 47 48 } data; 48 void *lock;///< Optional lock for thread safety.49 psMutex lock; ///< Optional lock for thread safety. 49 50 } 50 51 psVector; -
trunk/psLib/src/pslib_strict.h
r18958 r19056 9 9 * @author Eric Van Alst, MHPCC 10 10 * 11 * @version $Revision: 1.3 8$ $Name: not supported by cvs2svn $12 * @date $Date: 2008-08- 08 18:07:49$11 * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2008-08-14 03:18:41 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 74 74 #include "psMinimizePowell.h" 75 75 #include "psMinimizePolyFit.h" 76 #include "psMutex.h" 76 77 #include "psRandom.h" 77 78 #include "psRegionForImage.h" -
trunk/psLib/src/sys/Makefile.am
r18827 r19056 41 41 psLogMsg.h \ 42 42 psMemory.h \ 43 psMutex.h \ 43 44 psSlurp.h \ 44 45 psString.h \ -
trunk/psLib/src/types/psArray.h
r18954 r19056 10 10 * @author Joshua Hoblitt, University of Hawaii 11 11 * 12 * @version $Revision: 1.5 3$ $Name: not supported by cvs2svn $13 * @date $Date: 2008-08- 08 18:05:34$12 * @version $Revision: 1.54 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2008-08-14 03:18:41 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 22 22 #include "psCompare.h" 23 23 #include "psVector.h" 24 #include "psMutex.h" 24 25 25 26 /// @addtogroup DataContainer Data Containers … … 36 37 const long nalloc; ///< Total number of elements available. 37 38 psPtr* data; ///< An Array of pointer elements 38 void *lock;///< Optional lock for thread safety39 psMutex lock; ///< Optional lock for thread safety 39 40 } 40 41 psArray; -
trunk/psLib/src/types/psBitSet.h
r14452 r19056 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.3 1$ $Name: not supported by cvs2svn $14 * @date $Date: 200 7-08-09 01:40:08$13 * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2008-08-14 03:18:41 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 21 21 22 22 #include "psType.h" 23 #include "psMutex.h" 23 24 24 25 /// @addtogroup DataContainer Data Containers … … 39 40 long n; ///< Number of bytes in the array 40 41 psU8 *bits; ///< Aray of bytes holding bits 41 void *lock;///< Optional lock for thread safety42 psMutex lock; ///< Optional lock for thread safety 42 43 } 43 44 psBitSet; -
trunk/psLib/src/types/psHash.h
r14452 r19056 11 11 * @author GLG, MHPCC 12 12 * 13 * @version $Revision: 1.2 4$ $Name: not supported by cvs2svn $14 * @date $Date: 200 7-08-09 01:40:08$13 * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2008-08-14 03:18:41 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 24 24 25 25 #include "psList.h" 26 #include "psMutex.h" 26 27 27 28 /** A bucket that holds an item of data. */ … … 42 43 long n; ///< Number of buckets in hash table. 43 44 psHashBucket* *buckets; ///< The bucket data. 44 void *lock;///< Optional lock for thread safety.45 psMutex lock; ///< Optional lock for thread safety. 45 46 } 46 47 psHash; -
trunk/psLib/src/types/psList.h
r18955 r19056 5 5 * @author Robert Daniel DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.4 8$ $Name: not supported by cvs2svn $8 * @date $Date: 2008-08- 08 18:06:27$7 * @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2008-08-14 03:18:41 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 16 16 #include "psCompare.h" 17 17 #include "psArray.h" 18 #include "psMutex.h" 18 19 19 20 /// @addtogroup DataContainer Data Containers … … 54 55 ///< used internally to improve performance when using indexed access, all 55 56 ///< others are user-level iterators created by psListIteratorAlloc. 56 void *lock;///< Optional lock for thread safety57 psMutex lock; ///< Optional lock for thread safety 57 58 } psList; 58 59 -
trunk/psLib/src/types/psMetadata.h
r17515 r19056 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.10 4$ $Name: not supported by cvs2svn $12 * @date $Date: 2008-0 5-05 00:09:04$11 * @version $Revision: 1.105 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2008-08-14 03:18:41 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 29 29 #include "psTime.h" 30 30 #include "psLookupTable.h" 31 #include "psMutex.h" 31 32 32 33 #define PS_DATA_IS_PRIMITIVE(TYPE) \ … … 57 58 */ 58 59 typedef enum { 59 PS_META_DEFAULT = 0, ///< default behaviour (duplicate entry is an error)60 PS_META_REPLACE = 0x01000000, ///< allow entry to be replaced61 PS_META_NO_REPLACE = 0x02000000, ///< duplicate entry is silently skipped62 PS_META_DUPLICATE_OK = 0x04000000, ///< allow duplicate entries63 PS_META_UPDATE_FOLDER = 0x08000000, ///< for a metadata folder, merge contents with existing md64 PS_META_NULL = 0x10000000, ///< psMetadataItem.data is a NULL value65 PS_META_REQUIRE_ENTRY = 0x20000000, ///< require pre-existing entry with same name66 PS_META_REQUIRE_TYPE = 0x40000000 ///< require pre-existing entry to have same type60 PS_META_DEFAULT = 0, ///< default behaviour (duplicate entry is an error) 61 PS_META_REPLACE = 0x01000000, ///< allow entry to be replaced 62 PS_META_NO_REPLACE = 0x02000000, ///< duplicate entry is silently skipped 63 PS_META_DUPLICATE_OK = 0x04000000, ///< allow duplicate entries 64 PS_META_UPDATE_FOLDER = 0x08000000, ///< for a metadata folder, merge contents with existing md 65 PS_META_NULL = 0x10000000, ///< psMetadataItem.data is a NULL value 66 PS_META_REQUIRE_ENTRY = 0x20000000, ///< require pre-existing entry with same name 67 PS_META_REQUIRE_TYPE = 0x40000000 ///< require pre-existing entry to have same type 67 68 } psMetadataFlags; 68 69 … … 83 84 psList* list; ///< Metadata in linked-list 84 85 psHash* hash; ///< Metadata in a hash table 85 void *lock;///< Optional lock for thread safety86 psMutex lock; ///< Optional lock for thread safety 86 87 } 87 88 psMetadata; -
trunk/psLib/src/types/psPixels.h
r14452 r19056 6 6 * @author Robert DeSonia, MHPCC 7 7 * 8 * @version $Revision: 1.2 8$ $Name: not supported by cvs2svn $9 * @date $Date: 200 7-08-09 01:40:08$8 * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2008-08-14 03:18:41 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 45 45 const long nalloc; ///< Number allocated 46 46 psPixelCoord* data; ///< The pixel coordinates 47 void *lock;///< Option lock for thread safety47 psMutex lock; ///< Option lock for thread safety 48 48 } 49 49 psPixels;
Note:
See TracChangeset
for help on using the changeset viewer.
