The reorg is being put in trunk, I think it's ready. Now we just get to find

out how many applications won't work anymore :)

45 files changed, 508 insertions, 265 deletions

diff --git a/src/tests/clistress.cpp b/src/old/tests/clistress.cpp
index 6b0ac66..6b0ac66 100644
--- a/src/tests/clistress.cpp
+++ b/src/old/tests/clistress.cpp
diff --git a/src/tests/confpair.cpp b/src/old/tests/confpair.cpp
index fb1b0d3..fb1b0d3 100644
--- a/src/tests/confpair.cpp
+++ b/src/old/tests/confpair.cpp
diff --git a/src/tests/connect.cpp b/src/old/tests/connect.cpp
index a9fca64..a9fca64 100644
--- a/src/tests/connect.cpp
+++ b/src/old/tests/connect.cpp
diff --git a/src/tests/exception.cpp b/src/old/tests/exception.cpp
index 6417692..6417692 100644
--- a/src/tests/exception.cpp
+++ b/src/old/tests/exception.cpp
diff --git a/src/tests/formula.cpp b/src/old/tests/formula.cpp
index 976b039..976b039 100644
--- a/src/tests/formula.cpp
+++ b/src/old/tests/formula.cpp
diff --git a/src/tests/hashtest.cpp b/src/old/tests/hashtest.cpp
index eaa84a0..eaa84a0 100644
--- a/src/tests/hashtest.cpp
+++ b/src/old/tests/hashtest.cpp
diff --git a/src/tests/hashtest2.cpp b/src/old/tests/hashtest2.cpp
index 74700fd..74700fd 100644
--- a/src/tests/hashtest2.cpp
+++ b/src/old/tests/hashtest2.cpp
diff --git a/src/tests/httpsrv/httpconnectionmonitor.cpp b/src/old/tests/httpsrv/httpconnectionmonitor.cpp
index 51d82f3..51d82f3 100644
--- a/src/tests/httpsrv/httpconnectionmonitor.cpp
+++ b/src/old/tests/httpsrv/httpconnectionmonitor.cpp
diff --git a/src/tests/httpsrv/httpconnectionmonitor.h b/src/old/tests/httpsrv/httpconnectionmonitor.h
index 30c0afd..30c0afd 100644
--- a/src/tests/httpsrv/httpconnectionmonitor.h
+++ b/src/old/tests/httpsrv/httpconnectionmonitor.h
diff --git a/src/tests/httpsrv/main.cpp b/src/old/tests/httpsrv/main.cpp
index 2f1563c..2f1563c 100644
--- a/src/tests/httpsrv/main.cpp
+++ b/src/old/tests/httpsrv/main.cpp
diff --git a/src/tests/log.cpp b/src/old/tests/log.cpp
index d7cfa0b..d7cfa0b 100644
--- a/src/tests/log.cpp
+++ b/src/old/tests/log.cpp
diff --git a/src/tests/md5test.cpp b/src/old/tests/md5test.cpp
index 6f832df..6f832df 100644
--- a/src/tests/md5test.cpp
+++ b/src/old/tests/md5test.cpp
diff --git a/src/tests/ordhash.cpp b/src/old/tests/ordhash.cpp
index f1d96ec..f1d96ec 100644
--- a/src/tests/ordhash.cpp
+++ b/src/old/tests/ordhash.cpp
diff --git a/src/tests/param.cpp b/src/old/tests/param.cpp
index a4d2824..a4d2824 100644
--- a/src/tests/param.cpp
+++ b/src/old/tests/param.cpp
diff --git a/src/tests/param.h b/src/old/tests/param.h
index 2756b69..2756b69 100644
--- a/src/tests/param.h
+++ b/src/old/tests/param.h
diff --git a/src/tests/plugin/main.cpp b/src/old/tests/plugin/main.cpp
index 51c8390..51c8390 100644
--- a/src/tests/plugin/main.cpp
+++ b/src/old/tests/plugin/main.cpp
diff --git a/src/tests/plugin/plugin.cpp b/src/old/tests/plugin/plugin.cpp
index ea558fd..ea558fd 100644
--- a/src/tests/plugin/plugin.cpp
+++ b/src/old/tests/plugin/plugin.cpp
diff --git a/src/tests/plugin/plugin.h b/src/old/tests/plugin/plugin.h
index f726867..f726867 100644
--- a/src/tests/plugin/plugin.h
+++ b/src/old/tests/plugin/plugin.h
diff --git a/src/tests/qsort.cpp b/src/old/tests/qsort.cpp
index 28c6f03..28c6f03 100644
--- a/src/tests/qsort.cpp
+++ b/src/old/tests/qsort.cpp
diff --git a/src/tests/sbuffer.cpp b/src/old/tests/sbuffer.cpp
index 02798cb..02798cb 100644
--- a/src/tests/sbuffer.cpp
+++ b/src/old/tests/sbuffer.cpp
diff --git a/src/tests/serialize.cpp b/src/old/tests/serialize.cpp
index e233704..e233704 100644
--- a/src/tests/serialize.cpp
+++ b/src/old/tests/serialize.cpp
diff --git a/src/tests/serializetext.cpp b/src/old/tests/serializetext.cpp
index f6be7d3..f6be7d3 100644
--- a/src/tests/serializetext.cpp
+++ b/src/old/tests/serializetext.cpp
diff --git a/src/tests/sha1.cpp b/src/old/tests/sha1.cpp
index df3113c..df3113c 100644
--- a/src/tests/sha1.cpp
+++ b/src/old/tests/sha1.cpp
diff --git a/src/tests/sptr.cpp b/src/old/tests/sptr.cpp
index 252463b..38d3675 100644
--- a/src/tests/sptr.cpp
+++ b/src/old/tests/sptr.cpp
@@ -9,12 +9,12 @@ public:
                 printf("Created.\n");
         }
 
