X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fbluesky-private.h;h=e5b5b583919576614862bb79eb2cd2df06c86610;hb=a82b60b3b683840a7074110831bcbaa16a40f0eb;hp=c066fd3a013f33415b8a1e53bb9cd8a526422506;hpb=b8885660a453f0f1f30c9fed196b01a397482a19;p=bluesky.git

diff --git a/bluesky/bluesky-private.h b/bluesky/bluesky-private.h
index c066fd3..e5b5b58 100644
--- a/bluesky/bluesky-private.h
+++ b/bluesky/bluesky-private.h
@@ -192,13 +192,6 @@ struct _BlueSkyCloudLog {
     int location_flags;
     int pending_read, pending_write;
 
-    // If the object is not yet flushed to cloud storage but is written to a
-    // journal file locally, a reference to that journal file so that we can
-    // keep the dirty_refs count updated.  When the object is deleted or
-    // becomes clean, decrement the dirty_refs counter of the journal file and
-    // set this pointer to NULL.
-    BlueSkyCacheFile *dirty_journal;
-
     // A stable identifier for the object (only changes when authenticated data
     // is written out, but stays the same when the in-cloud cleaner relocates
     // the object).
@@ -231,6 +224,8 @@ struct _BlueSkyCloudLogState {
     GString *data;
     BlueSkyCloudPointer location;
     GList *inode_list;
+    GSList *writeback_list;     // Items which are being serialized right now
+    GList *pending_segments;    // Segments which are being uploaded now
 };
 
 gboolean bluesky_cloudlog_equal(gconstpointer a, gconstpointer b);
@@ -272,6 +267,10 @@ struct _BlueSkyLog {
     /* A count of the disk space consumed (in 1024-byte units) by all files
      * tracked by mmap_cache (whether mapped or not, actually). */
     gint disk_used;
+
+    /* The smallest journal sequence number which may still contain data that
+     * must be preserved (since it it not yet in the cloud). */
+    int journal_watermark;
 };
 
 /* An object for tracking log files which are stored locally--either the
@@ -292,11 +291,6 @@ struct _BlueSkyCacheFile {
     BlueSkyLog *log;
     gboolean fetching, ready;   // Cloud data: downloading or ready for use
     int64_t atime;              // Access time, for cache management
-
-    /* Journal: Count of objects which are not yet committed to cloud storage
-     * but need to be; a non-zero value prevents the journal file from being
-     * deleted. */
-    gint dirty_refs;
 };
 
 BlueSkyLog *bluesky_log_new(const char *log_directory);
@@ -311,6 +305,51 @@ BlueSkyCacheFile *bluesky_cachefile_lookup(BlueSkyFS *fs,
                                            int clouddir, int log_seq);
 void bluesky_cachefile_gc(BlueSkyFS *fs);
 
+/* Used to track log segments that are being written to the cloud. */
+typedef struct {
+    BlueSkyRCStr *data;
+    GSList *items;
+    GMutex *lock;
+    GCond *cond;
+    gboolean complete;
+} SerializedRecord;
+
+/***** Inode map management *****/
+
+/* Mapping information for a single inode number.  These are grouped together
+ * into InodeMapRange objects. */
+typedef struct {
+    uint64_t inum;
+
+    /* The ID of the most recent version of the inode. */
+    BlueSkyCloudID id;
+
+    /* The location where that version is written in the cloud. */
+    BlueSkyCloudPointer location;
+
+    /* If the cloud log entry exists in memory, then a pointer to it, otherwise
+     * NULL. */
+    BlueSkyCloudLog *item;
+} InodeMapEntry;
+
+typedef struct {
+    /* Starting and ending inode number values that fall in this section.
+     * Endpoint values are inclusive. */
+    uint64_t start, end;
+
+    /* A sorted list (by inode number) of InodeMapEntry objects. */
+    GSequence *map_entries;
+
+    /* The location where this inode map section is stored in the cloud. */
+    BlueSkyCloudPointer location;
+
+    /* Have there been changes that require writing this section out again? */
+    gboolean dirty;
+} InodeMapRange;
+
+InodeMapEntry *bluesky_inode_map_lookup(GSequence *inode_map, uint64_t inum,
+                                        int action);
+
 #ifdef __cplusplus
 }
 #endif