X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fserialize.c;h=6f31dcb9f4ffba5e40520f0fab40698d6f913345;hb=ffadf57d27b07d5ba8c0de11649ff08e999f53f4;hp=c806d88f64198e84684ae600ed4afed2f7c33180;hpb=92a6fa8cd45e12f70f65f9d9fc6d1cdd6592878a;p=bluesky.git

diff --git a/bluesky/serialize.c b/bluesky/serialize.c
index c806d88..6f31dcb 100644
--- a/bluesky/serialize.c
+++ b/bluesky/serialize.c
@@ -11,12 +11,21 @@
 #include <glib.h>
 #include <string.h>
 
-#include "bluesky.h"
+#include "bluesky-private.h"
 
 /* Serialization of in-memory filesystem data structures to bytestrings which
  * can be written to persistent storage.  All data is stored in little-endian
  * format. */
 
+/* Magic signature and structure of serialized superblocks. */
+
+#define SUPERBLOCK_MAGIC 0x65ca91e91b124234ULL
+
+struct serialized_superblock {
+    uint64_t signature;         /* SUPERBLOCK_MAGIC */
+    uint64_t next_inum;
+} __attribute__((packed));
+
 /* Magic signature for serialized inodes. */
 
 #define INODE_MAGIC 0xa6832100943d71e6ULL
@@ -35,6 +44,29 @@ struct serialized_inode {
     int64_t ntime;
 } __attribute__((packed));
 
+void bluesky_serialize_superblock(GString *out, BlueSkyFS *fs)
+{
+    struct serialized_superblock buf;
+
+    buf.signature = GUINT64_TO_LE(SUPERBLOCK_MAGIC);
+    buf.next_inum = GUINT64_TO_LE(fs->next_inum);
+
+    g_string_append_len(out, (gchar *)&buf, sizeof(buf));
+}
+
+BlueSkyFS *bluesky_deserialize_superblock(const gchar *buf)
+{
+    struct serialized_superblock *raw = (struct serialized_superblock *)buf;
+
+    if (GUINT64_FROM_LE(raw->signature) != SUPERBLOCK_MAGIC)
+        return NULL;
+
+    BlueSkyFS *fs = bluesky_new_fs("deserialized");
+    fs->next_inum = GUINT64_FROM_LE(raw->next_inum);
+
+    return fs;
+}
+
 void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
 {
     struct serialized_inode buf;
@@ -92,6 +124,13 @@ void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
 
         break;
     }
+
+    case BLUESKY_SYMLINK:
+    {
+        g_string_append(out, inode->symlink_contents);
+        g_string_append_c(out, '\0');
+    }
+
     default:
         g_warning("Serialization for inode type %d not implemented!\n",
                   inode->type);
@@ -152,10 +191,13 @@ BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf)
             dirent->cookie = GUINT64_FROM_LE(d->seq);
             dirent->inum = GUINT64_FROM_LE(d->inum);
             dirent->name = g_strdup(d->name);
+            dirent->name_folded = bluesky_lowercase(d->name);
 
             g_sequence_insert_sorted(inode->dirents, dirent,
                                      bluesky_dirent_compare, NULL);
             g_hash_table_insert(inode->dirhash, dirent->name, dirent);
+            g_hash_table_insert(inode->dirhash_folded, dirent->name_folded,
+                                dirent);
 
             g_print("  dirent[%08x]: %s -> %"PRIu64"\n",
                     dirent->cookie, dirent->name, dirent->inum);
@@ -165,6 +207,12 @@ BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf)
         }
         break;
     }
+
+    case BLUESKY_SYMLINK:
+    {
+        inode->symlink_contents = g_strdup(buf);
+    }
+
     default:
         g_warning("Deserialization for inode type %d not implemented!\n",
                   inode->type);