The core of myriad is now thread-safe. It could use a little work on multiple

streams accessing the same blocks at the same time.  Right now it's safe, but
a little strange, since both streams work from seperate buffers.  Maybe that's
ok, but it still needs some more investigation.

I want to remove the BitString stuff entirely, it turns out it's the slowest
part, which, upon actually looking at the code is completely obvious.  This
change shouldn't change the API at all, just make adding blocks to streams much,
much faster.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/stable/myriad.h b/src/stable/myriad.h
index 3382ab5..14e8c73 100644
--- a/src/stable/myriad.h
+++ b/src/stable/myriad.h
@@ -13,6 +13,7 @@
 #include "bu/exceptionbase.h"
 #include "bu/array.h"
 #include "bu/hash.h"
+#include "bu/mutex.h"
 
 namespace Bu
 {
@@ -153,6 +154,13 @@ namespace Bu
                  * depending on weather or not it's a Myriad stream.  This will throw
                  * an exception if the stream is empty, or is not random access.
                  */
+                static bool isMyriad( Bu::Stream &sStore, uint8_t &uVer );
+                
+                /**
+                 * Read the first few bytes from the given stream and return true/false
+                 * depending on weather or not it's a Myriad stream.  This will throw
+                 * an exception if the stream is empty, or is not random access.
+                 */
                 static bool isMyriad( Bu::Stream &sStore );
 
                 const Bu::BitString &getBlocksUsed() const;
@@ -216,6 +224,9 @@ namespace Bu
                 typedef Bu::Hash<int, Block *> BlockHash;
                 BlockHash hActiveBlocks;
                 bool bHeaderChanged;
+
+                Bu::Mutex mHeader;
+                Bu::Mutex mActiveBlocks;
         };
 };