-        virtual ~Annoy()
+        ~Annoy()
         {
                 printf("Destroyed.\n");
         }
 
-        virtual void go()
+        void go()
         {
                 printf("%d: I'm annoying.\n", ++nCnt);
         }
@@ -22,22 +22,6 @@ public:
         int nCnt;
 };
 
-class Annoy2: public Annoy
-{
-public:
-        Annoy2(){};
-        virtual ~Annoy2(){};
-        virtual void go()
-        {
-                printf("{{I'm Annoy2!!}} ");
-                Annoy::go();
-        }
-        virtual void go2()
-        {
-                printf("This is me, on my own...\n");
-        }
-};
-
 void beAnnoying( SPtr<Annoy> bob )
 {
         printf("bob-Count: %d\n", bob.count() );
@@ -46,7 +30,7 @@ void beAnnoying( SPtr<Annoy> bob )
 
 int main()
 {
-        SPtr<Annoy> pt( new Annoy2 );
+        SPtr<Annoy> pt( new Annoy );
         printf("Count: %d\n", pt.count() );
         pt->go();
 
@@ -63,14 +47,6 @@ int main()
                         pt3->go();
 
                         beAnnoying( pt3 );
-
-                        {
-                                SPtr<Annoy2> pt4( SPtrCast<Annoy2>( pt3 ) );
-                                printf("Count: %d\n", pt4.count() );
-
-                                pt4->go2();
-                        }
-                        printf("Count: %d\n", pt.count() );
                 }
                 printf("Count: %d\n", pt.count() );
         }
