3 files changed, 133 insertions, 49 deletions

diff --git a/src/fstring.h b/src/fstring.h
index f738f63..43033b8 100644
--- a/src/fstring.h
+++ b/src/fstring.h
@@ -7,6 +7,8 @@
 #include "archive.h"
 #include "hash.h"
 
+#define min( a, b )  ((a<b)?(a):(b))
+
 namespace Bu
 {
         template< typename chr >
@@ -131,7 +133,7 @@ namespace Bu
                         appendChunk( pNew );
                 }
 
-                void append( const chr cData )
+                void append( const chr &cData )
                 {
                         append( &cData, 1 );
                 }
diff --git a/src/old/tests/fstring.cpp b/src/old/tests/fstring.cpp
deleted file mode 100644
index 271738c..0000000
--- a/src/old/tests/fstring.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "hash.h"
-#include "fstring.h"
-
-FString genThing()
-{
-        FString bob;
-        bob.append("ab ");
-        bob += "cd ";
-        bob += "efg";
-
-    printf("---bob------\n%08X: %s\n", (unsigned int)bob.c_str(), bob.c_str() );
-        return bob;
-}
-
-void thing( FString str )
-{
-        printf("Hey:  %s\n", str.c_str() );
-}
-
-#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");
-
-        str.prepend("Hello ");
-        str.append("ere.");
-
-        FString str2( str );
-        pem;
-        str += "  What's up?";
-        pem;
-        str2 += "  How are you?";
-        pem;
-        str = str2;
-        pem;
-
-        str2 = genThing();
-        pem;
-
-        str = str2;
-        pem;
-
-        thing( str2 );
-        thing("test.");
-        
-        printf("%d == %d\n", __calcHashCode( str ), __calcHashCode( str.c_str() ) );
-}
-
diff --git a/src/tests/fstring.cpp b/src/tests/fstring.cpp
new file mode 100644
index 0000000..d600be6
--- /dev/null
+++ b/src/tests/fstring.cpp
@@ -0,0 +1,130 @@
+#include "bu/hash.h"
+#include "bu/fstring.h"
+#include <sys/time.h>
+#include <string>
+
+inline double getTime()
+{
+        struct timeval tv;
+        gettimeofday( &tv, NULL );
+        return ((double)tv.tv_sec) + ((double)tv.tv_usec/1000000.0);
+}
+
+Bu::FString genThing()
+{
+        Bu::FString bob;
+        bob.append("ab ");
+        bob += "cd ";
+        bob += "efg";
+
+    printf("---bob------\n%08X: %s\n", (unsigned int)bob.c_str(), bob.c_str() );
+        return bob;
+}
+
+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 )
+{
+        Bu::FString str("th");
+
+        str.prepend("Hello ");
+        str.append("ere.");
+
+        Bu::FString str2( str );
+        pem;
+        str += "  What's up?";
+        pem;
+        str2 += "  How are you?";
+        pem;
+        str = str2;
+        pem;
+
+        str2 = genThing();
+        pem;
+
+        str = str2;
+        pem;
+
+        thing( str2 );
+        thing("test.");
+        
+        printf("%d == %d\n", Bu::__calcHashCode( str ), Bu::__calcHashCode( str.c_str() ) );
+
+        doTimings();
+}
+