Rework caching of data blocks to eliminate double-caching.

[bluesky.git] / bluesky / log.c

diff --git a/bluesky/log.c b/bluesky/log.c
index 55daf7a..cec46cb 100644 (file)
--- a/bluesky/log.c
+++ b/bluesky/log.c
@@ -82,6 +82,7 @@ static void log_commit(BlueSkyLog *log)
         g_cond_signal(item->cond);
         g_mutex_unlock(item->lock);
         log->committed = g_slist_delete_link(log->committed, log->committed);
+        bluesky_cloudlog_unref(item);
         batchsize++;
     }
 
@@ -153,6 +154,7 @@ static gpointer log_thread(gpointer d)
         if ((item->location_flags | item->pending_write) & CLOUDLOG_JOURNAL) {
             g_mutex_unlock(item->lock);
             bluesky_cloudlog_unref(item);
+            g_atomic_int_add(&item->data_lock_count, -1);
             continue;
         }
 
@@ -199,6 +201,7 @@ static gpointer log_thread(gpointer d)
         offset += sizeof(header) + sizeof(footer) + item->data->len;
 
         log->committed  = g_slist_prepend(log->committed, item);
+        g_atomic_int_add(&item->data_lock_count, -1);
         g_mutex_unlock(item->lock);
 
         /* Force an if there are no other log items currently waiting to be
@@ -235,6 +238,7 @@ BlueSkyLog *bluesky_log_new(const char *log_directory)
 void bluesky_log_item_submit(BlueSkyCloudLog *item, BlueSkyLog *log)
 {
     bluesky_cloudlog_ref(item);
+    g_atomic_int_add(&item->data_lock_count, 1);
     g_async_queue_push(log->queue, item);
 }