A few attempted bugfixes for log data lifetimes.

[bluesky.git] / bluesky / cloudlog.c

diff --git a/bluesky/cloudlog.c b/bluesky/cloudlog.c
index b98c233..1cae4a5 100644 (file)
--- a/bluesky/cloudlog.c
+++ b/bluesky/cloudlog.c
@@ -165,11 +165,15 @@ BlueSkyCloudPointer bluesky_cloudlog_serialize(BlueSkyCloudLog *log,
         BlueSkyCloudLog *log2
             = (BlueSkyCloudLog *)g_hash_table_lookup(log->fs->locations, &id);
         // TODO: refcount
-        g_mutex_unlock(log->fs->lock);
         g_assert(log2 != NULL);
+        bluesky_cloudlog_ref(log2);
+        g_mutex_unlock(log->fs->lock);
         bluesky_cloudlog_serialize(log2, state);
+        bluesky_cloudlog_unref(log2);
     }
 
+    g_mutex_lock(log->lock);
+    bluesky_cloudlog_fetch(log);
     g_assert(log->data != NULL);
 
     log->location = state->location;
@@ -188,6 +192,7 @@ BlueSkyCloudPointer bluesky_cloudlog_serialize(BlueSkyCloudLog *log,
     g_string_append_len(state->data, log->data->data, log->data->len);
 
     log->location_flags |= CLOUDLOG_CLOUD;
+    g_mutex_unlock(log->lock);
 
     return log->location;
 }
@@ -206,8 +211,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 +227,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 +245,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);
+}