Changeset 19056 for trunk/psLib/src/mathtypes

Timestamp:

Aug 13, 2008, 5:18:41 PM (18 years ago)

Author:

Paul Price

Message:

Adding psMutex type (just pthread_mutex_t) to avoid problems associated with plugging mutex under void* in various types. Updated the types that have a dangling 'lock' to use this type.

Location:

trunk/psLib/src/mathtypes

Files:

• psImage.h (modified) (3 diffs)
• psVector.h (modified) (3 diffs)

trunk/psLib/src/mathtypes/psImage.h

@@ -9 +9 @@
  * @author Joshua Hoblitt, University of Hawaii
  *
- * @version $Revision: 1.96 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-12-07 19:33:19 $
+ * @version $Revision: 1.97 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-08-14 03:18:41 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -24 +24 @@
 #include "psArray.h"
 #include "psConstants.h"
-
+#include "psMutex.h"
 
 /** Basic image data structure.
@@ -56 +56 @@
     psPtr p_rawDataBuffer;             ///< Raw data buffer for Allocating/Freeing Images; private
     psArray* children;                 ///< Children of this region.
-    void *lock;                        ///< Optional lock for thread safety
+    psMutex lock;                       ///< Optional lock for thread safety
 }
 psImage;

trunk/psLib/src/mathtypes/psVector.h

@@ -10 +10 @@
  * @author Joshua Hoblitt, University of Hawaii
  *
- * @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-06-24 21:32:52 $
+ * @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-08-14 03:18:41 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -23 +23 @@
 #include <stdio.h>
 #include "psType.h"
+#include "psMutex.h"
 
 /** An vector to support primitive types.
@@ -46 +47 @@
         psF64* F64;                    ///< Double-precision float data.
     } data;
-    void *lock;                        ///< Optional lock for thread safety.
+    psMutex lock;                       ///< Optional lock for thread safety.
 }
 psVector;