Index: /trunk/psLib/pslib.kdevelop
===================================================================
--- /trunk/psLib/pslib.kdevelop (revision 5215)
+++ /trunk/psLib/pslib.kdevelop (revision 5216)
@@ -14,5 +14,5 @@
.
false
-
+
@@ -49,4 +49,9 @@
+ false
+ 3
+ false
+
+ 0
@@ -169,10 +174,10 @@
-
-
+
+
libtool
-
-
-
+
+
+
true
false
Index: /trunk/psLib/src/Makefile.am
===================================================================
--- /trunk/psLib/src/Makefile.am (revision 5215)
+++ /trunk/psLib/src/Makefile.am (revision 5216)
@@ -5,4 +5,5 @@
libpslib_la_CPPFLAGS = $(SRCINC)
libpslib_la_LIBADD = $(SRCSUBLIBS)
+libpslib_la_DEPENDENCIES = $(SRCSUBLIBS)
libpslib_la_SOURCES = psTest.c
Index: /trunk/psLib/src/db/psDB.c
===================================================================
--- /trunk/psLib/src/db/psDB.c (revision 5215)
+++ /trunk/psLib/src/db/psDB.c (revision 5216)
@@ -12,6 +12,6 @@
* @author Joshua Hoblitt
*
- * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-09-26 21:13:16 $
+ * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-10-01 02:22:09 $
*
* Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -43,4 +43,9 @@
}
mysqlType;
+
+static psHash *pTypeToSQLlookupTable = NULL;
+static psHash *sqlToPTypeLookupTable = NULL;
+static psHash *mysqlToSqlLookupTable = NULL;
+static psHash *pTypeToMysqlLookupTable = NULL;
// database utility functions
@@ -1421,45 +1426,39 @@
static psHash *psDBGetPTypeToSQLTable(void)
{
- static psHash *lookupTable = NULL;
-
- if (!lookupTable) {
- lookupTable = psHashAlloc(14);
+
+ if (!pTypeToSQLlookupTable) {
+ pTypeToSQLlookupTable = psHashAlloc(14);
// no support for CHAR, TEXT or GLOB
- psDBAddToLookupTable(lookupTable, PS_TYPE_S8, "TINYINT");
- psDBAddToLookupTable(lookupTable, PS_TYPE_S16, "SMALLINT");
- psDBAddToLookupTable(lookupTable, PS_TYPE_S32, "INT");
- psDBAddToLookupTable(lookupTable, PS_TYPE_S64, "BIGINT");
- psDBAddToLookupTable(lookupTable, PS_TYPE_U8, "UNSIGNED TINYINT");
- psDBAddToLookupTable(lookupTable, PS_TYPE_U16, "UNSIGNED SMALLINT");
- psDBAddToLookupTable(lookupTable, PS_TYPE_U32, "UNSIGNED INT");
- psDBAddToLookupTable(lookupTable, PS_TYPE_U64, "UNSIGNED BIGINT");
- psDBAddToLookupTable(lookupTable, PS_TYPE_F32, "FLOAT");
- psDBAddToLookupTable(lookupTable, PS_TYPE_F64, "DOUBLE");
- psDBAddToLookupTable(lookupTable, PS_TYPE_C32, "PS_TYPE_C32 is not supported");
- psDBAddToLookupTable(lookupTable, PS_TYPE_C64, "PS_TYPE_C64 is not supported");
- psDBAddToLookupTable(lookupTable, PS_TYPE_BOOL,"TINYINT");
- psDBAddToLookupTable(lookupTable, PS_DATA_STRING, "VARCHAR");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_S8, "TINYINT");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_S16, "SMALLINT");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_S32, "INT");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_S64, "BIGINT");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_U8, "UNSIGNED TINYINT");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_U16, "UNSIGNED SMALLINT");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_U32, "UNSIGNED INT");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_U64, "UNSIGNED BIGINT");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_F32, "FLOAT");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_F64, "DOUBLE");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_C32, "PS_TYPE_C32 is not supported");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_C64, "PS_TYPE_C64 is not supported");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_TYPE_BOOL,"TINYINT");
+ psDBAddToLookupTable(pTypeToSQLlookupTable, PS_DATA_STRING, "VARCHAR");
}
// simulate true ref counting
- psMemIncrRefCounter(lookupTable);
-
- return lookupTable;
+ psMemIncrRefCounter(pTypeToSQLlookupTable);
+
+ return pTypeToSQLlookupTable;
}
static void psDBPTypeToSQLTableCleanup(void)
{
- psHash *lookupTable;
-
- lookupTable = psDBGetPTypeToSQLTable();
-
- psMemDecrRefCounter(lookupTable);
- psFree(lookupTable);
+ psFree(pTypeToSQLlookupTable);
+ pTypeToSQLlookupTable = NULL;
}
static psHash *psDBGetSQLToPTypeTable(void)
{
- static psHash *lookupTable = NULL;
psHash *psToSQLTable;
psList *list;
@@ -1468,8 +1467,8 @@
char *value;
- if (!lookupTable) {
+ if (!sqlToPTypeLookupTable) {
// invert the PSToSQL table
psToSQLTable = psDBGetPTypeToSQLTable();
- lookupTable = psHashAlloc(psToSQLTable->n);
+ sqlToPTypeLookupTable = psHashAlloc(psToSQLTable->n);
list = psHashKeyList(psToSQLTable);
@@ -1479,16 +1478,16 @@
value = psHashLookup(psToSQLTable, key);
// switch key and value
- psHashAdd(lookupTable, value, key);
+ psHashAdd(sqlToPTypeLookupTable, value, key);
}
// Add BLOB & TEXT reverse mappings
value = psDBIntToString((psU64)PS_DATA_STRING);
- psHashAdd(lookupTable, "BLOB", value);
- psHashAdd(lookupTable, "TEXT", value);
+ psHashAdd(sqlToPTypeLookupTable, "BLOB", value);
+ psHashAdd(sqlToPTypeLookupTable, "TEXT", value);
psFree(value);
// DECIMAL does not exist in the pType to SQL table
value = psDBIntToString(0);
- psHashAdd(lookupTable, "DECIMAL", value);
+ psHashAdd(sqlToPTypeLookupTable, "DECIMAL", value);
psFree(value);
@@ -1499,115 +1498,99 @@
// simulate true ref counting
- psMemIncrRefCounter(lookupTable);
-
- return lookupTable;
+ psMemIncrRefCounter(sqlToPTypeLookupTable);
+
+ return sqlToPTypeLookupTable;
}
static void psDBSQLToPTypeTableCleanup(void)
{
- psHash *lookupTable;
-
- lookupTable = psDBGetSQLToPTypeTable();
-
- psMemDecrRefCounter(lookupTable);
- psFree(lookupTable);
+ psFree(sqlToPTypeLookupTable);
+ sqlToPTypeLookupTable = NULL;
}
static psHash *psDBGetMySQLToSQLTable(void)
{
- static psHash *lookupTable = NULL;
-
- if (!lookupTable) {
- lookupTable = psHashAlloc(20);
-
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_TINY, "TINYINT");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_SHORT, "SMALLINT");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_LONG, "INT");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_INT24, "MEDIUMINT");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_LONGLONG, "BIGINT");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_DECIMAL, "DECIMAL");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_FLOAT, "FLOAT");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_DOUBLE, "DOUBLE");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_TIMESTAMP, "TIMESTAMP");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_DATE, "DATE");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_TIME, "TIME");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_DATETIME, "DATETIME");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_YEAR, "YEAR");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_STRING, "CHAR");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_VAR_STRING,"VARCHAR");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_BLOB, "BLOB");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_SET, "SET");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_ENUM, "ENUM");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_NULL, "NULL-type");
- psDBAddToLookupTable(lookupTable, FIELD_TYPE_CHAR, "TINYINT");
+ if (!mysqlToSqlLookupTable) {
+ mysqlToSqlLookupTable = psHashAlloc(20);
+
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_TINY, "TINYINT");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_SHORT, "SMALLINT");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_LONG, "INT");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_INT24, "MEDIUMINT");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_LONGLONG, "BIGINT");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_DECIMAL, "DECIMAL");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_FLOAT, "FLOAT");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_DOUBLE, "DOUBLE");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_TIMESTAMP, "TIMESTAMP");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_DATE, "DATE");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_TIME, "TIME");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_DATETIME, "DATETIME");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_YEAR, "YEAR");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_STRING, "CHAR");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_VAR_STRING,"VARCHAR");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_BLOB, "BLOB");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_SET, "SET");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_ENUM, "ENUM");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_NULL, "NULL-type");
+ psDBAddToLookupTable(mysqlToSqlLookupTable, FIELD_TYPE_CHAR, "TINYINT");
}
// simulate true ref counting
- psMemIncrRefCounter(lookupTable);
-
- return lookupTable;
+ psMemIncrRefCounter(mysqlToSqlLookupTable);
+
+ return mysqlToSqlLookupTable;
}
static void psDBMySQLToSQLTableCleanup(void)
{
- psHash *lookupTable;
-
- lookupTable = psDBGetMySQLToSQLTable();
-
- psMemDecrRefCounter(lookupTable);
- psFree(lookupTable);
+ psFree(mysqlToSqlLookupTable);
+ mysqlToSqlLookupTable = NULL;
}
static psHash *psDBGetPTypeToMySQLTable(void)
{
- static psHash *lookupTable = NULL;
-
- if (!lookupTable) {
- lookupTable = psHashAlloc(14);
-
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_S8, psDBMySQLTypeAlloc(MYSQL_TYPE_TINY, false));
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_S16, psDBMySQLTypeAlloc(MYSQL_TYPE_SHORT, false));
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_S32, psDBMySQLTypeAlloc(MYSQL_TYPE_LONG, false));
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_S64, psDBMySQLTypeAlloc(MYSQL_TYPE_LONGLONG, false));
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_U8, psDBMySQLTypeAlloc(MYSQL_TYPE_TINY, true));
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_U16, psDBMySQLTypeAlloc(MYSQL_TYPE_SHORT, true));
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_U32, psDBMySQLTypeAlloc(MYSQL_TYPE_LONG, true));
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_U64, psDBMySQLTypeAlloc(MYSQL_TYPE_LONGLONG, true));
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_F32, psDBMySQLTypeAlloc(MYSQL_TYPE_FLOAT, false));
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_F64, psDBMySQLTypeAlloc(MYSQL_TYPE_DOUBLE, false));
+ if (!pTypeToMysqlLookupTable) {
+ pTypeToMysqlLookupTable = psHashAlloc(14);
+
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_S8, psDBMySQLTypeAlloc(MYSQL_TYPE_TINY, false));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_S16, psDBMySQLTypeAlloc(MYSQL_TYPE_SHORT, false));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_S32, psDBMySQLTypeAlloc(MYSQL_TYPE_LONG, false));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_S64, psDBMySQLTypeAlloc(MYSQL_TYPE_LONGLONG, false));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_U8, psDBMySQLTypeAlloc(MYSQL_TYPE_TINY, true));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_U16, psDBMySQLTypeAlloc(MYSQL_TYPE_SHORT, true));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_U32, psDBMySQLTypeAlloc(MYSQL_TYPE_LONG, true));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_U64, psDBMySQLTypeAlloc(MYSQL_TYPE_LONGLONG, true));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_F32, psDBMySQLTypeAlloc(MYSQL_TYPE_FLOAT, false));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_F64, psDBMySQLTypeAlloc(MYSQL_TYPE_DOUBLE, false));
// bogus type
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_C32, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_C32, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
// bogus type
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_C64, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
- psDBAddVoidToLookupTable(lookupTable, PS_TYPE_BOOL, psDBMySQLTypeAlloc(MYSQL_TYPE_TINY, true));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_C64, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_BOOL, psDBMySQLTypeAlloc(MYSQL_TYPE_TINY, true));
// XXX: removed PS_TYPE_PTR, can this be removed too?
- // psDBAddVoidToLookupTable(lookupTable, PS_TYPE_PTR, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
-
- psDBAddVoidToLookupTable(lookupTable, PS_DATA_STRING, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
- psDBAddVoidToLookupTable(lookupTable, PS_DATA_VECTOR, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
- psDBAddVoidToLookupTable(lookupTable, PS_DATA_IMAGE, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
- psDBAddVoidToLookupTable(lookupTable, PS_DATA_HASH, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
- psDBAddVoidToLookupTable(lookupTable, PS_DATA_LOOKUPTABLE,
+ // psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_TYPE_PTR, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
+
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_DATA_STRING, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_DATA_VECTOR, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_DATA_IMAGE, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_DATA_HASH, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_DATA_LOOKUPTABLE,
psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
- // psDBAddVoidToLookupTable(lookupTable, PS_DATA_JPEG, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
- // psDBAddVoidToLookupTable(lookupTable, PS_DATA_PNG, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
- // psDBAddVoidToLookupTable(lookupTable, PS_DATA_ASTROM, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
- psDBAddVoidToLookupTable(lookupTable, PS_DATA_UNKNOWN,psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
+ // psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_DATA_JPEG, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
+ // psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_DATA_PNG, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
+ // psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_DATA_ASTROM, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
+ psDBAddVoidToLookupTable(pTypeToMysqlLookupTable, PS_DATA_UNKNOWN,psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false));
}
// simulate true ref counting
- psMemIncrRefCounter(lookupTable);
-
- return lookupTable;
+ psMemIncrRefCounter(pTypeToMysqlLookupTable);
+
+ return pTypeToMysqlLookupTable;
}
static void psDBPTypeToMySQLTableCleanup(void)
{
- psHash *lookupTable;
-
- lookupTable = psDBGetPTypeToMySQLTable();
-
- psMemDecrRefCounter(lookupTable);
- psFree(lookupTable);
+ psFree(pTypeToMysqlLookupTable);
+ pTypeToMysqlLookupTable = NULL;
}
Index: /trunk/psLib/src/imageops/psImageStructManip.c
===================================================================
--- /trunk/psLib/src/imageops/psImageStructManip.c (revision 5215)
+++ /trunk/psLib/src/imageops/psImageStructManip.c (revision 5216)
@@ -8,6 +8,6 @@
* @author Robert DeSonia, MHPCC
*
- * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-09-15 21:22:22 $
+ * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-10-01 02:22:11 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -96,5 +96,6 @@
// if a child, need to orphan (disassociate from parent) first
if (out->parent != NULL) {
- psArrayRemove(out->parent->children,out); // remove from parent's knowledge
+ psArrayRemove(out->parent->children,psMemIncrRefCounter(out));
+ // remove from parent's knowledge without triggering a free
out->parent = NULL; // break link to parent
}
@@ -127,17 +128,6 @@
// add output image as a child of the input image.
- psS32 n = 0;
- psArray* children = image->children;
- if (children == NULL) {
- children = psArrayAlloc(16); // start with a reasonable size for growth
- } else if (children->nalloc == children->n) { // full?
- n = children->n;
- children = psArrayRealloc(children,n*2); // double the array size
- } else {
- n = children->n;
- }
- children->data[n] = out;
- children->n = n+1;
- image->children = children; // push back any change (esp. if children==NULL before)
+ image->children = psArrayAdd(image->children,16,out);
+ psMemDecrRefCounter(out); // don't count the reference held by parent as a true reference
return (out);
Index: /trunk/psLib/src/mathtypes/psImage.c
===================================================================
--- /trunk/psLib/src/mathtypes/psImage.c (revision 5215)
+++ /trunk/psLib/src/mathtypes/psImage.c (revision 5216)
@@ -9,6 +9,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.88 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-09-29 19:05:02 $
+ * @version $Revision: 1.89 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-10-01 02:22:12 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -39,5 +39,10 @@
if (image->parent != NULL) {
+ psMemBlock* ptr = ((psMemBlock*)image)-1;
+ int ref = ptr->refCounter;
+ ptr->refCounter = 2; // make sure psFree is not retriggered
psArrayRemove(image->parent->children,image);
+ ptr->refCounter = ref; // restore previous count (not assuming zero, but should be)
+
image->parent = NULL;
}
Index: /trunk/psLib/src/sys/psMemory.c
===================================================================
--- /trunk/psLib/src/sys/psMemory.c (revision 5215)
+++ /trunk/psLib/src/sys/psMemory.c (revision 5216)
@@ -8,6 +8,6 @@
* @author Robert Lupton, Princeton University
*
-* @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
-* @date $Date: 2005-09-08 00:17:26 $
+* @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
+* @date $Date: 2005-10-01 02:22:13 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -583,4 +583,37 @@
}
+psPtr p_psMemSetRefCounter(
+ psPtr vptr,
+ psReferenceCount count,
+ const char *file,
+ psS32 lineno)
+{
+ psMemBlock* ptr;
+
+ if (vptr == NULL) {
+ return vptr;
+ }
+
+ if (count < 0) {
+ count = 0;
+ }
+
+ ptr = ((psMemBlock* ) vptr) - 1;
+
+ if (checkMemBlock(ptr, __func__)) {
+ memProblemCallback(ptr, file, lineno);
+ }
+
+ pthread_mutex_lock(&ptr->refCounterMutex);
+ ptr->refCounter = count;
+ pthread_mutex_unlock(&ptr->refCounterMutex);
+
+ if (count < 1) {
+ vptr = p_psMemDecrRefCounter(vptr,file,lineno);
+ }
+
+ return vptr;
+}
+
// decrement and return refCounter
psPtr p_psMemDecrRefCounter(psPtr vptr,
@@ -707,5 +740,4 @@
return PTR->freeFunc;
}
-
bool psMemCheckType(psDataType type,
Index: /trunk/psLib/src/sys/psMemory.h
===================================================================
--- /trunk/psLib/src/sys/psMemory.h (revision 5215)
+++ /trunk/psLib/src/sys/psMemory.h (revision 5216)
@@ -12,6 +12,6 @@
* @ingroup MemoryManagement
*
- * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-08-31 02:07:11 $
+ * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-10-01 02:22:13 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -350,4 +350,30 @@
#endif // !DOXYGEN
+/** Set reference counter and return the pointer
+ *
+ * @ingroup memRefCount
+ *
+ * @return psPtr the pointer with refCount set, or NULL if pointer is
+ * fully dereferenced.
+ */
+#ifdef DOXYGEN
+psPtr psMemSetRefCounter(
+ psPtr ptr, ///< Pointer to decrement refCounter, and return
+ psReferenceCount count ///< New reference count
+);
+#else // DOXYGEN
+psPtr p_psMemSetRefCounter(
+ psPtr vptr, ///< Pointer to decrement refCounter, and return
+ psReferenceCount count, ///< New reference count
+ const char *file, ///< File of call
+ psS32 lineno ///< Line number of call
+);
+
+#ifndef SWIG
+#define psMemSetRefCounter(vptr, count) p_psMemSetRefCounter(vptr, count, __FILE__, __LINE__)
+#endif // !SWIG
+
+#endif // !DOXYGEN
+
/** Set callback for problems.
*
Index: /trunk/psLib/src/types/psArray.c
===================================================================
--- /trunk/psLib/src/types/psArray.c (revision 5215)
+++ /trunk/psLib/src/types/psArray.c (revision 5216)
@@ -9,6 +9,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-09-24 00:17:44 $
+ * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-10-01 02:22:15 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -41,5 +41,5 @@
}
- psArrayElementFree(psArr);
+ psArrayElementsFree(psArr);
psFree(psArr->data);
@@ -98,5 +98,7 @@
{
if (array == NULL) {
- return array;
+ int d = (delta > 0) ? delta : 10; // as spec'ed in SDRS.
+ array = psArrayAlloc(d);
+ array->n = 0;
}
@@ -132,4 +134,5 @@
if (psArrData[i] == data) {
memmove(&array->data[i],&array->data[i+1],(n-i-1)*sizeof(psPtr));
+ psFree(data); // free the removed item (see Bug #449)
n--;
success = true;
@@ -141,5 +144,5 @@
}
-void psArrayElementFree(psArray* psArr)
+void psArrayElementsFree(psArray* psArr)
{
@@ -205,5 +208,5 @@
}
psFree(array->data[position]);
- array->data[position] = data;
+ array->data[position] = psMemIncrRefCounter(data);
return true;
@@ -232,8 +235,4 @@
return NULL;
}
- return array->data[position];
-}
-
-
-
-
+ return psMemIncrRefCounter(array->data[position]);
+}
Index: /trunk/psLib/src/types/psArray.h
===================================================================
--- /trunk/psLib/src/types/psArray.h (revision 5215)
+++ /trunk/psLib/src/types/psArray.h (revision 5216)
@@ -1,3 +1,2 @@
-
/** @file psArray.h
*
@@ -12,6 +11,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-09-24 00:17:44 $
+ * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-10-01 02:22:15 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -116,5 +115,5 @@
*
*/
-void psArrayElementFree(
+void psArrayElementsFree(
psArray* psArr ///< Void pointer array to destroy.
);
Index: /trunk/psLib/src/types/psList.c
===================================================================
--- /trunk/psLib/src/types/psList.c (revision 5215)
+++ /trunk/psLib/src/types/psList.c (revision 5216)
@@ -6,6 +6,6 @@
* @author Robert Daniel DeSonia, MHPCC
*
- * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-09-29 01:15:38 $
+ * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-10-01 02:22:15 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -41,11 +41,17 @@
pthread_mutex_lock(&list->p_lock);
- // remove the free function of iterators to avoid double removal from list
+ // remove the associated iterators -- any references are invalid once psList is freed.
psArray* iterators = list->iterators;
- for (int i = 0; i < iterators->n; i++) {
- psMemSetDeallocator(iterators->data[i], NULL);
- }
-
- psFree(list->iterators);
+ // ONLY orphan the iterators if the list iterators are about to be destroyed
+ // a case where this is not the case is in psListSort.
+ if (psMemGetRefCounter(iterators) < 2) {
+ for (int i = 0; i < iterators->n; i++) {
+ // orphan iterators first to avoid any callbacks to dying list
+ ((psListIterator*)iterators->data[i])->list = NULL;
+ // remove all external references
+ psMemSetRefCounter(iterators->data[i], 1);
+ }
+ }
+ psFree(iterators);
for (psListElem* ptr = list->head; ptr != NULL;) {
@@ -71,6 +77,15 @@
// remove this iterator from the parent list
- psArrayRemove(iter->list->iterators,iter);
-
+ if (iter->list != NULL) {
+ psArray* iters = iter->list->iterators;
+ for (int lcv = 0; lcv < iters->n; lcv++) {
+ if (iters->data[lcv] == iter) {
+ // following is done to match SDRS.
+ iters->data[lcv] = iters->data[iters->n-1];
+ iters->n--;
+ break;
+ }
+ }
+ }
}
@@ -164,18 +179,12 @@
iter->mutable = mutable;
- // add to the list's array of iterators
- psArray* listIterators = list->iterators;
- int num = listIterators->n;
- if ( num >= listIterators->nalloc) {
- // need to resize the array to make more room for another iterator.
- list->iterators = psArrayRealloc(listIterators,listIterators->nalloc*2);
- listIterators = list->iterators;
- }
- listIterators->data[num] = iter;
- listIterators->n = num+1;
+ // associate the iterator with the list
+ list->iterators = psArrayAdd(list->iterators,0,iter);
+ // don't want the list's array of iterators to hold a true reference
+ psMemDecrRefCounter(iter);
if (! psListIteratorSet(iter,location)) {
psFree(iter);
- iter = NULL;
+ return NULL;
}
Index: /trunk/psLib/src/types/psMetadataConfig.c
===================================================================
--- /trunk/psLib/src/types/psMetadataConfig.c (revision 5215)
+++ /trunk/psLib/src/types/psMetadataConfig.c (revision 5216)
@@ -10,6 +10,6 @@
* @author Eric Van Alst, MHPCC
*
-* @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
-* @date $Date: 2005-09-29 01:15:38 $
+* @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+* @date $Date: 2005-10-01 02:22:15 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -995,5 +995,5 @@
nextLevelInfo->name = psStringCopy(keyName);
// Add next level to levelArray
- levelArray = psArrayAdd(levelArray,1,nextLevelInfo);
+ levelArray = psArrayAdd(levelArray,0,nextLevelInfo);
psFree(nextLevelInfo);
// Increment level counter
@@ -1132,5 +1132,4 @@
return false;
}
- psFree(lowerLevelInfo);
(*level)--;
}
Index: /trunk/psLib/test/FullUnitTest.in
===================================================================
--- /trunk/psLib/test/FullUnitTest.in (revision 5215)
+++ /trunk/psLib/test/FullUnitTest.in (revision 5216)
@@ -5,6 +5,6 @@
# the script
#
-# $Revision: 1.1 $ $Name: not supported by cvs2svn $
-# $Date: 2005-05-12 01:35:35 $
+# $Revision: 1.2 $ $Name: not supported by cvs2svn $
+# $Date: 2005-10-01 02:22:19 $
#
# Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23,8 +23,10 @@
$recursive=1;
+$jobs=1;
# Assign variables based on the presence of command line options to the script
# The ! option allows for --nooption to be set to zero
# (e.g. --noverbose --recursive causes $verbose=0 and $recursive=1)
GetOptions(
+ "jobs!" => \$jobs,
"verbose!" => \$verbose,
"recursive!" => \$recursive,
@@ -41,4 +43,5 @@
where:
options =
+ --jobs number of threads to use for make
--help Print this help text
--verbose Display extra information to user
@@ -241,5 +244,5 @@
# Execute the make and save results
- $_ = join( "\n|| ", split( "\n", "\n" . `make tests` ) );
+ $_ = join( "\n|| ", split( "\n", "\n" . `make -j $jobs tests` ) );
# Check the output of make for return value != 0 or any of the
Index: /trunk/psLib/test/astro/tst_psTime_04.c
===================================================================
--- /trunk/psLib/test/astro/tst_psTime_04.c (revision 5215)
+++ /trunk/psLib/test/astro/tst_psTime_04.c (revision 5216)
@@ -15,6 +15,6 @@
* @author Eric Van Alst, MHPCC
*
- * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-09-21 02:11:16 $
+ * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-10-01 02:22:20 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -35,11 +35,11 @@
testDescription tests[] = {
- {testTimeInit1,000,"p_psTimeInit",0,false},
- {testTimeInit2,000,"p_psTimeInit",0,false},
- {testTimeInit3,000,"p_psTimeInit",0,false},
- {testTimeInit4,000,"p_psTimeInit",0,false},
- {testTimeInit5,000,"p_psTimeInit",0,false},
- {testTimeInit6,000,"p_psTimeInit",0,false},
- {testTimer1,000,"psTimer",0,false},
+ {testTimeInit1,-1,"p_psTimeInit",0,false},
+ {testTimeInit2,-2,"p_psTimeInit",0,false},
+ {testTimeInit3,-3,"p_psTimeInit",0,false},
+ {testTimeInit4,-4,"p_psTimeInit",0,false},
+ {testTimeInit5,-5,"p_psTimeInit",0,false},
+ {testTimeInit6,-6,"p_psTimeInit",0,false},
+ {testTimer1,-7,"psTimer",0,false},
{NULL}
};
Index: /trunk/psLib/test/db/tst_psDB.c
===================================================================
--- /trunk/psLib/test/db/tst_psDB.c (revision 5215)
+++ /trunk/psLib/test/db/tst_psDB.c (revision 5216)
@@ -9,6 +9,6 @@
* @author Aaron Culliney, MHPCC
*
- * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- * @date $Date: 2005-09-26 21:13:29 $
+ * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2005-10-01 02:22:22 $
*
* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -777,4 +777,5 @@
return 7;
}
+ psFree(ptr);
ptr = psArrayGet(ary, 1);
if (strcmp(ptr, CONST_ROW_2_STR)) {
@@ -785,4 +786,5 @@
return 8;
}
+ psFree(ptr);
ptr = psArrayGet(ary, 0);
if (strcmp(ptr, STR_1)) {
@@ -793,4 +795,5 @@
return 9;
}
+ psFree(ptr);
psFree(ary);
@@ -820,4 +823,5 @@
return 11;
}
+ psFree(ptr);
ptr = psArrayGet(ary, 1);
if(atoi(ptr) != CONST_ROW_2_BOOL) {
@@ -828,4 +832,5 @@
return 12;
}
+ psFree(ptr);
ptr = psArrayGet(ary, 0);
if(atoi(ptr) != B_1) {
@@ -836,4 +841,5 @@
return 13;
}
+ psFree(ptr);
psFree(ary);
@@ -1158,4 +1164,5 @@
}
psFree(ary);
+ psFree(row);
}
@@ -1386,4 +1393,5 @@
}
psFree(dumpRowSet);
+ psFree(row);
// Insert rows with NULL database object
@@ -1507,4 +1515,5 @@
return 5;
}
+ psFree(row);
row = (psMetadata*)psArrayGet(ary, 1);
if(!_check_const_row2(row)) {
@@ -1513,4 +1522,5 @@
return 6;
}
+ psFree(row);
row = (psMetadata*)psArrayGet(ary, 2);
if(!_check_const_row1(row)) {
@@ -1519,4 +1529,5 @@
return 7;
}
+ psFree(row);
psFree(ary);
@@ -1904,4 +1915,5 @@
return 6;
}
+ psFree(row);
psFree(ary);
@@ -1978,4 +1990,5 @@
return 12;
}
+ psFree(row);
psFree(ary);
Index: /trunk/psLib/test/sys/verified/tst_psMemory.stderr
===================================================================
--- /trunk/psLib/test/sys/verified/tst_psMemory.stderr (revision 5215)
+++ /trunk/psLib/test/sys/verified/tst_psMemory.stderr (revision 5216)
@@ -5,5 +5,5 @@
\**********************************************************************************/
-