diff --git a/src/tests/srvstress.cpp b/src/old/tests/srvstress.cpp
index d9a9a1c..d9a9a1c 100644
--- a/src/tests/srvstress.cpp
+++ b/src/old/tests/srvstress.cpp
diff --git a/src/tests/strhash.cpp b/src/old/tests/strhash.cpp
index f6528ca..f6528ca 100644
--- a/src/tests/strhash.cpp
+++ b/src/old/tests/strhash.cpp
diff --git a/src/tests/teltest/main.cpp b/src/old/tests/teltest/main.cpp
index 5d3ec26..5d3ec26 100644
--- a/src/tests/teltest/main.cpp
+++ b/src/old/tests/teltest/main.cpp
diff --git a/src/tests/teltest/telnetmonitor.cpp b/src/old/tests/teltest/telnetmonitor.cpp
index 65954eb..65954eb 100644
--- a/src/tests/teltest/telnetmonitor.cpp
+++ b/src/old/tests/teltest/telnetmonitor.cpp
diff --git a/src/tests/teltest/telnetmonitor.h b/src/old/tests/teltest/telnetmonitor.h
index ba5761e..ba5761e 100644
--- a/src/tests/teltest/telnetmonitor.h
+++ b/src/old/tests/teltest/telnetmonitor.h
diff --git a/src/tests/xmlreadtest.cpp b/src/old/tests/xmlreadtest.cpp
index d061810..d061810 100644
--- a/src/tests/xmlreadtest.cpp
+++ b/src/old/tests/xmlreadtest.cpp
diff --git a/src/tests/xmlrepltest.cpp b/src/old/tests/xmlrepltest.cpp
index 9667705..9667705 100644
--- a/src/tests/xmlrepltest.cpp
+++ b/src/old/tests/xmlrepltest.cpp
diff --git a/src/tests/xmlwritetest.cpp b/src/old/tests/xmlwritetest.cpp
index a22d19d..a22d19d 100644
--- a/src/tests/xmlwritetest.cpp
+++ b/src/old/tests/xmlwritetest.cpp
diff --git a/src/tests/archive.cpp b/src/tests/archive.cpp
new file mode 100644
index 0000000..2035aa6
--- /dev/null
+++ b/src/tests/archive.cpp
@@ -0,0 +1,16 @@
+#include "archive.h"
+#include "file.h"
+
+using namespace Bu;
+
+int main()
+{
+        File f("test.dat", "wb");
+        Archive ar( f, Archive::save );
+
+        std::string s("Hello there");
+        ar << s;
+
+        return 0;
+}
+
diff --git a/src/tests/atom.cpp b/src/tests/atom.cpp
new file mode 100644
index 0000000..2077bfd
--- /dev/null
+++ b/src/tests/atom.cpp
@@ -0,0 +1,25 @@
+#include "bu/atom.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+typedef struct bob
+{
+        int a, b;
+} bob;
+int main()
+{
+        Bu::Atom<int> aInt;
+        Bu::Atom<char *> aStr;
+        Bu::Atom<bob> aBob;
+
+        aBob = bob();
+        aBob->a = 5;
+
+        aStr.set("Hey there, dude");
+        aInt.set( 55 );
+        int me = aInt;
+        aInt = 12;
+        printf("%d, %d\n", aInt.get(), me );
+        printf("%s\n", aStr.get() );
+}
+
diff --git a/src/tests/bzip2.cpp b/src/tests/bzip2.cpp
new file mode 100644
index 0000000..683d3d7
--- /dev/null
+++ b/src/tests/bzip2.cpp
@@ -0,0 +1,23 @@
+#include "bu/bzip2.h"
+#include "bu/file.h"
+
+int main( int argc, char *argv[] )
+{
+        char buf[1024];
+        size_t nRead;
+
+        Bu::File f( "test.bz2", "wb" );
+        Bu::BZip2 bz2( f );
+
+        Bu::File fin( argv[1], "rb");
+
+        for(;;)
+        {
+                nRead = fin.read( buf, 1024 );
+                if( nRead > 0 )
+                        bz2.write( buf, nRead );
+                if( fin.isEOS() )
+                        break;
+        }
+}
+
diff --git a/src/tests/constsptr.cpp b/src/tests/constsptr.cpp
deleted file mode 100644
index e6f87c7..0000000
--- a/src/tests/constsptr.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-#include <stdio.h>
-#include "sptr.h"
-
-template <typename T>
-class DataBase
-{
-public:
-        DataBase():
-                _bHas(false)
-        {
-        }
-        
-        virtual ~DataBase()
-        {
-                clr();
-        }
-        
-        virtual bool has() const
-        {
-                return _bHas;
-        }
-        
-        virtual void clr()
-        {
-                _bHas = false;
-        }
-
-        virtual void set(T d)
-        {
-                _tVal = d;
-                _bHas = true;
-        }
-
-        virtual T const &get() const
-        {
-                if(!has())
-                        throw "no data";
-                return _tVal;
-        }
-
-        virtual T &get()
-        {
-                if(!has())
-                        throw "no data";
-                return _tVal;
-        }
-        
-protected:
-        bool _bHas;
-        T _tVal;
-};
-
-
-class Test
-{
-public:
-        Test(){};
-        virtual ~Test(){};
-
-        void set(int i)
-        {
-                _i = i;
-        }
-        
-        int get() const
-        {
-                return _i;
-        }
-        
-private:
-        int _i;
-};
-
-int main()
-{
-        typedef SPtr<Test> TestPtr;
-
-        TestPtr t1(new Test);
-        t1->set(42);
-
-        printf("t1: %d.\n", t1->get());
-
-        const TestPtr t2 = t1;
-
-        printf("t2: %d.\n", t2->get());
-
-        typedef DataBase<const TestPtr> DBTP;
-
-        DBTP db;
-        db.set(t1);
-
-        printf("dbt1: %d.\n", db.get()->get());
-}
-
diff --git a/src/tests/constsptr2.cpp b/src/tests/constsptr2.cpp
deleted file mode 100644
index 8ccb20c..0000000
--- a/src/tests/constsptr2.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "sptr.h"
-
-void nonsptr()
-{
-        int a = 5;
-        int b = 10;
-        const int *p = &a;
-        p = &b;
-        printf("p = %d\n", (*p) );
-        //(*p)++;
-}
-
-void sptr()
-{
-        int a = 5;
-        int b = 10;
-        const SPtr<int> p = new int(a);
-        p = new int(b);
-        printf("p = %d\n", (*p) );
-        //(*p)++;
-}
-
-int main()
-{
-        printf("Non-sptr:\n");
-        nonsptr();
-        printf("sptr:\n");
-        sptr();
-}
-
diff --git a/src/tests/fstring.cpp b/src/tests/fstring.cpp
index 271738c..48dfc5f 100644
--- a/src/tests/fstring.cpp
+++ b/src/tests/fstring.cpp
@@ -1,9 +1,28 @@
-#include "hash.h"
-#include "fstring.h"
+#include "bu/hash.h"
+#include "bu/fstring.h"
+#include <sys/time.h>
+#include <string>
 
