Make links between cloud log entries direct.

[bluesky.git] / bluesky / serialize.c

diff --git a/bluesky/serialize.c b/bluesky/serialize.c
index a9e4182..da9aa97 100644 (file)
--- 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,11 +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);
-            BlueSkyCloudID id;
-            memset(&id, 0, sizeof(id));
-            if (b->ref != NULL)
-                id = b->ref->id;
-            g_string_append_len(out, (const char *)&id, sizeof(id));
+            BlueSkyCloudLog *ref = NULL;
+            if (b->type == BLUESKY_BLOCK_REF)
+                ref = b->ref;
+            bluesky_cloudlog_ref(ref);
+            g_array_append_val(cloudlog->links, ref);
         }
         break;
     }
@@ -138,6 +144,11 @@ void bluesky_serialize_inode(GString *out, BlueSkyInode *inode)
         g_warning("Serialization for inode type %d not implemented!\n",
                   inode->type);
     }
+
+    cloudlog->data = bluesky_string_new_from_gstring(out);
+    bluesky_cloudlog_insert(cloudlog);
+
+    return cloudlog;
 }
 
 /* Deserialize an inode into an in-memory representation.  Returns a boolean