Start to add request time profiling.

[bluesky.git] / bluesky / file.c

diff --git a/bluesky/file.c b/bluesky/file.c
index 0c92e69..a4a8108 100644 (file)
--- a/bluesky/file.c
+++ b/bluesky/file.c
@@ -93,7 +93,7 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size)
         g_array_set_size(inode->blocks, blocks);
     } else if (blocks < inode->blocks->len) {
         /* Delete blocks from a file.  Must reclaim memory. */
-        for (guint i = inode->blocks->len; i < blocks; i++) {
+        for (guint i = blocks; i < inode->blocks->len; i++) {
             BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
             if (b->type == BLUESKY_BLOCK_DIRTY)
                 g_atomic_int_add(&inode->fs->cache_dirty, -1);
@@ -192,6 +192,16 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset,
     }
 #endif
 
+    uint64_t start_block, end_block;
+    start_block = offset / BLUESKY_BLOCK_SIZE;
+    end_block = (offset + len - 1) / BLUESKY_BLOCK_SIZE;
+    for (uint64_t i = start_block; i <= end_block; i++) {
+        BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock,
+                                         i);
+        if (b->type == BLUESKY_BLOCK_REF)
+            bluesky_cloudlog_prefetch(b->ref);
+    }
+
     while (len > 0) {
         uint64_t block_num = offset / BLUESKY_BLOCK_SIZE;
         gint block_offset = offset % BLUESKY_BLOCK_SIZE;
@@ -241,7 +251,7 @@ void bluesky_block_flush(BlueSkyInode *inode, BlueSkyBlock *block,
 
     g_assert(block->ref == NULL);
 
-    BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs);
+    BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs, NULL);
     cloudlog->type = LOGTYPE_DATA;
     cloudlog->inum = inode->inum;
     cloudlog->data = block->dirty;      // String ownership is transferred
@@ -287,9 +297,6 @@ void bluesky_file_drop_cached(BlueSkyInode *inode)
                 b->ref->data = NULL;
                 bluesky_cloudlog_stats_update(b->ref, 1);
             }
-            if (b->ref->location_flags & CLOUDLOG_CLOUD) {
-                b->ref->location_flags &= ~CLOUDLOG_JOURNAL;
-            }
             g_mutex_unlock(b->ref->lock);
         }
     }