Merged in the core branch. This is a major update that fixes many things, and

changes many others, including source files that were deleted and renamed.

Before doing this update, I reccomend a full clean, or even a fresh checkout.

Things to note, most outstanding about this update:
 - Bu::Socket was changed to Bu::TcpSocket and the default mode is blocking.
 - All templatized container classes are SharedCore now, which is good, but
   SharedCore is inherently non-reentrant safe.  However, all SharedCore classes
   have a "clone" function that return a non-shared copy of the object, safe for
   passing into a reentrant safe function accessing shared memory.

1 files changed, 78 insertions, 0 deletions

diff --git a/src/myriadfs.cpp b/src/myriadfs.cpp
new file mode 100644
index 0000000..af60c08
--- /dev/null
+++ b/src/myriadfs.cpp
@@ -0,0 +1,78 @@
+#include "bu/myriadfs.h"
+#include "bu/myriadstream.h"
+
+#include <string.h>
+#include <unistd.h>
+
+namespace Bu { subExceptionDef( MyriadFsException ) }
+
+#define Myriad_Fs_MAGIC_CODE            ((char *)"\xa7\x18\x8b\x39")
+
+Bu::MyriadFs::MyriadFs( Bu::Stream &rStore, int iBlockSize ) :
+        rStore( rStore ),
+        mStore( rStore, iBlockSize )
+{
+        if( mStore.hasStream( 1 ) )
+        {
+                // Check to see if this is a MyriadFs stream.
+                Bu::MyriadStream ms = mStore.openStream( 1 );
+                char sMagic[4];
+                if( ms.read( sMagic, 4 ) < 4 )
+                        throw MyriadFsException("The provided stream does not appear to be "
+                                "a MyriadFs stream.");
+                if( ::strncmp( sMagic, Myriad_Fs_MAGIC_CODE, 4 ) )
+                        throw MyriadFsException("The provided stream does not appear to be "
+                                "a MyriadFs stream.");
+        
+                int8_t iVer;
+        }
+        else
+        {
+                // Create initial header stream
+                {
+                        mStore.createStream( 1 );
+                        Bu::MyriadStream ms = mStore.openStream( 1 );
+                        ms.write( Myriad_Fs_MAGIC_CODE, 4 );
+                        int8_t iVer = 1;
+                        int32_t iTmp = 1;
+                        ms.write( &iVer, 1 );
+                        ms.write( &iBlockSize, 4 );
+                        ms.write( &iTmp, 4 ); // iNumNodes
+                        iTmp = 0;
+                        ms.write( &iTmp, 4 ); // iInode
+                        ms.write( &iTmp, 0 ); // iPosition
+                }
+
+                // Create initial inode stream, with one root node.
+                {
+                        mStore.createStream( 2 );
+                        Bu::MyriadStream ms = mStore.openStream( 2 );
+                        int32_t iUser = 0, iGroup = 0;
+#ifndef WIN32
+                        iUser = getuid();
+                        iGroup = getgid();
+#endif
+                        int32_t iTmp32 = 0;
+                        int16_t iTmp16 = 0;
+                        ms.write( &iUser, 4 );
+                        ms.write( &iGroup, 4 );
+                        ms.write( &iTmp16, 2 );
+                        ms.write( &iTmp16, 2 );
+                        iTmp32 = 3;
+                        ms.write( &iTmp32, 4 );
+                        iTmp32 = 0;
+                        ms.write( &iTmp32, 4 );
+                        ms.write( &iTmp16, 2 ); 
+                }
+
+                // Create inode 0's storage stream.
+                {
+                        mStore.createStream( 3 );
+                }
+        }
+}
+
+Bu::MyriadFs::~MyriadFs()
+{
+}
+