(Mostly) merge local and cloud logging together.

[bluesky.git] / bluesky / log.c

diff --git a/bluesky/log.c b/bluesky/log.c
index 4c522b8..e9af52a 100644 (file)
--- a/bluesky/log.c
+++ b/bluesky/log.c
@@ -43,8 +43,8 @@
 struct log_header {
     uint32_t magic;             // HEADER_MAGIC
     uint64_t offset;            // Starting byte offset of the log header
-    uint32_t keysize;           // Size of the log key (bytes)
     uint32_t size;              // Size of the data item (bytes)
+    BlueSkyCloudID id;          // Object identifier
 } __attribute__((packed));
 
 struct log_footer {
@@ -110,8 +110,18 @@ static gpointer log_thread(gpointer d)
             fsync(dirfd);
         }
 
-        BlueSkyLogItem *item = (BlueSkyLogItem *)g_async_queue_pop(log->queue);
+        BlueSkyCloudLog *item
+            = (BlueSkyCloudLog *)g_async_queue_pop(log->queue);
         g_mutex_lock(item->lock);
+        g_assert(item->data != NULL);
+
+        if ((item->location_flags | item->pending_write) & CLOUDLOG_JOURNAL) {
+            g_mutex_unlock(item->lock);
+            bluesky_cloudlog_unref(item);
+            continue;
+        }
+
+        item->pending_write |= CLOUDLOG_JOURNAL;
 
         off_t logsize = lseek(log->fd, 0, SEEK_CUR);
         struct log_header header;
@@ -119,8 +129,8 @@ static gpointer log_thread(gpointer d)
 
         header.magic = GUINT32_TO_LE(HEADER_MAGIC);
         header.offset = GUINT64_TO_LE(logsize);
-        header.keysize = GUINT32_TO_LE(strlen(item->key));
         header.size = GUINT32_TO_LE(item->data->len);
+        header.id = item->id;
         footer.magic = GUINT32_TO_LE(FOOTER_MAGIC);
 
         uint32_t crc = BLUESKY_CRC32C_SEED;
@@ -128,9 +138,6 @@ static gpointer log_thread(gpointer d)
         writebuf(log->fd, (const char *)&header, sizeof(header));
         crc = crc32c(crc, (const char *)&header, sizeof(header));
 
-        writebuf(log->fd, item->key, strlen(item->key));
-        crc = crc32c(crc, item->key, strlen(item->key));
-
         writebuf(log->fd, item->data->data, item->data->len);
         crc = crc32c(crc, item->data->data, item->data->len);
 
@@ -139,10 +146,14 @@ static gpointer log_thread(gpointer d)
         footer.crc = crc32c_finalize(crc);
         writebuf(log->fd, (const char *)&footer, sizeof(footer));
 
-        logsize += sizeof(header) + sizeof(footer);
-        logsize += strlen(item->key) + item->data->len;
+        item->log_seq = log->seq_num;
+        item->log_offset = logsize + sizeof(header);
+        item->log_size = item->data->len;
+
+        logsize += sizeof(header) + sizeof(footer) + item->data->len;
 
         committed  = g_slist_prepend(committed, item);
+        g_mutex_unlock(item->lock);
 
         /* Force an fsync either if we will be closing this log segment and
          * opening a new file, or if there are no other log items currently
@@ -154,8 +165,10 @@ static gpointer log_thread(gpointer d)
             int batchsize = 0;
             fdatasync(log->fd);
             while (committed != NULL) {
-                item = (BlueSkyLogItem *)committed->data;
-                item->committed = TRUE;
+                item = (BlueSkyCloudLog *)committed->data;
+                g_mutex_lock(item->lock);
+                item->pending_write &= ~CLOUDLOG_JOURNAL;
+                item->location_flags |= CLOUDLOG_JOURNAL;
                 g_cond_signal(item->cond);
                 g_mutex_unlock(item->lock);
                 committed = g_slist_delete_link(committed, committed);
@@ -189,36 +202,23 @@ BlueSkyLog *bluesky_log_new(const char *log_directory)
     return log;
 }
 
-BlueSkyLogItem *bluesky_log_item_new()
-{
-    BlueSkyLogItem *item = g_new(BlueSkyLogItem, 1);
-    item->committed = FALSE;
-    item->lock = g_mutex_new();
-    item->cond = g_cond_new();
-    item->key = NULL;
-    item->data = NULL;
-    return item;
-}
-
-void bluesky_log_item_submit(BlueSkyLogItem *item, BlueSkyLog *log)
+void bluesky_log_item_submit(BlueSkyCloudLog *item, BlueSkyLog *log)
 {
+    bluesky_cloudlog_ref(item);
     g_async_queue_push(log->queue, item);
 }
 
-static void bluesky_log_item_free(BlueSkyLogItem *item)
+void bluesky_log_finish_all(GList *log_items)
 {
-    g_free(item->key);
-    bluesky_string_unref(item->data);
-    g_mutex_free(item->lock);
-    g_cond_free(item->cond);
-    g_free(item);
-}
+    while (log_items != NULL) {
+        BlueSkyCloudLog *item = (BlueSkyCloudLog *)log_items->data;
 
-void bluesky_log_item_finish(BlueSkyLogItem *item)
-{
-    g_mutex_lock(item->lock);
-    while (!item->committed)
-        g_cond_wait(item->cond, item->lock);
-    g_mutex_unlock(item->lock);
-    bluesky_log_item_free(item);
+        g_mutex_lock(item->lock);
+        while ((item->pending_write & CLOUDLOG_JOURNAL))
+            g_cond_wait(item->cond, item->lock);
+        g_mutex_unlock(item->lock);
+        bluesky_cloudlog_unref(item);
+
+        log_items = g_list_delete_link(log_items, log_items);
+    }
 }