Update disk cache usage tracking to handle sparse files.

[bluesky.git] / bluesky / cloudlog.c

diff --git a/bluesky/cloudlog.c b/bluesky/cloudlog.c
index 142104f..a37776a 100644 (file)
--- a/bluesky/cloudlog.c
+++ b/bluesky/cloudlog.c
@@ -259,6 +259,7 @@ BlueSkyCloudLog *bluesky_cloudlog_get(BlueSkyFS *fs, BlueSkyCloudID id)
     item = g_hash_table_lookup(fs->locations, &id);
     if (item == NULL) {
         item = bluesky_cloudlog_new(fs, &id);
+        bluesky_cloudlog_stats_update(item, 1);
         bluesky_cloudlog_insert_locked(item);
     } else {
         bluesky_cloudlog_ref(item);
@@ -282,21 +283,7 @@ void bluesky_cloudlog_fetch(BlueSkyCloudLog *log)
      * Once that is done, we can fall through the case of remapping the data
      * itself. */
     if (log->type == LOGTYPE_UNKNOWN) {
-        BlueSkyRCStr *raw = NULL;
-        if ((log->location_flags | log->pending_write) & CLOUDLOG_JOURNAL) {
-            raw = bluesky_log_map_object(log->fs, -1, log->log_seq,
-                                         log->log_offset, log->log_size);
-        }
-
-        if (raw == NULL && (log->location_flags & CLOUDLOG_CLOUD)) {
-            log->location_flags &= ~CLOUDLOG_JOURNAL;
-            raw = bluesky_log_map_object(log->fs,
-                                         log->location.directory,
-                                         log->location.sequence,
-                                         log->location.offset,
-                                         log->location.size);
-        }
-
+        BlueSkyRCStr *raw = bluesky_log_map_object(log, FALSE);
         g_assert(raw != NULL);
         bluesky_deserialize_cloudlog(log, raw->data, raw->len);
         bluesky_string_unref(raw);
@@ -304,25 +291,7 @@ void bluesky_cloudlog_fetch(BlueSkyCloudLog *log)
 
     /* At this point all metadata should be available and we need only remap
      * the object data. */
-
-    int offset;
-    if ((log->location_flags | log->pending_write) & CLOUDLOG_JOURNAL) {
-        bluesky_cloudlog_stats_update(log, -1);
-        offset = log->log_offset + sizeof(struct log_header);
-        log->data = bluesky_log_map_object(log->fs, -1, log->log_seq,
-                                           offset, log->data_size);
-        bluesky_cloudlog_stats_update(log, 1);
-    }
-
-    if (log->data == NULL && (log->location_flags & CLOUDLOG_CLOUD)) {
-        log->location_flags &= ~CLOUDLOG_JOURNAL;
-        bluesky_cloudlog_stats_update(log, -1);
-        offset = log->location.offset + sizeof(struct cloudlog_header);
-        log->data = bluesky_log_map_object(log->fs, log->location.directory,
-                                           log->location.sequence,
-                                           offset, log->data_size);
-        bluesky_cloudlog_stats_update(log, 1);
-    }
+    log->data = bluesky_log_map_object(log, TRUE);
 
     if (log->data == NULL) {
         g_error("Unable to fetch cloudlog entry!");
@@ -389,6 +358,7 @@ BlueSkyCloudPointer bluesky_cloudlog_serialize(BlueSkyCloudLog *log,
         g_mutex_lock(fs->lock);
         InodeMapEntry *entry = bluesky_inode_map_lookup(fs->inode_map,
                                                         log->inum, 1);
+        bluesky_cloudlog_unref_delayed(entry->item);
         entry->item = log;
         bluesky_cloudlog_ref(entry->item);
         g_mutex_unlock(fs->lock);
@@ -513,12 +483,15 @@ void bluesky_cloudlog_encrypt(GString *segment, BlueSkyCryptKeys *keys)
 }
 
 /* Make an decryption pass over a cloud log segment to decrypt items which were
- * encrypted.  TODO: Also computes a list of all offsets which at which valid
- * cloud log items are found. */
-void bluesky_cloudlog_decrypt(char *segment, size_t len, BlueSkyCryptKeys *keys)
+ * encrypted.  Also computes a list of all offsets which at which valid
+ * cloud log items are found and adds those offsets to items (if non-NULL). */
+void bluesky_cloudlog_decrypt(char *segment, size_t len,
+                              BlueSkyCryptKeys *keys,
+                              BlueSkyRangeset *items)
 {
     char *data = segment;
     size_t remaining_size = len;
+    size_t offset = 0;
 
     while (remaining_size >= sizeof(struct cloudlog_header)) {
         struct cloudlog_header *header = (struct cloudlog_header *)data;
@@ -529,11 +502,21 @@ void bluesky_cloudlog_decrypt(char *segment, size_t len, BlueSkyCryptKeys *keys)
         if (item_size > remaining_size)
             break;
         if (bluesky_crypt_block_decrypt(data, item_size, keys)) {
-            g_print("Decrypted valid cloud log item at offset %zd\n",
-                    data - segment);
+            if (items != NULL) {
+                g_print("  data item at %zx\n", offset);
+                bluesky_rangeset_insert(items, offset, item_size,
+                                        GINT_TO_POINTER(TRUE));
+            }
+        } else {
+            g_warning("Unauthenticated data at offset %zd", offset);
+            if (items != NULL) {
+                bluesky_rangeset_insert(items, offset, item_size,
+                                        GINT_TO_POINTER(TRUE));
+            }
         }
 
         data += item_size;
+        offset += item_size;
         remaining_size -= item_size;
     }
 }