-FString genThing()
+#ifndef WIN32
+inline double getTime()
 {
-        FString bob;
+        struct timeval tv;
+        gettimeofday( &tv, NULL );
+        return ((double)tv.tv_sec) + ((double)tv.tv_usec/1000000.0);
+}
+#else
+#include "windows.h"
+#include "winbase.h"
+inline double getTime()
+{
+       uint32_t t = (uint32_t) GetTickCount();
+       return (double) t / 1000.0;
+}
+#endif
+
+Bu::FString genThing()
+{
+        Bu::FString bob;
         bob.append("ab ");
         bob += "cd ";
         bob += "efg";
@@ -12,20 +31,91 @@ FString genThing()
         return bob;
 }
 
-void thing( FString str )
+void thing( Bu::FString str )
 {
         printf("Hey:  %s\n", str.c_str() );
 }
 
+void copyfunc( std::string temp )
+{
+        temp += "Hi";
+}
+
+void copyfunc( Bu::FString temp )
+{
+        temp += "Hi";
+}
+
+void doTimings()
+{
+        Bu::FString fs1, fs2;
+        std::string ss1, ss2;
+        double dStart, dEnd, tfs1, tfs2, tfs3, tss1, tss2, tss3;
+        int nChars = 500000, nChunks=5000, nCopies=5000000, nChunkSize=1024*4;
+        char *buf = new char[nChunkSize];
+        memset( buf, '!', nChunkSize );
+
+        printf("Timing Bu::FString single chars...\n");
+        dStart = getTime();
+        for( int j = 0; j < nChars; j++ ) fs1 += (char)('a'+(j%26));
+        fs1.getStr();
+        dEnd = getTime();
+        tfs1 = dEnd-dStart;
+
+        printf("Timing std::string single chars...\n");
+        dStart = getTime();
+        for( int j = 0; j < nChars; j++ ) ss1 += (char)('a'+(j%26));
+        ss1.c_str();
+        dEnd = getTime();
+        tss1 = dEnd-dStart;
+
+        printf("Timing Bu::FString %d char chunks...\n", nChunkSize);
+        dStart = getTime();
+        for( int j = 0; j < nChunks; j++ ) fs2.append(buf, nChunkSize);
+        fs2.getStr();
+        dEnd = getTime();
+        tfs2 = dEnd-dStart;
+
+        printf("Timing std::string %d char chunks...\n", nChunkSize);
+        dStart = getTime();
+        for( int j = 0; j < nChunks; j++ ) ss2.append(buf, nChunkSize);
+        ss2.c_str();
+        dEnd = getTime();
+        tss2 = dEnd-dStart;
+
+        fs2 = "Hello there.";
+        ss2 = "Hello there.";
+        printf("Timing Bu::FString copies...\n");
+        dStart = getTime();
+        for( int j = 0; j < nCopies; j++ ) Bu::FString stmp = fs2;
+        dEnd = getTime();
+        tfs3 = dEnd-dStart;
+
+        printf("Timing std::string copies...\n");
+        dStart = getTime();
+        for( int j = 0; j < nCopies; j++ ) std::string stpm = ss2;
+        dEnd = getTime();
+        tss3 = dEnd-dStart;
+
+        printf(
+                "Results:       singles:        chunks:         copies:\n"
+                "Bu::FString    %10.2f/s   %10.2f/s   %10.2f/s\n"
+                "std::string    %10.2f/s   %10.2f/s   %10.2f/s\n",
+                nChars/tfs1, nChunks/tfs2, nCopies/tfs3,
+                nChars/tss1, nChunks/tss2, nCopies/tss3 );
+
+        delete[] buf;
+}
+
 #define pem printf("---------\n%08X: %s\n%08X: %s\n", (unsigned int)str.c_str(), str.c_str(), (unsigned int)str2.c_str(), str2.c_str() );
 int main( int argc, char *argv )
 {
-        FString str("th");
+        Bu::FString str("th");
 
         str.prepend("Hello ");
         str.append("ere.");
 
-        FString str2( str );
+        Bu::FString str2( str );
         pem;
         str += "  What's up?";
         pem;
@@ -43,6 +133,8 @@ int main( int argc, char *argv )
         thing( str2 );
         thing("test.");
         
-        printf("%d == %d\n", __calcHashCode( str ), __calcHashCode( str.c_str() ) );
+        printf("%d == %d\n", Bu::__calcHashCode( str ), Bu::__calcHashCode( str.c_str() ) );
+
+        doTimings();
 }
 
