Changeset 4898 for trunk/psLib/src/mathtypes

Timestamp:

Aug 29, 2005, 3:14:13 PM (21 years ago)

Author:

drobbin

Message:

Implemented psMemCheckType functions and tests. Some testing remains unfinished.

Location:

trunk/psLib/src/mathtypes

Files:

• psImage.c (modified) (2 diffs)
• psImage.h (modified) (2 diffs)
• psScalar.c (modified) (4 diffs)
• psScalar.h (modified) (2 diffs)
• psVector.c (modified) (2 diffs)
• psVector.h (modified) (3 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-26 23:01:17 $
+ *  @version $Revision: 1.78 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-30 01:14:13 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -90 +90 @@
     return image;
 }
+
+
+bool psMemCheckImage(psPtr ptr)
+{
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc)imageFree );
+}
+
 
 psRegion psRegionSet(float x0,

trunk/psLib/src/mathtypes/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-26 03:35:02 $
+ *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-30 01:14:13 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -111 +111 @@
 ;
 
+
+/** Checks the type of a particular pointer.
+ *
+ *  Uses the appropriate deallocation function in psMemBlock to check the ptr datatype.
+ *
+ *  @return bool:       True if the pointer matches a psImage structure, false otherwise.
+ */
+bool psMemCheckImage(
+    psPtr ptr                          ///< the pointer whose type to check
+);
+
+
 /** Create a psRegion with the specified attributes.
  *

trunk/psLib/src/mathtypes/psScalar.c

@@ -8 +8 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:12:01 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-30 01:14:13 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 #include "psErrorText.h"
 
+static void scalarFree(psScalar *scalar)
+{
+    // There are non dynamic allocated items
+}
+
 psScalar* psScalarAlloc(complex value, psElemType type)
 {
@@ -28 +33 @@
     // Create scalar
     scalar = (psScalar* ) psAlloc(sizeof(psScalar));
-
+    psMemSetDeallocator(scalar, (psFreeFunc)scalarFree);
     scalar->type.dimen = PS_DIMEN_SCALAR;
     scalar->type.type = type;
@@ -79 +84 @@
     return scalar;
 }
+
+
+bool psMemCheckScalar(psPtr ptr)
+{
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc)scalarFree );
+}
+
 
 psScalar* psScalarCopy(const psScalar *value)

trunk/psLib/src/mathtypes/psScalar.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:12:01 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-30 01:14:13 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -70 +70 @@
 );
 
+
+/** Checks the type of a particular pointer.
+ *
+ *  Uses the appropriate deallocation function in psMemBlock to check the ptr datatype.
+ *
+ *  @return bool:       True if the pointer matches a psScalar structure, false otherwise.
+ */
+bool psMemCheckScalar(
+    psPtr ptr                          ///< the pointer whose type to check
+);
+
+
 /** Copy a scalar.
  *

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-08-26 23:01:17 $
+*  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-08-30 01:14:13 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -60 +60 @@
 
 // FUNCTION IMPLEMENTATION - PUBLIC
+bool psMemCheckVector(psPtr ptr)
+{
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc)vectorFree );
+}
+
 
 psVector* psVectorAlloc(long nalloc,

trunk/psLib/src/mathtypes/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-26 23:01:17 $
+ *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-30 01:14:13 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -61 +61 @@
 /*****************************************************************************/
 
+/** Checks the type of a particular pointer.
+ *
+ *  Uses the appropriate deallocation function in psMemBlock to check the ptr datatype.
+ *
+ *  @return bool:       True if the pointer matches a psVector structure, false otherwise.
+ */
+bool psMemCheckVector(
+    psPtr ptr                          ///< the pointer whose type to check
+)
+;
 
 /** Allocate a vector.
@@ -72 +82 @@
     long nalloc,                       ///< Total number of elements to make available.
     psElemType type                    ///< Type of data to be held by vector.
-)
-;
+);
 
 /** Reallocate a vector.