3 files changed, 28 insertions, 20 deletions

diff --git a/src/unstable/myriadcache.h b/src/unstable/myriadcache.h
index d6842a5..f71f9b5 100644
--- a/src/unstable/myriadcache.h
+++ b/src/unstable/myriadcache.h
@@ -86,8 +86,8 @@ namespace Bu
         {
             Bu::ReadWriteMutex::WriteLocker wl( rwStore );
             {
-                Bu::MyriadStream ms = mStore.create( Bu::Myriad::Create );
-                hIndex.insert( o->getKey(), ms.getId() );
+                Bu::Myriad::StreamId id = mStore.allocate();
+                hIndex.insert( o->getKey(), id );
             }
             _save( o );
 
diff --git a/src/unstable/myriadfs.cpp b/src/unstable/myriadfs.cpp
index ab9ca74..f748a53 100644
--- a/src/unstable/myriadfs.cpp
+++ b/src/unstable/myriadfs.cpp
@@ -8,6 +8,7 @@
 #include "bu/config.h"
 #include "bu/myriadfs.h"
 #include "bu/myriadstream.h"
+#include "bu/mutexlocker.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -107,6 +108,7 @@ Bu::MyriadFs::~MyriadFs()
 
 void Bu::MyriadFs::stat( const Bu::String &sPath, Bu::MyriadFs::Stat &rBuf )
 {
+    Bu::MutexLocker lLock( mAccess );
     int32_t iParent;
     int32_t iNode = lookupInode( sPath, iParent );
     Bu::MyriadStream is = mStore.open( 2, Bu::Myriad::Read );
@@ -116,6 +118,7 @@ void Bu::MyriadFs::stat( const Bu::String &sPath, Bu::MyriadFs::Stat &rBuf )
 Bu::MyriadStream Bu::MyriadFs::open( const Bu::String &sPath, int iMode,
         uint16_t uPerms )
 {
+    Bu::MutexLocker lLock( mAccess );
     int32_t iParent = -1;
     int32_t iNode;
     try
@@ -164,6 +167,7 @@ void Bu::MyriadFs::create( const Bu::String &sPath, uint16_t iPerms,
 void Bu::MyriadFs::create( const Bu::String &sPath, uint16_t iPerms,
         uint32_t uSpecial )
 {
+    Bu::MutexLocker lLock( mAccess );
     int32_t iParent = -1;
 //    int32_t iNode;
     try
@@ -200,6 +204,7 @@ void Bu::MyriadFs::mkDir( const Bu::String &sPath, uint16_t iPerms )
 void Bu::MyriadFs::mkSymLink( const Bu::String &sTarget,
         const Bu::String &sPath )
 {
+    Bu::MutexLocker lLock( mAccess );
     int32_t iParent = -1;
     int32_t iNode;
     try
@@ -232,6 +237,7 @@ void Bu::MyriadFs::mkSymLink( const Bu::String &sTarget,
 void Bu::MyriadFs::mkHardLink( const Bu::String &sTarget,
         const Bu::String &sPath )
 {
+    Bu::MutexLocker lLock( mAccess );
     int32_t iParent = -1;
     int32_t iNode;
     
@@ -267,6 +273,7 @@ void Bu::MyriadFs::mkHardLink( const Bu::String &sTarget,
 
 Bu::String Bu::MyriadFs::readSymLink( const Bu::String &sPath )
 {
+    Bu::MutexLocker lLock( mAccess );
     int32_t iParent = -1;
     int32_t iNode;
     iNode = lookupInode( sPath, iParent );
@@ -279,6 +286,7 @@ Bu::String Bu::MyriadFs::readSymLink( const Bu::String &sPath )
 
 Bu::MyriadFs::Dir Bu::MyriadFs::readDir( const Bu::String &sPath )
 {
+    Bu::MutexLocker lLock( mAccess );
     int32_t iParent = -1;
     int32_t iNode = lookupInode( sPath, iParent );
     return readDir( iNode );
@@ -287,6 +295,7 @@ Bu::MyriadFs::Dir Bu::MyriadFs::readDir( const Bu::String &sPath )
 void Bu::MyriadFs::setTimes( const Bu::String &sPath, int64_t iATime,
         int64_t iMTime )
 {
+    Bu::MutexLocker lLock( mAccess );
     int32_t iParent = -1;
     int32_t iNode;
 
@@ -297,6 +306,7 @@ void Bu::MyriadFs::setTimes( const Bu::String &sPath, int64_t iATime,
 
 void Bu::MyriadFs::unlink( const Bu::String &sPath )
 {
+    Bu::MutexLocker lLock( mAccess );
     int32_t iParent = -1;
 //  int32_t iNode;
 
@@ -352,6 +362,7 @@ void Bu::MyriadFs::unlink( const Bu::String &sPath )
 
 void Bu::MyriadFs::setFileSize( const Bu::String &sPath, int32_t iSize )
 {
+    Bu::MutexLocker lLock( mAccess );
     int32_t iParent = -1;
     int32_t iNode;
     iNode = lookupInode( sPath, iParent );
@@ -361,6 +372,7 @@ void Bu::MyriadFs::setFileSize( const Bu::String &sPath, int32_t iSize )
 
 void Bu::MyriadFs::rename( const Bu::String &sFrom, const Bu::String &sTo )
 {
+    Bu::MutexLocker lLock( mAccess );
     mkHardLink( sFrom, sTo );
     unlink( sFrom );
 }
@@ -572,27 +584,17 @@ int32_t Bu::MyriadFs::allocInode( uint16_t uPerms, uint32_t uSpecial )
             {
                 case typeRegFile:
                 case typeSymLink:
-                    {
-                        Bu::MyriadStream ms = mStore.create(
-                            Bu::Myriad::Create
-                            );
-                        rs.uStreamIndex = ms.getId();
-                    }
+                    rs.uStreamIndex = mStore.allocate();
                     break;
                 
                 case typeDir:
-                    {
-                        Bu::MyriadStream ms = mStore.create(
-                            Bu::Myriad::Create
-                            );
-                        rs.uStreamIndex = ms.getId();
-                    }
 //                    sio << "Creating directory node, storage: "
 //                        << rs.uStreamIndex << sio.nl;
                     {
-                        Bu::MyriadStream msDir = mStore.open(
-                            rs.uStreamIndex, Bu::Myriad::Write
+                        Bu::MyriadStream msDir = mStore.create(
+                            Bu::Myriad::Write
                             );
+                        rs.uStreamIndex = msDir.getId();
                         uint32_t uSize = 0;
                         msDir.write( &uSize, 4 );
                     }
diff --git a/src/unstable/myriadfs.h b/src/unstable/myriadfs.h
index ff14292..e3008bc 100644
--- a/src/unstable/myriadfs.h
+++ b/src/unstable/myriadfs.h
@@ -11,7 +11,7 @@
 #include <sys/types.h>
 
 #include "bu/myriad.h"
-#include "bu/readwritemutex.h"
+#include "bu/debugmutex.h"
 
 namespace Bu
 {
@@ -108,7 +108,7 @@ namespace Bu
             Truncate    = 0x08, ///< Truncate file if it does exist
             Append      = 0x10, ///< Always append on every write
             NonBlock    = 0x20, ///< Open file in non-blocking mode
-            Exclusive   = 0x44, ///< Create file, if it exists then fail
+            Exclusive   = 0x40, ///< Create file, if it exists then fail
 
             // Helpful mixes
             ReadWrite   = 0x03, ///< Open for reading and writing
@@ -172,7 +172,13 @@ namespace Bu
         typedef Bu::Hash<int32_t, int32_t> NodeIndex;
 
     private:
+        /**
+         * Lookup inode.
+         */
         int32_t lookupInode( const Bu::String &sPath, int32_t &iParent );
+        /**
+         * Lookup inode.
+         */
         int32_t lookupInode( Bu::String::const_iterator iStart,
                 int32_t iNode, int32_t &iParent );
         void readInode( int32_t iNode, RawStat &rs, MyriadStream &rIs );
@@ -190,12 +196,12 @@ namespace Bu
         void setTimes( int32_t iNode, int64_t iATime, int64_t iMTime );
         void destroyNode( int32_t iNode );
 
-        Bu::String filePart( const Bu::String &sPath );
+        static Bu::String filePart( const Bu::String &sPath );
 
     private:
         Bu::Stream &rStore;
         Bu::Myriad mStore;
-        Bu::ReadWriteMutex mNodeIndex;
+        Bu::DebugMutex mAccess;
         NodeIndex hNodeIndex;
         int32_t iUser;
         int32_t iGroup;