diff --git a/src/tests/hash.cpp b/src/tests/hash.cpp
index 2fc6968..73cfb27 100644
--- a/src/tests/hash.cpp
+++ b/src/tests/hash.cpp
@@ -1,116 +1,24 @@
-#include "hash.h"
-#include "staticstring.h"
+#include "bu/hash.h"
+#include "bu/sptr.h"
 
-int main()
+typedef struct Bob
 {
-        const char *names[]={
-                "Homer the Great",
-                "And Maggie Makes Three",
-                "Bart's Comet",
-                "Homie The Clown",
-                "Bart Vs Australia",
-                "Homer vs Patty and Selma",
-                "A star is burns",
-                "Lisa's Wedding",
-                "Two Dozen and One Greyhounds",
-                "The PTA Disbands",
-                "Round Springfield",
-                "The Springfield connection",
-                "Lemon of Troy",
-                "Who Shot Mr. Burns (Pt. 1)",
-                "Who Shot Mr. Burns (pt. 2)",
-                "Radioactive Man",
-                "Home Sweet Homediddly-dum-doodly",
-                "Bart Sells His Soul",
-                "Lisa the Vegetarian",
-                "Treehouse of horror VI",
-                "King Size Homer",
-                "Mother Simpson",
-                "Sideshow Bob's Last Gleaming",
-                "The Simpson's 138th Show Spectacular",
-                "Marge Be Not Proud",
-                "Team Homer",
-                "Two Bad Neighbors",
-                "Scenes From the Class Struggle in Springfield",
-                "Bart the Fink",
-                "Lisa the Iconoclast",
-                "Homer the Smithers",
-                "The Day the Violence Died",
-                "A Fish Called Selma",
-                "Bart on the road",
-                "22 Short Films about Springfield",
-                "The Curse of the Flying Hellfish",
-                "Much Apu about Nothing",
-                "Homerpalooza",
-                "The Summer of 4 Ft 2",
-                "Treehouse of Horror VII",
-                "You Only Move Twice",
-                "The Homer They Fall",
-                "Burns Baby Burns",
-                "Bart After Dark",
-                "A Millhouse Divided",
-                "Lisas Date With Destiny",
-                "Hurricane Neddy",
-                "The Mysterious Voyage of Our Homer",
-                "The Springfield Files",
-                "The Twisted World of Marge Simpson",
-                "Mountain of Madness",
-                NULL
-        };
-
-        Hash<const char *, int> sTest;
-
-        printf("Inserting\n-------------------\n\n");
-        for( int j = 0; j < 33; j++ )
-        {
-                sTest[names[j]] = j;
-        }
-        
-        printf("Test1: %d, Test2: %d\n", sTest.has("Lemon of Troy"), sTest.has(std::string("Lemon of Troy").c_str() ) );
-
-        sTest.has(std::string("Lemon of Troy").c_str() );
-
-        printf("Getting\n-------------------\n\n");
-
-        sTest.erase("Homer the Great");
-        sTest["Bart's Comet"].erase();
+        int nID;
+} Bob;
 
