Bugfix in partial log fetching.

[bluesky.git] / bluesky / bluesky-private.h

diff --git a/bluesky/bluesky-private.h b/bluesky/bluesky-private.h
index dfcb7c5..b064465 100644 (file)
--- a/bluesky/bluesky-private.h
+++ b/bluesky/bluesky-private.h
@@ -81,7 +81,8 @@ gboolean bluesky_crypt_block_decrypt(gchar *cloud_block, size_t len,
                                      BlueSkyCryptKeys *keys);
 void bluesky_cloudlog_encrypt(GString *segment, BlueSkyCryptKeys *keys);
 void bluesky_cloudlog_decrypt(char *segment, size_t len,
-                              BlueSkyCryptKeys *keys);
+                              BlueSkyCryptKeys *keys,
+                              BlueSkyRangeset *items);
 
 /* Storage layer.  Requests can be performed asynchronously, so these objects
  * help keep track of operations in progress. */
@@ -101,8 +102,8 @@ typedef enum {
 } BlueSkyAsyncStatus;
 
 struct BlueSkyNotifierList;
-typedef struct _BlueSkyStoreAsync BlueSkyStoreAsync;
-struct _BlueSkyStoreAsync {
+typedef struct BlueSkyStoreAsync BlueSkyStoreAsync;
+struct BlueSkyStoreAsync {
     BlueSkyStore *store;
 
     GMutex *lock;
@@ -116,6 +117,14 @@ struct _BlueSkyStoreAsync {
     gchar *key;                 /* Key to read/write */
     BlueSkyRCStr *data;         /* Data read/to write */
 
+    /* For range requests on reads: starting byte offset and length; len 0
+     * implies reading to the end of the object.  At completion, the backend
+     * should set range_done if a range read was made; if not set the entire
+     * object was read and the storage layer will select out just the
+     * appropriate bytes. */
+    size_t start, len;
+    gboolean range_done;
+
     int result;                 /* Result code; 0 for success. */
     struct BlueSkyNotifierList *notifiers;
     gint notifier_count;
@@ -256,7 +265,7 @@ struct cloudlog_header {
 #define CLOUDLOG_CLOUD      0x02
 #define CLOUDLOG_CACHE      0x04
 #define CLOUDLOG_UNCOMMITTED 0x10
-struct _BlueSkyCloudLog {
+struct BlueSkyCloudLog {
     gint refcount;
     GMutex *lock;
     GCond *cond;
@@ -300,7 +309,7 @@ struct _BlueSkyCloudLog {
 };
 
 /* Serialize objects into a log segment to be written to the cloud. */
-struct _BlueSkyCloudLogState {
+struct BlueSkyCloudLogState {
     GString *data;
     BlueSkyCloudPointer location;
     GList *inode_list;
@@ -335,7 +344,7 @@ void bluesky_cloudlog_flush(BlueSkyFS *fs);
 uint32_t crc32c(uint32_t crc, const char *buf, unsigned int length);
 uint32_t crc32c_finalize(uint32_t crc);
 
-struct _BlueSkyLog {
+struct BlueSkyLog {
     BlueSkyFS *fs;
     char *log_directory;
     GAsyncQueue *queue;
@@ -362,7 +371,7 @@ struct _BlueSkyLog {
 /* An object for tracking log files which are stored locally--either the
  * journal for filesystem consistency or log segments which have been fetched
  * back from cloud storage. */
-struct _BlueSkyCacheFile {
+struct BlueSkyCacheFile {
     GMutex *lock;
     GCond *cond;
     gint refcount;
@@ -377,6 +386,7 @@ struct _BlueSkyCacheFile {
     BlueSkyLog *log;
     gboolean fetching, ready;   // Cloud data: downloading or ready for use
     int64_t atime;              // Access time, for cache management
+    BlueSkyRangeset *items;     // Locations of valid items
 };
 
 BlueSkyLog *bluesky_log_new(const char *log_directory);
@@ -385,13 +395,13 @@ void bluesky_log_finish_all(GList *log_items);
 BlueSkyCloudLog *bluesky_log_get_commit_point(BlueSkyFS *fs);
 void bluesky_log_write_commit_point(BlueSkyFS *fs, BlueSkyCloudLog *marker);
 
-BlueSkyRCStr *bluesky_log_map_object(BlueSkyFS *fs, int log_dir, int log_seq,
-                                     int log_offset, int log_size);
+BlueSkyRCStr *bluesky_log_map_object(BlueSkyCloudLog *item, gboolean map_data);
 void bluesky_mmap_unref(BlueSkyCacheFile *mmap);
 void bluesky_cachefile_unref(BlueSkyCacheFile *cachefile);
 
 BlueSkyCacheFile *bluesky_cachefile_lookup(BlueSkyFS *fs,
-                                           int clouddir, int log_seq);
+                                           int clouddir, int log_seq,
+                                           gboolean start_fetch);
 void bluesky_cachefile_gc(BlueSkyFS *fs);
 
 void bluesky_replay(BlueSkyFS *fs);