Just made all tests include libpthread, it makes sense these days.

Creating an experimental new cache system that's controlled primarily with a
subclass.  This should cut down significantly on the amount of code needed to
use the cache.  The new one also features a required (for now) base class for
objects that use the cache.  This simplifies so many different things.

2 files changed, 205 insertions, 6 deletions

diff --git a/default.bld b/default.bld
index 9babbff..4dd27d0 100644
--- a/default.bld
+++ b/default.bld
@@ -151,11 +151,6 @@ target "viewcsv"
     LDFLAGS += "-lncurses";
 }
 
-target ["myriad", "myriadfs", "tests/myriad", "tests/myriadfs", "unit/myriad", "tests/bigmyriad", "tests/synchroqueue", "tests/readwritemutex"]
-{
-    LDFLAGS += "-lpthread";
-}
-
 target files("src/extra/*.cpp").replace("src/extra/","").replace(".cpp","")
 {
     input "src/extra/${OUTPUT}.cpp";
@@ -197,7 +192,7 @@ target files("src/tests/*.cpp").replace("src/","").replace(".cpp","")
     requires "libbu++.a";
     tag ["tests", "general tests"];
     CXXFLAGS += "-I.";
-    LDFLAGS += "-L. -lbu++";
+    LDFLAGS += "-L. -lbu++ -lpthread";
 }
 
 // Some tests need extra libs and whatnot, that goes here.
diff --git a/src/tests/cache.cpp b/src/tests/cache.cpp
new file mode 100644
index 0000000..911b829
--- /dev/null
+++ b/src/tests/cache.cpp
@@ -0,0 +1,204 @@
+#include <bu/archive.h>
+#include <bu/hash.h>
+#include <bu/uuid.h>
+#include <bu/myriad.h>
+#include <bu/myriadstream.h>
+#include <bu/file.h>
+#include <bu/streamstack.h>
+
+//
+// New Cache Implementation
+//
+
+template<typename keytype, typename obtype> class CacheBase;
+
+template<typename keytype, typename obtype>
+class CacheObject
+{
+friend class CacheBase<keytype, obtype>;
+public:
+    CacheObject() :
+        pCache( NULL ),
+        bChanged( false )
+    {
+    }
+
+    virtual ~CacheObject()
+    {
+    }
+
+    typedef CacheBase<keytype, obtype> CacheType;
+
+    virtual const keytype getKey() const=0;
+
+    void changed( bool bChanged=true )
+    {
+        if( this->bChanged == false && bChanged == true )
+            pCache->objectChanged( getKey() );
+
+        this->bChanged = bChanged;
+    }
+
+private:
+    void setCache( CacheType *pCache )
+    {
+        this->pCache = pCache;
+    }
+
+private:
+    CacheType *pCache;
+    bool bChanged;
+};
+
+template<typename keytype, typename obtype, typename basetype=obtype>
+class CachePtr
+{
+friend class CacheBase<keytype, basetype>;
+public:
+    CachePtr()
+    {
+    }
+
+    virtual ~CachePtr()
+    {
+    }
+};
+
+template<typename keytype, typename obtype>
+class CacheBase
+{
+public:
+    CacheBase()
+    {
+    }
+
+    virtual ~CacheBase()
+    {
+    }
+
+protected:
+    virtual void _create( obtype *o )=0;
+    virtual void _erase( const keytype &k )=0;
+
+    virtual obtype *_load( const keytype &k )=0;
+    virtual void _save( obtype *o )=0;
+};
+
+template<typename keytype, typename obtype>
+class MyriadCache : public CacheBase<keytype, obtype>
+{
+public:
+    MyriadCache( Bu::Stream &sStore, int iBlockSize=512, int iPreallocate=8 ) :
+        sStore( sStore ),
+        mStore( sStore, iBlockSize, iPreallocate )
+    {
+        try
+        {
+            Bu::MyriadStream ms = mStore.openStream( 1 );
+            Bu::Archive ar( ms, Bu::Archive::load );
+            ar >> hIndex;
+        }
+        catch(...)
+        {
+            if( mStore.createStreamWithId( 1 ) != 1 )
+                throw Bu::ExceptionBase("Error creating index stream.");
+
+            Bu::MyriadStream ms = mStore.openStream( 1 );
+            Bu::Archive ar( ms, Bu::Archive::save );
+            ar << hIndex;
+        }
+    }
+
+    virtual ~MyriadCache()
+    {
+    }
+
+protected:
+    virtual void _create( obtype *o )
+    {
+        hIndex.insert( o->getKey(), mStore.createStream() );
+        _save( o );
+    }
+
+    virtual void _erase( const keytype &k )
+    {
+        mStore.deleteStream( hIndex.get( k ) );
+        hIndex.erase( k );
+    }
+
+    virtual obtype *_load( const keytype &k )
+    {
+        Bu::MyriadStream ms = mStore.openStream( hIndex.get( k ) );
+        Bu::Archive ar( ms, Bu::Archive::load );
+        obtype *ret = new obtype();
+        ar >> *ret;
+        return ret;
+    }
+
+    virtual void _save( obtype *o )
+    {
+        Bu::MyriadStream ms = mStore.openStream( hIndex.get( o->getKey() ) );
+        {
+            Bu::Archive ar( ms, Bu::Archive::save );
+            ar << *o;
+        }
+        ms.setSize( ms.tell() );
+    }
+
+private:
+    Bu::Stream &sStore;
+    Bu::Myriad mStore;
+    Bu::Hash<keytype, int> hIndex;
+};
+
+//
+// Test
+//
+
+class Something : public CacheObject<Bu::Uuid, Something>
+{
+friend Bu::ArchiveBase &operator>>( Bu::ArchiveBase &ar, Something &s );
+friend Bu::ArchiveBase &operator<<( Bu::ArchiveBase &ar, const Something &s );
+public:
+    Something()
+    {
+    }
+    
+    Something( const Bu::String &sName ) :
+        uId( Bu::Uuid::generate() ),
+        sName( sName )
+    {
+    }
+
+    virtual ~Something()
+    {
+    }
+
+    virtual const Bu::Uuid getKey() const
+    {
+        return uId;
+    }
+
+private:
+    Bu::Uuid uId;
+    Bu::String sName;
+};
+
+Bu::ArchiveBase &operator>>( Bu::ArchiveBase &ar, Something &s )
+{
+    return ar >> s.uId >> s.sName;
+}
+
+Bu::ArchiveBase &operator<<( Bu::ArchiveBase &ar, const Something &s )
+{
+    return ar << s.uId << s.sName;
+}
+
+int main()
+{
+    Bu::File fStore("test.myr", Bu::File::Create|Bu::File::ReadWrite);
+    MyriadCache<Bu::Uuid, Something> c( fStore );
+
+    return 0;
+}
+