X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fbluesky.h;h=f72c6d02a2b3cde0a07389c4aeda96622fa1c27c;hb=db4915b4f7fc8f74958c4d1891dc69b76cbbe383;hp=29d9a624a4cdb54e0f0b288ca56f3494629865ab;hpb=ebdb5ef23b8e152a4793d5927b5d92d7e7b2cc4f;p=bluesky.git

diff --git a/bluesky/bluesky.h b/bluesky/bluesky.h
index 29d9a62..f72c6d0 100644
--- a/bluesky/bluesky.h
+++ b/bluesky/bluesky.h
@@ -93,6 +93,12 @@ BlueSkyRCStr *bluesky_crypt_decrypt(BlueSkyRCStr *in, const uint8_t *key);
 struct _BlueSkyStore;
 typedef struct _BlueSkyStore BlueSkyStore;
 
+struct _BlueSkyLog;
+typedef struct _BlueSkyLog BlueSkyLog;
+
+struct _BlueSkyCloudLogState;
+typedef struct _BlueSkyCloudLogState BlueSkyCloudLogState;
+
 void bluesky_store_init();
 BlueSkyStore *bluesky_store_new(const gchar *type);
 void bluesky_store_free(BlueSkyStore *store);
@@ -126,6 +132,8 @@ typedef struct {
     uint64_t next_inum;         /* Next available inode for allocation */
 
     BlueSkyStore *store;
+    BlueSkyLog *log;
+    BlueSkyCloudLogState *log_state;
 
     /* Accounting for memory used for caches.  Space is measured in blocks, not
      * bytes.  We track both total data in the caches and dirty data (total
@@ -138,10 +146,16 @@ typedef struct {
      * avoid deadlock do not attempt to take any other locks while the FS lock
      * is held for list editing purposes.  Items at the head of the list are
      * most recently accessed/modified. */
-    GList dirty_list, accessed_list;
+    GList unlogged_list;        // Changes not yet synced to journal
+    GList dirty_list;           // Not yet written to cloud storage
+    GList accessed_list;        // All in-memory inodes
 
     /* Mutex for the flush daemon, to prevent concurrent execution. */
     GMutex *flushd_lock;
+
+    /* Mapping of object identifiers (blocks, inodes) to physical location (in
+     * the local cache or in the logs in the cloud). */
+    GHashTable *locations;
 } BlueSkyFS;
 
 /* Inode number of the root directory. */
@@ -191,8 +205,9 @@ typedef struct {
     /* change_count is increased with every operation which modifies the inode,
      * and can be used to determine if cached data is still valid.
      * change_commit is the value of change_count when the inode was last
-     * committed to stable storage. */
-    uint64_t change_count, change_commit;
+     * committed to stable storage (the log).
+     * change_cloud tracks which version was last commited to cloud storage. */
+    uint64_t change_count, change_commit, change_cloud;
 
     /* Timestamp for controlling when modified data is flushed to stable
      * storage.  When an inode is first modified from a clean state, this is
@@ -209,7 +224,7 @@ typedef struct {
      * dirty linked lists.  We re-use the GList structure, using ->next to
      * point to the head of the list and ->prev to point to the tail.  The data
      * element is unused. */
-    GList *accessed_list, *dirty_list;
+    GList *unlogged_list, *accessed_list, *dirty_list;
 
     int64_t atime;              /* Microseconds since the Unix epoch */
     int64_t ctime;