-        for( Hash<const char *, int>::iterator i = sTest.begin();
-                 i != sTest.end(); i++ )
-        {
-                Hash<const char *, int>::iterator j = i;
-                printf("%d: %s\n", (*j).second, (*j).first );
-        }
-
-        printf("Testing\n-------------------\n\n");
-        for( int j = 0; j < 33; j++ )
+int main()
+{
+        Bu::Hash<int, Bu::SPtr<const Bob> > lb;
+        for( int j = 0; j < 10; j++ )
         {
-                if( sTest.has(names[j]) )
-                {
-                        if( sTest[names[j]] != j )
-                        {
-                                printf("'%s' should be %d, is %d\n",
-                                        names[j], j,
-                                        sTest[names[j]].value()
-                                        );
-                        }
-                }
-                else
-                {
-                        printf("Missing element %d, '%s'\n", j, names[j] );
-                }
+                Bob *b = new Bob;
+                b->nID = j;
+                lb.insert( j, b );
         }
 
-        printf("Clearing\n-------------------\n\n");
-
-        sTest.clear();
-        
-        for( Hash<const char *, int>::iterator i = sTest.begin();
-                 i != sTest.end(); i++ )
+        for( int j = 0; j < 10; j++ )
         {
-                Hash<const char *, int>::iterator j = i;
-                printf("%d: %s\n", (*j).second, (*j).first );
+                printf("%d\n", lb[j].value()->nID );
         }
-
 }
 
