if (log->data != NULL)
return;
- g_assert((log->location_flags | log->pending_write) & CLOUDLOG_JOURNAL);
-
- bluesky_cloudlog_stats_update(log, -1);
- log->data = bluesky_log_map_object(log->fs->log, log->log_seq,
- log->log_offset, log->log_size);
- bluesky_cloudlog_stats_update(log, 1);
+ if ((log->location_flags | log->pending_write) & CLOUDLOG_JOURNAL) {
+ bluesky_cloudlog_stats_update(log, -1);
+ log->data = bluesky_log_map_object(log->fs, -1, log->log_seq,
+ log->log_offset, log->log_size);
+ bluesky_cloudlog_stats_update(log, 1);
+ } else if (log->location_flags & CLOUDLOG_CLOUD) {
+ bluesky_cloudlog_stats_update(log, -1);
+ log->data = bluesky_log_map_object(log->fs, log->location.directory,
+ log->location.sequence,
+ log->location.offset,
+ log->location.size);
+ bluesky_cloudlog_stats_update(log, 1);
+ } else {
+ g_error("Unable to fetch cloudlog entry!");
+ }
g_cond_broadcast(log->cond);
}
bluesky_cloudlog_stats_update(log, -1);
+ /* TODO: Right now offset/size are set to the raw data, but we should add
+ * header parsing to the code which loads objects back in. */
log->location = state->location;
- log->location.offset = state->data->len;
- log->location.size
- = sizeof(struct log_header) + sizeof(BlueSkyCloudID) * 0
- + log->data->len;
+ log->location.offset = state->data->len + sizeof(struct log_header);
+ log->location.size = log->data->len;
+ /* = sizeof(struct log_header) + sizeof(BlueSkyCloudID) * 0
+ + log->data->len; */
struct log_header header;
memcpy(header.magic, "AgI ", 4);