Changeset 2859 for trunk/psLib/src/collections/psHash.c

Timestamp:

Jan 3, 2005, 10:28:07 AM (22 years ago)

Author:

desonia

Message:

added psHashToArray function and cooresponding test.

File:

• trunk/psLib/src/collections/psHash.c (modified) (5 diffs)

trunk/psLib/src/collections/psHash.c

@@ -10 +10 @@
 *  @author Robert Lupton, Princeton University
 *  @author George Gusciora, MHPCC
+*  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-04 02:43:39 $
+*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-01-03 20:28:07 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -361 +362 @@
     }
 
-    return (doHashWork(table, key, data, 0) != NULL);
+    return (doHashWork(table, key, data, false) != NULL);
 }
 
@@ -389 +390 @@
     }
 
-    return doHashWork(table, key, NULL, 0);
+    return doHashWork(table, key, NULL, false);
 }
 
@@ -418 +419 @@
     }
 
-    data = doHashWork(table, key, NULL, 1);
+    data = doHashWork(table, key, NULL, true);
     if (data != NULL) {
         retVal = true;
@@ -427 +428 @@
     return retVal;
 }
+
+psArray* psHashToArray(psHash* table)
+{
+
+    if (table == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psHash_TABLE_NULL);
+        return NULL;
+    }
+
+    // first, let's just count the number of data elements to know what size
+    // psArray we need to allocate.
+    int nElements = 0;
+    int nbucket = table->nbucket;
+    for (int i = 0; i < nbucket; i++) {
+        psHashBucket* tmpBucket = table->buckets[i];
+        while (tmpBucket != NULL) {
+            nElements++;
+            tmpBucket = tmpBucket->next;
+        }
+    }
+
+    psArray* result = psArrayAlloc(nElements);
+    result->n = nElements;
+
+    // now fill in the array with the hash table's data
+    psPtr* data = result->data;
+    for (int i = 0; i < nbucket; i++) {
+        psHashBucket* tmpBucket = table->buckets[i];
+        while (tmpBucket != NULL) {
+            *(data++) = psMemIncrRefCounter(tmpBucket->data);
+            tmpBucket = tmpBucket->next;
+        }
+    }
+
+    return result;
+}