diff --git a/src/tests/itoqueue1.cpp b/src/tests/itoqueue1.cpp
new file mode 100644
index 0000000..f73f4d3
--- /dev/null
+++ b/src/tests/itoqueue1.cpp
@@ -0,0 +1,110 @@
+#include <string>
+#include "bu/ito.h"
+#include "bu/itoqueue.h"
+
+class Reader : public Bu::Ito
+{
+public:
+        Reader( Bu::ItoQueue<std::string *> &q, int id ) :
+                q( q ),
+                id( id )
+        {
+        }
+
+        void *run()
+        {
+                for( int i = 0; i < 10; i++ )
+                {
+                        std::string *pStr = q.dequeue( true );
+                        if( pStr == NULL )
+                        {
+                                printf("Null received...\n");
+                        }
+                        else
+                        {
+                                printf("[%d] read:  %s\n", id, pStr->c_str() );
+                                delete pStr;
+                        }
+                        usleep( (int)(((double)rand())/((double)RAND_MAX)*2000000.0) );
+                }
+
+                return NULL;
+        }
+
+private:
+        Bu::ItoQueue<std::string *> &q;
+        int id;
+};
+
+class Writer : public Bu::Ito
+{
+public:
+        Writer( Bu::ItoQueue<std::string *> &q, int id, const char *strbase ) :
+                q( q ),
+                strbase( strbase ),
+                id( id )
+        {
+        }
+
+        void *run()
+        {
+                for( int i = 0; i < 11; i++ )
+                {
+                        usleep( (int)(((double)rand())/((double)RAND_MAX)*2000000.0) );
+                        q.enqueue( new std::string( strbase ) );
+                        printf("[%d] write: %s\n", id, strbase );
+                }
+
+                return NULL;
+        }
+
+private:
+        Bu::ItoQueue<std::string *> &q;
+        const char *strbase;
+        int id;
+};
+
+int main()
+{
+        Writer *wr[5];
+        Reader *rd[5];
+        const char bob[][7]={
+                {"Test 1"},
+                {"Test 2"},
+                {"Test 3"},
+                {"Test 4"},
+                {"Test 5"}
+        };
+
+        Bu::ItoQueue<std::string *> q;
+
+        for( int j = 0; j < 5; j++ )
+        {
+                wr[j] = new Writer( q, j, bob[j] );
+                rd[j] = new Reader( q, j );
+        }
+
+        for( int j = 0; j < 5; j++ )
+        {
+                rd[j]->start();
+        }
+
+        for( int j = 0; j < 5; j++ )
+        {
+                wr[j]->start();
+        }
+
+        for( int j = 0; j < 5; j++ )
+        {
+                rd[j]->join();
+        }
+
+        for( int j = 0; j < 5; j++ )
+        {
+                delete wr[j];
+                delete rd[j];
+        }
+
+        return 0;
+}
+
diff --git a/src/tests/itoqueue2.cpp b/src/tests/itoqueue2.cpp
new file mode 100644
index 0000000..f4b5e19
--- /dev/null
+++ b/src/tests/itoqueue2.cpp
@@ -0,0 +1,83 @@
+#include <string>
+#include "bu/ito.h"
+#include "bu/itoqueue.h"
+#include <errno.h>
+
+class Reader : public Bu::Ito
+{
+public:
+        Reader( Bu::ItoQueue<std::string *> &q, int id ) :
+                q( q ),
+                id( id )
+        {
+        }
+
+        void *run()
+        {
+                for( int i = 0; i < 10; i++ )
+                {
+                        std::string *pStr = q.dequeue( 0, 500000 );
+                        if( pStr == NULL )
+                        {
+                                printf("Null received...\n");
+                                i--;
+                        }
+                        else
+                        {
+                                printf("[%d] read:  %s\n", id, pStr->c_str() );
+                                delete pStr;
+                        }
+                }
+
+                return NULL;
+        }
+
+private:
+        Bu::ItoQueue<std::string *> &q;
+        int id;
+};
+
+class Writer : public Bu::Ito
+{
+public:
+        Writer( Bu::ItoQueue<std::string *> &q, int id, const char *strbase ) :
+                q( q ),
+                strbase( strbase ),
+                id( id )
+        {
+        }
+
+        void *run()
+        {
+                for( int i = 0; i < 11; i++ )
+                {
+                        sleep( 2 );
+                        printf("[%d] write: %s\n", id, strbase );
+                        q.enqueue( new std::string( strbase ) );
+                }
+
+                return NULL;
+        }
+
+private:
+        Bu::ItoQueue<std::string *> &q;
+        const char *strbase;
+        int id;
+};
+
+int main()
+{
+        printf("ETIMEDOUT: %d\n", ETIMEDOUT );
+        Bu::ItoQueue<std::string *> q;
+        Writer wr( q, 0, "writer" );
+        Reader rd( q, 0 );
+
+        rd.start();
+        wr.start();
+
+        rd.join();
+        wr.join();
+
+        return 0;
+}
+
diff --git a/src/tests/list.cpp b/src/tests/list.cpp
new file mode 100644
index 0000000..12807a5
--- /dev/null
+++ b/src/tests/list.cpp
@@ -0,0 +1,53 @@
+#include "bu/list.h"
+#include <list>
+
+typedef struct Bob
+{
+        int nID;
+} Bob;
+
+int main()
+{
+        Bu::List<int> l;
+
+        l.append( 0 );
+
+        for( int j = 3; j <= 21; j += 3 )
+        {
+                l.append( j );
+                l.prepend( -j );
+        }
+
+        for( Bu::List<int>::iterator i = l.begin(); i != l.end(); i++ )
+        {
+                printf("%d ", *i );
+        }
+        printf("\n");
+        for( Bu::List<int>::iterator i = l.begin(); i != l.end(); i++ )
+        {
+                l.erase( i );
+                if( i != l.end() )
+                        printf("%d ", *i );
+        }
+
+        printf("\n\n");
+
+        Bu::List<Bob> lb;
+        for( int j = 0; j < 10; j++ )
+        {
+                Bob b;
+                b.nID = j;
+                lb.append( b );
+        }
+
+        const Bu::List<Bob> rb = lb;
+
+        for( Bu::List<Bob>::const_iterator i = rb.begin(); i != rb.end(); i++ )
+        {
+                //i->nID += 2;
+                //(*i).nID = 4;
+                printf("%d ", i->nID );
+        }
+        printf("\n\n");
+}
+
diff --git a/src/tests/logger.cpp b/src/tests/logger.cpp
new file mode 100644
index 0000000..290f479
--- /dev/null
+++ b/src/tests/logger.cpp
@@ -0,0 +1,28 @@
+#include "bu/logger.h"
+#include <errno.h>
+#include <stdlib.h>
+
+class Thing
+{
+        public:
+                Thing()
+                {
+                        lineLog( 2, "Want a thing?");
+                }
+
+                void go( int i )
+                {
+                        lineLog( 1, "GO!!!!");
+                }
+};
+
+int main()
+{
+        setLogLevel( 4 );
+        setLogFormat("%L: %y-%02m-%02d %h:%02M:%02s %f:%l:%F: %t");
+        lineLog( 5, "Hey, error: %s", strerror( errno ) );
+
+        Thing gh;
+        gh.go( 6);
+}
+
diff --git a/src/tests/ringbuffer.cpp b/src/tests/ringbuffer.cpp
new file mode 100644
index 0000000..259ec1f
--- /dev/null
+++ b/src/tests/ringbuffer.cpp
@@ -0,0 +1,29 @@
+#include "bu/ringbuffer.h"
+#include <stdlib.h>
+
+int main()
+{
+        Bu::RingBuffer<uint32_t> ibuf( 10 );
+
+        for( int k = 0; k < 2; k++ )
+        {
+                int j = 1;
+                for(; j < 7; j++ )
+                {
+                        ibuf.enqueue( j );
+                }
+
+                for(; j < 20; j++ )
+                {
+                        ibuf.enqueue( j );
+                        printf("- %d\n", ibuf.dequeue() );
+                }
+
+                for(;;)
+                {
+                        if( ibuf.isEmpty() ) break;
+                        printf(". %d\n", ibuf.dequeue() );
+                }
+        }
+}
+
diff --git a/src/tests/taf.cpp b/src/tests/taf.cpp
new file mode 100644
index 0000000..e3da120
--- /dev/null
+++ b/src/tests/taf.cpp
@@ -0,0 +1,24 @@
+#include "bu/tafreader.h"
+#include "bu/tafwriter.h"
+#include "bu/file.h"
+
+int main()
+{
+        Bu::File f("test.taf", "rb");
+        Bu::TafReader tr( f );
+
+        Bu::TafGroup *pGroup = tr.readGroup();
+
+        const Bu::TafGroup *pStats = pGroup->getChild("stats");
+        printf("%s\n", pStats->getName().getStr() );
+        printf("  str = %s\n", pStats->getProperty("str").getStr() );
+
+        {
+                Bu::File fo("out.taf", "wb");
+                Bu::TafWriter tw( fo );
+                tw.writeGroup( pGroup );
+        }
+
+        delete pGroup;
+}
+