2 files changed, 212 insertions, 1 deletions

diff --git a/src/unit/synchrohash.unit b/src/unit/synchrohash.unit
new file mode 100644
index 0000000..12d3ec1
--- /dev/null
+++ b/src/unit/synchrohash.unit
@@ -0,0 +1,211 @@
+// vim: syntax=cpp
+/*
+ * Copyright (C) 2007-2013 Xagasoft, All rights reserved.
+ *
+ * This file is part of the libbu++ library and is released under the
+ * terms of the license contained in the file LICENSE.
+ */
+
+#include "bu/string.h"
+#include "bu/synchrohash.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
+typedef Bu::SynchroHash<Bu::String, int> StrIntHash;
+typedef Bu::SynchroHash<Bu::String, Bu::String> StrStrHash;
+typedef Bu::SynchroHash<int, Bu::String> IntStrHash;
+
+suite Hash
+{
+    test probe1
+    {
+        StrIntHash h;
+        char buf[20];
+        for(int i=1;i<10000;i++)
+        {
+            sprintf(buf,"%d",i);
+            Bu::String sTmp(buf);
+            h.insert(sTmp, i);
+            unitTest( h.has(sTmp) );
+        }
+    }
+
+    test insert1
+    {
+        StrIntHash h;
+        h.insert("Hi", 42);
+        unitTest( h.get("Hi") == 42 );
+    }
+
+    test insert2
+    {
+        StrStrHash h;
+        h.insert("Hi", "Yo");
+        h.insert("Bye", "Later");
+        unitTest( h.get("Hi") == "Yo" );
+
+        StrStrHash h2(h);
+        unitTest( h2.get("Hi") == "Yo" );
+        unitTest( h2.get("Bye") == "Later" );
+
+        StrStrHash h3;
+        h3 = h;
+        unitTest( h3.get("Hi") == "Yo" );
+        unitTest( h3.get("Bye") == "Later" );
+    }
+
+    test insert3
+    {
+        IntStrHash h;
+
+        for( unsigned int i=1; i<50; i++ )
+        {
+            h.insert(i, "testing");
+            unitTest( h.getSize() == i );
+        }
+    }
+
+    test erase1
+    {
+        StrIntHash h;
+        h.insert("Number 1", 1 );
+        h.insert("Number 2", 2 );
+        h.insert("Number 3", 3 );
+        h.erase("Number 2");
+        h.get("Number 3");
+        try {
+            h.get("Number 2");
+            unitFailed("h.get(\"Number 2\") should have thrown an exception.");
+        } catch( Bu::HashException &e ) { }
+
+    /*  printf("\n");
+        for( StrIntHash::iterator i = h.begin(); i != h.end(); i++ )
+        {
+            printf(" - \"%s\" = %d\n", i.getKey().getStr(), i.getValue() );
+        } */
+    }
+
+    test copy
+    {
+        StrIntHash h;
+        h.insert("hello", 55 );
+        h.insert("goodbye", -1812 );
+
+        StrIntHash h2 = h;
+//        unitTest( h2.isCoreShared( h ) );
+
+ //       StrIntHash h3 = h.clone();
+//        unitTest( !h3.isCoreShared( h ) );
+    }
+
+    test reHashSpecial
+    {
+        IntStrHash hTest;
+
+        setStepCount( 1000000 );
+        for( int i=0; i<1000000; ++i )
+        {
+            char buf[40]; snprintf(buf,40,"num%d",i);
+            incProgress();
+
+            if( ((double)random()/(double)RAND_MAX)<.01 )
+            {
+                //printf("ERASE: %d (%s)\n",i%64,buf);
+                hTest.erase(i%64);
+            }
+            else
+            {
+                hTest.insert(i%64, buf);
+            }
+
+            /*printf("(%d) size: %u fill: %u cap:%u\n",
+                i,
+                hTest.getSize(),
+                hTest.getFill(),
+                hTest.getCapacity()
+                );*/
+        }
+    }
+
+    test stress
+    {
+        srandom(time(NULL));
+
+        IntStrHash hTest;
+        IntStrHash hReUse;
+        setStepCount( 100000 );
+
+        for( int i=0; i<100000; ++i )
+        {
+            char buf[40]; snprintf(buf,40,"num%d",i);
+            hTest.insert(i, buf);
+            incProgress();
+
+            
+            if( ((double)random()/(double)RAND_MAX)<.01 )
+            {
+                Bu::List<int> lKeys = hReUse.getKeys();
+                Bu::List<int>::const_iterator it = lKeys.begin();
+                int iIdx = (int)(((double)random()/(double)RAND_MAX)
+                    *lKeys.getSize());
+                for( int l=0; it; ++it, ++l )
+                {
+                    if( l==iIdx )
+                    {
+                        int iVal = *it;
+                        hReUse.erase( *it );
+                        char buf[40]; snprintf(buf,40,"num%d",iVal);
+                        hTest.insert(i, buf);
+                        //printf("re-use: %s\n",buf);
+                    }
+                }
+            }
+
+            /*printf("(%s) size: %u fill: %u cap:%u\n",
+                buf,
+                hTest.getSize(),
+                hTest.getFill(),
+                hTest.getCapacity()
+                );*/
+
+            if( ((double)random()/(double)RAND_MAX)<.3 )
+            {
+                Bu::List<int> lKeys = hTest.getKeys();
+                int iIdx = (int)(((double)random()/(double)RAND_MAX)
+                    *lKeys.getSize());
+                Bu::List<int>::const_iterator it = lKeys.begin();
+                for( int k=0; it; ++it, ++k )
+                {
+                    if( k == iIdx )
+                    {
+                        hReUse.insert(*it,"yo");
+                        hTest.erase( *it );
+                    }
+                }
+            }
+
+            if( hTest.getSize() > 100 )
+            {
+                int iK = (int)(((double)random()/(double)RAND_MAX)*50)+10;
+                for( int j=0; j<iK; ++j )
+                {
+                    Bu::List<int> lKeys = hTest.getKeys();
+                    int iIdx = (int)(((double)random()/(double)RAND_MAX)
+                        *lKeys.getSize());
+                    Bu::List<int>::const_iterator it = lKeys.begin();
+                    for( int k=0; it; ++it, ++k )
+                    {
+                        if( k == iIdx )
+                        {
+                            hReUse.insert(*it,"yo");
+                            hTest.erase( *it );
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/unstable/synchrohash.h b/src/unstable/synchrohash.h
index 45572c2..19433e7 100644
--- a/src/unstable/synchrohash.h
+++ b/src/unstable/synchrohash.h
@@ -217,7 +217,7 @@ namespace Bu
 
     private:
         HashType hCore;
-        ReadWriteMutex mCore;
+        mutable ReadWriteMutex mCore;
     };
 }