X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fserialize.c;h=6eef4254db21ae92afc2353ffdb2d6d5b62fd04e;hb=4a207da5eef9f87a702a011d003d5ad17b651085;hp=5eb7c1d2dd1baeba0eeb208d15ebbf187dfcb8da;hpb=d514caf49faff9295d0e497d3b6b8856fe83f8d0;p=bluesky.git

diff --git a/bluesky/serialize.c b/bluesky/serialize.c
index 5eb7c1d..6eef425 100644
--- a/bluesky/serialize.c
+++ b/bluesky/serialize.c
@@ -67,10 +67,16 @@ BlueSkyFS *bluesky_deserialize_superblock(const gchar *buf)
     return fs;
 }
 
-void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
+BlueSkyCloudLog *bluesky_serialize_inode(BlueSkyInode *inode)
 {
+    BlueSkyFS *fs = inode->fs;
+    GString *out = g_string_new("");
     struct serialized_inode buf;
 
+    BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs);
+    cloudlog->type = LOGTYPE_INODE;
+    cloudlog->inum = inode->inum;
+
     buf.signature = GUINT64_TO_LE(INODE_MAGIC);
     buf.type = GUINT32_TO_LE(inode->type);
     buf.mode = GUINT32_TO_LE(inode->mode);
@@ -93,9 +99,11 @@ void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
         g_string_append_len(out, (gchar *)&size, sizeof(uint64_t));
         for (int i = 0; i < inode->blocks->len; i++) {
             BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
-            if (b->ref != NULL)
-                g_string_append(out, b->ref);
-            g_string_append_c(out, '\0');
+            BlueSkyCloudLog *ref = NULL;
+            if (b->type == BLUESKY_BLOCK_REF)
+                ref = b->ref;
+            bluesky_cloudlog_ref(ref);
+            g_array_append_val(cloudlog->links, ref);
         }
         break;
     }
@@ -129,19 +137,29 @@ void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
     {
         g_string_append(out, inode->symlink_contents);
         g_string_append_c(out, '\0');
+        break;
     }
 
     default:
         g_warning("Serialization for inode type %d not implemented!\n",
                   inode->type);
     }
+
+    cloudlog->data = bluesky_string_new_from_gstring(out);
+    bluesky_cloudlog_insert(cloudlog);
+    bluesky_cloudlog_stats_update(cloudlog, 1);
+
+    return cloudlog;
 }
 
 /* Deserialize an inode into an in-memory representation.  Returns a boolean
  * indicating whether the deserialization was successful. */
 gboolean bluesky_deserialize_inode(BlueSkyInode *inode, const gchar *buf)
 {
-    g_print("Deserializing inode %lld...\n", (long long)inode->inum);
+    if (bluesky_verbose) {
+        g_log("bluesky/serialize", G_LOG_LEVEL_DEBUG,
+              "Deserializing inode %lld...", (long long)inode->inum);
+    }
 
     struct serialized_inode *raw = (struct serialized_inode *)buf;
 
@@ -174,12 +192,15 @@ gboolean bluesky_deserialize_inode(BlueSkyInode *inode, const gchar *buf)
         g_array_set_size(inode->blocks,
                          (inode->size + BLUESKY_BLOCK_SIZE - 1)
                           / BLUESKY_BLOCK_SIZE);
+        // TODO
+#if 0
         for (int i = 0; i < inode->blocks->len; i++) {
             BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
             b->type = BLUESKY_BLOCK_REF;
             b->ref = g_strdup(buf);
             buf += strlen(b->ref) + 1;
         }
+#endif
         break;
 
     case BLUESKY_DIRECTORY:
@@ -204,9 +225,6 @@ gboolean bluesky_deserialize_inode(BlueSkyInode *inode, const gchar *buf)
             g_hash_table_insert(inode->dirhash_folded, dirent->name_folded,
                                 dirent);
 
-            g_print("  dirent[%08x]: %s -> %"PRIu64"\n",
-                    dirent->cookie, dirent->name, dirent->inum);
-
             buf = strchr(d->name, '\0') + 1;
             d = (struct serialized_dirent *)buf;
         }
@@ -216,6 +234,7 @@ gboolean bluesky_deserialize_inode(BlueSkyInode *inode, const gchar *buf)
     case BLUESKY_SYMLINK:
     {
         inode->symlink_contents = g_strdup(buf);
+        break;
     }
 
     default: