X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Ffile.c;h=57193dd9ee69fefdc3595a6a1df1c27c2990aabe;hb=ed6f1f04bd4d7a73ed26b3bb0d5e0df1cc0acf42;hp=2e4313e7c7ad3a0c40fa81a9b3dd69c4022389f5;hpb=e9af23b41ae0c11245fbc6886a794e1dfb04a6bd;p=bluesky.git

diff --git a/bluesky/file.c b/bluesky/file.c
index 2e4313e..57193dd 100644
--- a/bluesky/file.c
+++ b/bluesky/file.c
@@ -34,7 +34,7 @@ void bluesky_block_touch(BlueSkyInode *inode, uint64_t i)
         block->data = bluesky_string_new(g_malloc0(block_len), block_len);
         break;
     case BLUESKY_BLOCK_REF:
-        bluesky_block_fetch(inode->fs, block, NULL);
+        bluesky_block_fetch(inode, block, NULL);
         g_assert(block->type == BLUESKY_BLOCK_CACHED);
         /* Fall through */
     case BLUESKY_BLOCK_CACHED:
@@ -50,6 +50,9 @@ void bluesky_block_touch(BlueSkyInode *inode, uint64_t i)
         g_atomic_int_add(&inode->fs->cache_dirty, 1);
 
     block->type = BLUESKY_BLOCK_DIRTY;
+    if (block->cloudref != NULL)
+        bluesky_cloudlog_unref(block->cloudref);
+    block->cloudref = NULL;
 }
 
 /* Set the size of a file.  This will truncate or extend the file as needed.
@@ -94,13 +97,13 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size)
         /* Delete blocks from a file.  Must reclaim memory. */
         for (guint i = inode->blocks->len; i < blocks; i++) {
             BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
-            g_free(b->ref);
             if (b->type == BLUESKY_BLOCK_CACHED
                     || b->type == BLUESKY_BLOCK_DIRTY)
                 g_atomic_int_add(&inode->fs->cache_total, -1);
             if (b->type == BLUESKY_BLOCK_DIRTY)
                 g_atomic_int_add(&inode->fs->cache_dirty, -1);
             bluesky_string_unref(b->data);
+            bluesky_cloudlog_unref(b->cloudref);
         }
         g_array_set_size(inode->blocks, blocks);
     }
@@ -181,7 +184,7 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset,
         BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock,
                                          i);
         if (b->type == BLUESKY_BLOCK_REF)
-            bluesky_block_fetch(inode->fs, b, barrier);
+            bluesky_block_fetch(inode, b, barrier);
     }
     bluesky_store_async_submit(barrier);
     bluesky_store_async_wait(barrier);
@@ -202,7 +205,7 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset,
             memset(buf, 0, bytes);
             break;
         case BLUESKY_BLOCK_REF:
-            bluesky_block_fetch(inode->fs, b, NULL);
+            bluesky_block_fetch(inode, b, NULL);
             /* Fall through */
         case BLUESKY_BLOCK_CACHED:
         case BLUESKY_BLOCK_DIRTY:
@@ -216,67 +219,46 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset,
     }
 }
 
-/* Read the given block from cloud-backed storage if the data is not already
- * cached. */
-static void block_fetch_completion(BlueSkyStoreAsync *async, gpointer data)
-{
-    BlueSkyBlock *block = (BlueSkyBlock *)data;
-
-    bluesky_string_unref(block->data);
-    block->data = async->data;
-    bluesky_string_ref(block->data);
-
-    if (block->data == NULL) {
-        g_warning("Failed to fetch data block from store!\n");
-        block->data = bluesky_string_new(g_malloc0(BLUESKY_BLOCK_SIZE),
-                                         BLUESKY_BLOCK_SIZE);
-    }
-
-    block->type = BLUESKY_BLOCK_CACHED;
-}
-
-void bluesky_block_fetch(BlueSkyFS *fs, BlueSkyBlock *block,
+void bluesky_block_fetch(BlueSkyInode *inode, BlueSkyBlock *block,
                          BlueSkyStoreAsync *barrier)
 {
     if (block->type != BLUESKY_BLOCK_REF)
         return;
 
-    BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
-    async->op = STORE_OP_GET;
-    async->key = g_strdup(block->ref);
-    bluesky_store_async_add_notifier(async, (GFunc)block_fetch_completion, block);
-    bluesky_store_async_submit(async);
-
-    if (barrier != NULL)
-        bluesky_store_add_barrier(barrier, async);
-    else
-        bluesky_store_async_wait(async);
-
-    bluesky_store_async_unref(async);
-    g_atomic_int_add(&fs->cache_total, 1);
+    g_mutex_lock(block->cloudref->lock);
+    bluesky_cloudlog_fetch(block->cloudref);
+    block->data = block->cloudref->data;
+    bluesky_string_ref(block->data);
+    g_mutex_unlock(block->cloudref->lock);
+    block->type = BLUESKY_BLOCK_CACHED;
+    g_atomic_int_add(&inode->fs->cache_total, 1);
 }
 
 /* Write the given block to cloud-backed storage and mark it clean. */
-void bluesky_block_flush(BlueSkyFS *fs, BlueSkyBlock *block,
+void bluesky_block_flush(BlueSkyInode *inode, BlueSkyBlock *block,
                          GList **log_items)
 {
+    BlueSkyFS *fs = inode->fs;
+
     if (block->type != BLUESKY_BLOCK_DIRTY)
         return;
 
+    if (block->cloudref != NULL)
+        bluesky_cloudlog_unref(block->cloudref);
+
     BlueSkyRCStr *data = block->data;
 
     BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs);
-    gchar *name = bluesky_cloudlog_id_to_string(cloudlog->id);
     cloudlog->type = LOGTYPE_DATA;
-    cloudlog->inum = 0; //FIXME
+    cloudlog->inum = inode->inum;
     cloudlog->data = data;
     bluesky_string_ref(data);
     bluesky_cloudlog_sync(cloudlog);
     *log_items = g_list_prepend(*log_items, cloudlog);
     bluesky_cloudlog_insert(cloudlog);
 
-    g_free(block->ref);
-    block->ref = name;
+    block->cloudref = cloudlog;
+    bluesky_cloudlog_ref(cloudlog);
 
     block->type = BLUESKY_BLOCK_CACHED;
     g_atomic_int_add(&fs->cache_dirty, -1);
@@ -289,7 +271,7 @@ void bluesky_file_flush(BlueSkyInode *inode, GList **log_items)
 
     for (int i = 0; i < inode->blocks->len; i++) {
         BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
-        bluesky_block_flush(inode->fs, b, log_items);
+        bluesky_block_flush(inode, b, log_items);
     }
 }
 
@@ -313,6 +295,12 @@ void bluesky_file_drop_cached(BlueSkyInode *inode)
             b->data = NULL;
             b->type = BLUESKY_BLOCK_REF;
             g_atomic_int_add(&inode->fs->cache_total, -1);
+            g_mutex_lock(b->cloudref->lock);
+            if (b->cloudref->location_flags & CLOUDLOG_JOURNAL) {
+                bluesky_string_unref(b->cloudref->data);
+                b->cloudref->data = NULL;
+            }
+            g_mutex_unlock(b->cloudref->lock);
         }
     }
 }