6 files changed, 98 insertions, 52 deletions

diff --git a/src/unstable/bitstring.cpp b/src/unstable/bitstring.cpp
index 21c1316..b80c073 100644
--- a/src/unstable/bitstring.cpp
+++ b/src/unstable/bitstring.cpp
@@ -209,7 +209,7 @@ void Bu::BitString::flipBit( long iBit )
     caData[iBit/8] ^= (1<<(iBit%8));
 }
 
-bool Bu::BitString::getBit( long iBit )
+bool Bu::BitString::getBit( long iBit ) const
 {
     if( iBit >= iBits || iBit < 0 ) return false;
     if( (caData[iBit/8] & (1<<(iBit%8))) == 0 )
@@ -224,7 +224,7 @@ long Bu::BitString::getBitLength()
     return iBits;
 }
 
-long Bu::BitString::getSize()
+long Bu::BitString::getSize() const
 {
     return iBits;
 }
@@ -311,6 +311,14 @@ void Bu::BitString::clear()
     }
 }
 
+void Bu::BitString::fill()
+{
+    if( caData != NULL )
+    {
+        memset( caData, 0xff, iBytes );
+    }
+}
+
 bool Bu::BitString::setBitLength( long iLength, bool bClear )
 {
     return setSize( iLength, bClear );
diff --git a/src/unstable/bitstring.h b/src/unstable/bitstring.h
index afc22fb..70ba822 100644
--- a/src/unstable/bitstring.h
+++ b/src/unstable/bitstring.h
@@ -88,7 +88,7 @@ namespace Bu
          *@param iBit The index of the bit to test.
          *@returns True for a 1, false for a 0.
          */
-        bool getBit( long iBit );
+        bool getBit( long iBit ) const;
 
         /**
          * Inverts the entire BitString, in effect this calls flipBit on every
@@ -106,7 +106,7 @@ namespace Bu
         DEPRECATED
         long getBitLength();
 
-        long getSize();
+        long getSize() const;
 
         /**
          * Sets the entire BitString to zeros, but it does it very quickly.
@@ -115,6 +115,12 @@ namespace Bu
         void clear();
 
         /**
+         * Sets the entire BitString to ones, but it does it very quickly.
+         * This operation runs in O(N).
+         */
+        void fill();
+
+        /**
          * Gets another BitString that is autonomous of the current one
          * (contains a copy of the memory, not a pointer) and contains a subset
          * of the data in the current BitString.  This is an inclusive
diff --git a/src/unstable/cachebase.h b/src/unstable/cachebase.h
index ec73ede..830f5fe 100644
--- a/src/unstable/cachebase.h
+++ b/src/unstable/cachebase.h
@@ -32,11 +32,15 @@ namespace Bu
             bDeleted( false ),
             pObject( pObject )
         {
+            //Bu::println("CacheEntry::CacheEntry: registering pObject (0x%1)").
+            //    arg( reinterpret_cast<ptrdiff_t>(pObject), Bu::Fmt::hex() );
         }
 
         virtual ~CacheEntry()
         {
             mEntry.lock();
+            //Bu::println("CacheEntry::~CacheEntry: deleting pObject (0x%1)").
+            //    arg( reinterpret_cast<ptrdiff_t>(pObject), Bu::Fmt::hex() );
             delete pObject;
             mEntry.unlock();
         }
@@ -497,7 +501,7 @@ namespace Bu
                 if( pEnt->iRefCount == 0 )
                 {
                     pEnt->mEntry.unlock();
-                    delete pEnt->pObject;
+                    //delete pEnt->pObject;
                     delete pEnt;
                 }
                 else
@@ -529,7 +533,7 @@ namespace Bu
                     pEnt->mEntry.unlock();
                     throw Bu::ExceptionBase( Bu::String("Cache entry %1 cannot be erased, there are %2 active references.").arg( key ).arg( iCount ).end().getStr() );
                 }
-                delete pEnt->pObject;
+                //delete pEnt->pObject;
                 delete pEnt;
                 hCacheEntry.erase( key );
             }
@@ -559,7 +563,7 @@ namespace Bu
         {
             if( pEnt->isReadyForCleanup() )
             {
-                delete pEnt->pObject;
+                //delete pEnt->pObject;
                 delete pEnt;
             }
         }
diff --git a/src/unstable/myriadcache.h b/src/unstable/myriadcache.h
index 24002b0..289ab05 100644
--- a/src/unstable/myriadcache.h
+++ b/src/unstable/myriadcache.h
@@ -28,7 +28,9 @@ namespace Bu
             try
             {
                 Bu::ReadWriteMutex::ReadLocker l( rwStore );
-                Bu::MyriadStream ms = mStore.openStream( 1 );
+                Bu::MyriadStream ms = mStore.open(
+                    1, Bu::Myriad::WriteNew|Bu::Myriad::Read
+                    );
                 Bu::Archive ar( ms, Bu::Archive::load );
                 uint8_t uVer;
                 ar >> uVer;
@@ -41,10 +43,15 @@ namespace Bu
             }
             catch(...)
             {
-                if( mStore.createStreamWithId( 1 ) != 1 )
+                try
+                {
+                    mStore.open( 1, Bu::Myriad::Create|Bu::Myriad::ReadWrite );
+                    _sync();
+                }
+                catch(...)
+                {
                     throw Bu::ExceptionBase("Error creating index stream.");
-
-                _sync();
+                }
             }
         }
 
@@ -78,7 +85,10 @@ namespace Bu
         virtual void _create( const obtype *o )
         {
             Bu::ReadWriteMutex::WriteLocker wl( rwStore );
-            hIndex.insert( o->getKey(), mStore.createStream() );
+            {
+                Bu::Myriad::StreamId id = mStore.allocate();
+                hIndex.insert( o->getKey(), id );
+            }
             _save( o );
 
             bStructureChanged = true;
@@ -87,7 +97,7 @@ namespace Bu
         virtual void _erase( const keytype &k )
         {
             Bu::ReadWriteMutex::WriteLocker wl( rwStore );
-            mStore.deleteStream( hIndex.get( k ) );
+            mStore.erase( hIndex.get( k ) );
             hIndex.erase( k );
 
             bStructureChanged = true;
@@ -98,13 +108,13 @@ namespace Bu
             const keytype &k
             )
         {
-            Bu::MyriadStream ms = mStore.openStream( hIndex.get( k ) );
+            Bu::MyriadStream ms = mStore.open( hIndex.get( k ), Bu::Myriad::Read );
             return _cacheObjectLoad<keytype, obtype>( initObj, k, ms );
         }
 
         virtual void _save( const obtype *o )
         {
-            Bu::MyriadStream ms = mStore.openStream( hIndex.get( o->getKey() ) );
+            Bu::MyriadStream ms = mStore.open( hIndex.get( o->getKey() ), Bu::Myriad::WriteNew );
             _cacheObjectSave( ms, o );
             ms.setSize( ms.tell() );
             
@@ -117,7 +127,7 @@ namespace Bu
             if( !bStructureChanged )
                 return;
 
-            Bu::MyriadStream ms = mStore.openStream( 1 );
+            Bu::MyriadStream ms = mStore.open( 1, Bu::Myriad::WriteNew );
             Bu::Archive ar( ms, Bu::Archive::save );
             ar << (uint8_t)0 << hIndex;
             ar.close();
diff --git a/src/unstable/myriadfs.cpp b/src/unstable/myriadfs.cpp
index b24997a..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>
@@ -32,10 +33,10 @@ Bu::MyriadFs::MyriadFs( Bu::Stream &rStore, int iBlockSize ) :
     iGroup = getgid();
 #endif
 
-    if( mStore.hasStream( 1 ) )
+    if( mStore.exists( 1 ) )
     {
         // Check to see if this is a MyriadFs stream.
-        Bu::MyriadStream ms = mStore.openStream( 1 );
+        Bu::MyriadStream ms = mStore.open( 1, Bu::Myriad::Read );
         char sMagic[4];
         if( ms.read( sMagic, 4 ) < 4 )
             throw MyriadFsException("The provided stream does not appear to be "
@@ -62,8 +63,8 @@ Bu::MyriadFs::MyriadFs( Bu::Stream &rStore, int iBlockSize ) :
     {
         // Create initial header stream
         {
-            mStore.createStream( 1 );
-            Bu::MyriadStream ms = mStore.openStream( 1 );
+            Bu::MyriadStream ms = mStore.open(
+                1, Bu::Myriad::WriteNew|Bu::Myriad::Exclusive );
             ms.write( Myriad_Fs_MAGIC_CODE, 4 );
             int8_t iVer = 1;
             int32_t iTmp = 1;
@@ -77,8 +78,8 @@ Bu::MyriadFs::MyriadFs( Bu::Stream &rStore, int iBlockSize ) :
 
         // Create initial inode stream, with one root node.
         {
-            mStore.createStream( 2 );
-            Bu::MyriadStream ms = mStore.openStream( 2 );
+            Bu::MyriadStream ms = mStore.open(
+                2, Bu::Myriad::WriteNew|Bu::Myriad::Exclusive );
             RawStat rs;
             rs.iNode = 0;
             rs.iUser = iUser;
@@ -92,8 +93,8 @@ Bu::MyriadFs::MyriadFs( Bu::Stream &rStore, int iBlockSize ) :
 
         // Create inode 0's storage stream.
         {
-            mStore.createStream( 3 );
-            Bu::MyriadStream ms = mStore.openStream( 3 );
+            Bu::MyriadStream ms = mStore.open(
+                3, Bu::Myriad::WriteNew|Bu::Myriad::Exclusive );
             int32_t iTmp32 = 0;
             ms.write( &iTmp32, 4 );     // iChildCount
         }
@@ -107,15 +108,17 @@ 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.openStream( 2 );
+    Bu::MyriadStream is = mStore.open( 2, Bu::Myriad::Read );
     stat( iNode, rBuf, is );
 }
 
 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;
     
@@ -257,7 +263,7 @@ void Bu::MyriadFs::mkHardLink( const Bu::String &sTarget,
 //        sio << "End filename: " << sName << sio.nl;
 //        sio << "Parent inode: " << iParent << sio.nl;
         addToDir( iParent, iNode, sName );
-        MyriadStream is = mStore.openStream( 2 );
+        MyriadStream is = mStore.open( 2, Bu::Myriad::ReadWrite );
         RawStat rs;
         readInode( iNode, rs, is );
         rs.iLinks++;
@@ -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;
 
@@ -314,7 +324,9 @@ void Bu::MyriadFs::unlink( const Bu::String &sPath )
             readInode( (*i).iNode, rs );
             if( (rs.uPerms&typeMask) == typeDir )
             {
-                MyriadStream msDir = mStore.openStream( rs.uStreamIndex );
+                MyriadStream msDir = mStore.open(
+                    rs.uStreamIndex, Bu::Myriad::Read
+                    );
                 int32_t iCount;
                 msDir.read( &iCount, 4 );
                 if( iCount > 0 )
@@ -350,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 );
@@ -359,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 );
 }
@@ -449,7 +463,7 @@ void Bu::MyriadFs::readInode( int32_t iNode, RawStat &rs, MyriadStream &rIs )
 
 void Bu::MyriadFs::readInode( int32_t iNode, RawStat &rs )
 {
-    MyriadStream ms = mStore.openStream( 2 );
+    MyriadStream ms = mStore.open( 2, Bu::Myriad::Read );
     readInode( iNode, rs, ms );
 }
 
@@ -464,7 +478,7 @@ void Bu::MyriadFs::writeInode( const RawStat &rs,
 
 void Bu::MyriadFs::writeInode( const RawStat &rs )
 {
-    MyriadStream ms = mStore.openStream( 2 );
+    MyriadStream ms = mStore.open( 2, Bu::Myriad::Write );
     writeInode( rs, ms );
 }
 
@@ -474,9 +488,9 @@ Bu::MyriadFs::Dir Bu::MyriadFs::readDir( int32_t iNode )
     int32_t iNumChildren = 0;
     ms.read( &iNumChildren, 4 );
     
-    Bu::MyriadStream is = mStore.openStream( 2 );
+    Bu::MyriadStream is = mStore.open( 2, Bu::Myriad::Read );
     Dir lDir;
-    sio << "Reading dir " << iNode << ", " << iNumChildren << " entries:" << sio.nl;
+    // sio << "Reading dir " << iNode << ", " << iNumChildren << " entries:" << sio.nl;
     for( int32_t j = 0; j < iNumChildren; j++ )
     {
         int32_t iChildNode = 0;
@@ -485,7 +499,6 @@ Bu::MyriadFs::Dir Bu::MyriadFs::readDir( int32_t iNode )
             throw Bu::MyriadFsException(
                 "Failed to read iChildNode from directory.");
         }
-        Bu::println("  - iNode = %1").arg( iChildNode );
         Stat s;
         stat( iChildNode, s, is );
         uint8_t uLen;
@@ -494,14 +507,12 @@ Bu::MyriadFs::Dir Bu::MyriadFs::readDir( int32_t iNode )
             throw Bu::MyriadFsException(
                 "Failed to read uLen from directory.");
         }
-        Bu::println("  - Name bytes = %1").arg( uLen );
         s.sName.setSize( uLen );
         if( ms.read( s.sName.getStr(), uLen ) < uLen )
         {
             throw Bu::MyriadFsException(
                 "Failed to read sName from directory.");
         }
-        Bu::println("  - Name = \"%1\"").arg( s.sName );
         lDir.append( s );
 
 //      sio << "    " << s.sName << sio.nl;
@@ -519,9 +530,7 @@ Bu::MyriadStream Bu::MyriadFs::openByInode( int32_t iNode )
         case typeDir:
         case typeSymLink:
         case typeRegFile:
-            Bu::println("Opening stream by iNode=%1, myriad stream=%2")
-                .arg( iNode ).arg( rs.uStreamIndex );
-            return mStore.openStream( rs.uStreamIndex );
+            return mStore.open( rs.uStreamIndex, Bu::Myriad::ReadWrite );
 
         default:
             throw Bu::MyriadFsException(
@@ -575,17 +584,17 @@ int32_t Bu::MyriadFs::allocInode( uint16_t uPerms, uint32_t uSpecial )
             {
                 case typeRegFile:
                 case typeSymLink:
-                    rs.uStreamIndex = mStore.createStream();
+                    rs.uStreamIndex = mStore.allocate();
                     break;
                 
                 case typeDir:
-                    rs.uStreamIndex = mStore.createStream();
 //                    sio << "Creating directory node, storage: "
 //                        << rs.uStreamIndex << sio.nl;
                     {
-                        Bu::MyriadStream msDir = mStore.openStream(
-                            rs.uStreamIndex
+                        Bu::MyriadStream msDir = mStore.create(
+                            Bu::Myriad::Write
                             );
+                        rs.uStreamIndex = msDir.getId();
                         uint32_t uSize = 0;
                         msDir.write( &uSize, 4 );
                     }
@@ -631,7 +640,7 @@ void Bu::MyriadFs::stat( int32_t iNode, Stat &rBuf, MyriadStream &rIs )
     {
         case typeRegFile:
         case typeSymLink:
-            rBuf.iSize = mStore.getStreamSize( rs.uStreamIndex );
+            rBuf.iSize = mStore.getSize( rs.uStreamIndex );
             break;
 
         case typeChrDev:
@@ -647,7 +656,7 @@ void Bu::MyriadFs::stat( int32_t iNode, Stat &rBuf, MyriadStream &rIs )
 
 void Bu::MyriadFs::writeHeader()
 {
-    Bu::MyriadStream ms = mStore.openStream( 1 );
+    Bu::MyriadStream ms = mStore.open( 1, Bu::Myriad::Write );
     ms.write( Myriad_Fs_MAGIC_CODE, 4 );
     int8_t iVer = 1;
     int32_t iNumNodes = hNodeIndex.getSize();
@@ -668,7 +677,7 @@ void Bu::MyriadFs::writeHeader()
 void Bu::MyriadFs::setTimes( int32_t iNode, int64_t iATime, int64_t iMTime )
 {
     RawStat rs;
-    Bu::MyriadStream is = mStore.openStream( 2 );
+    Bu::MyriadStream is = mStore.open( 2, Bu::Myriad::ReadWrite );
 
     readInode( iNode, rs, is );
     rs.iATime = iATime;
@@ -681,18 +690,21 @@ void Bu::MyriadFs::destroyNode( int32_t iNode )
     if( iNode == 0 )
         throw Bu::MyriadFsException("You cannot destroy the root.");
 
-    Bu::MyriadStream is = mStore.openStream( 2 );
+    uint32_t iPosition;
+    RawStat rsOld;
+
+    Bu::MyriadStream is = mStore.open( 2, Bu::Myriad::ReadWrite );
 
     // This will be overwritten with the last node
-    uint32_t iPosition = hNodeIndex.get( iNode );
-    RawStat rsOld;
+    iPosition = hNodeIndex.get( iNode );
     readInode( iNode, rsOld, is );
+    
     switch( (rsOld.uPerms&typeMask) )
     {
         case typeRegFile:
         case typeDir:
         case typeSymLink:
-            mStore.deleteStream( rsOld.uStreamIndex );
+            mStore.erase( rsOld.uStreamIndex );
             break;
     }
 
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;