X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fcloudlog.c;h=c99d181a11cc6f8acbebe5feadfd0b1db19d1183;hb=e49fed25d000a51b316b480c1bfb1b00c1f5d345;hp=b98c233e17ea1cfebacc23350b25224bea81acd2;hpb=8ec7f79f834ff8c3493b1bbdd63314d276786aa4;p=bluesky.git

diff --git a/bluesky/cloudlog.c b/bluesky/cloudlog.c
index b98c233..c99d181 100644
--- a/bluesky/cloudlog.c
+++ b/bluesky/cloudlog.c
@@ -206,8 +206,6 @@ static void find_inodes(gpointer key, gpointer value, gpointer user_data)
 
 void bluesky_cloudlog_write_log(BlueSkyFS *fs)
 {
-    g_print("Starting cloudlog write...\n");
-
     BlueSkyCloudLogState *state = fs->log_state;
     if (state->data == NULL)
         state->data = g_string_new("");
@@ -224,7 +222,7 @@ void bluesky_cloudlog_write_log(BlueSkyFS *fs)
     }
 
     if (state->data->len > 0) {
-        g_print("Serialized %zd bytes of data\n", state->data->len);
+        g_print("Serialized %zd bytes of data to cloud\n", state->data->len);
 
         BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
         async->op = STORE_OP_PUT;
@@ -242,3 +240,22 @@ void bluesky_cloudlog_write_log(BlueSkyFS *fs)
 
     state->data = NULL;
 }
+
+/* Ensure that a cloud log item is loaded in memory, and if not read it in.
+ * TODO: Make asynchronous, and make this also fetch from the cloud.  Right now
+ * we only read from the log.  Log item must be locked. */
+void bluesky_cloudlog_fetch(BlueSkyCloudLog *log)
+{
+    if (log->data != NULL)
+        return;
+
+    g_print("Re-mapping log entry %d/%d/%d...\n",
+            log->log_seq, log->log_offset, log->log_size);
+
+    g_assert(log->location_flags & CLOUDLOG_JOURNAL);
+
+    log->data = bluesky_log_map_object(log->fs->log, log->log_seq,
+                                       log->log_offset, log->log_size);
+
+    g_cond_broadcast(log->cond);
+}