return item;
}
+/* Attempt to prefetch a cloud log item. This does not guarantee that it will
+ * be made available, but does make it more likely that a future call to
+ * bluesky_cloudlog_fetch will complete quickly. Item must be locked? */
+void bluesky_cloudlog_prefetch(BlueSkyCloudLog *item)
+{
+ if (item->data != NULL)
+ return;
+
+ /* TODO: Some of the code here is duplicated with bluesky_log_map_object.
+ * Refactor to fix that. */
+ BlueSkyFS *fs = item->fs;
+ BlueSkyCacheFile *map = NULL;
+
+ /* First, check to see if the journal still contains a copy of the item and
+ * if so update the atime on the journal so it is likely to be kept around
+ * until we need it. */
+ if ((item->location_flags | item->pending_write) & CLOUDLOG_JOURNAL) {
+ map = bluesky_cachefile_lookup(fs, -1, item->log_seq, TRUE);
+ if (map != NULL) {
+ map->atime = bluesky_get_current_time();
+ bluesky_cachefile_unref(map);
+ g_mutex_unlock(map->lock);
+ return;
+ }
+ }
+
+ item->location_flags &= ~CLOUDLOG_JOURNAL;
+ if (!(item->location_flags & CLOUDLOG_CLOUD))
+ return;
+
+ map = bluesky_cachefile_lookup(fs,
+ item->location.directory,
+ item->location.sequence,
+ FALSE);
+ if (map == NULL)
+ return;
+
+ /* At this point, we have information about the log segment containing the
+ * item we need. If our item is already fetched, we have nothing to do
+ * except update the atime. If not, queue up a fetch of our object. */
+ const BlueSkyRangesetItem *rangeitem;
+ rangeitem = bluesky_rangeset_lookup(map->items,
+ item->location.offset);
+ if (rangeitem == NULL) {
+ if (map->prefetches == NULL)
+ map->prefetches = bluesky_rangeset_new();
+
+ gchar *id = bluesky_cloudlog_id_to_string(item->id);
+ g_print("Need to prefetch %s\n", id);
+ g_free(id);
+
+ bluesky_rangeset_insert(map->prefetches,
+ item->location.offset,
+ item->location.size, NULL);
+
+ uint64_t start, length;
+ bluesky_rangeset_get_extents(map->prefetches, &start, &length);
+ g_print("Range to prefetch: %"PRIu64" + %"PRIu64"\n", start, length);
+ }
+
+ bluesky_cachefile_unref(map);
+ g_mutex_unlock(map->lock);
+}
+
/* Ensure that a cloud log item is loaded in memory, and if not read it in.
* TODO: Make asynchronous, and make this also fetch from the cloud. Right now
* we only read from the log. Log item must be locked. */
* Once that is done, we can fall through the case of remapping the data
* itself. */
if (log->type == LOGTYPE_UNKNOWN) {
- bluesky_cloudlog_stats_update(log, -1);
- 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);
- bluesky_cloudlog_stats_update(log, 1);
}
/* 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!");
}
/* 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;
if (item_size > remaining_size)
break;
if (bluesky_crypt_block_decrypt(data, item_size, keys)) {
- /* TODO: Mark block as valid. */
+ 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;
}
}