Back out dirty reference tracking, as the design was flawed.

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

diff --git a/bluesky/bluesky-private.h b/bluesky/bluesky-private.h
index 636b664..8601228 100644 (file)
--- a/bluesky/bluesky-private.h
+++ b/bluesky/bluesky-private.h
@@ -224,6 +224,7 @@ struct _BlueSkyCloudLogState {
     GString *data;
     BlueSkyCloudPointer location;
     GList *inode_list;
+    GSList *writeback_list;     // Items which are being serialized right now
 };
 
 gboolean bluesky_cloudlog_equal(gconstpointer a, gconstpointer b);
@@ -248,15 +249,23 @@ uint32_t crc32c(uint32_t crc, const char *buf, unsigned int length);
 uint32_t crc32c_finalize(uint32_t crc);
 
 struct _BlueSkyLog {
+    BlueSkyFS *fs;
     char *log_directory;
     GAsyncQueue *queue;
     int fd, dirfd;
     int seq_num;
     GSList *committed;
 
+    /* The currently-open log file. */
+    BlueSkyCacheFile *current_log;
+
     /* Cache of log segments which have been memory-mapped. */
     GMutex *mmap_lock;
     GHashTable *mmap_cache;
+
+    /* 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;
 };
 
 /* An object for tracking log files which are stored locally--either the
@@ -265,16 +274,18 @@ struct _BlueSkyLog {
 struct _BlueSkyCacheFile {
     GMutex *lock;
     GCond *cond;
+    gint refcount;
     int type;                   // Only one of CLOUDLOG_{JOURNAL,CLOUD}
     int log_dir;
     int log_seq;
     char *filename;             // Local filename, relateive to log directory
-    gint refcount;              // References to the mmaped data
+    gint mapcount;              // References to the mmaped data
     const char *addr;           // May be null if data is not mapped in memory
     size_t len;
     BlueSkyFS *fs;
     BlueSkyLog *log;
-    gboolean fetching, ready;
+    gboolean fetching, ready;   // Cloud data: downloading or ready for use
+    int64_t atime;              // Access time, for cache management
 };
 
 BlueSkyLog *bluesky_log_new(const char *log_directory);
@@ -283,6 +294,11 @@ void bluesky_log_finish_all(GList *log_items);
 BlueSkyRCStr *bluesky_log_map_object(BlueSkyFS *fs, int log_dir, int log_seq,
                                      int log_offset, int log_size);
 void bluesky_mmap_unref(BlueSkyCacheFile *mmap);
+void bluesky_cachefile_unref(BlueSkyCacheFile *cachefile);
+
+BlueSkyCacheFile *bluesky_cachefile_lookup(BlueSkyFS *fs,
+                                           int clouddir, int log_seq);
+void bluesky_cachefile_gc(BlueSkyFS *fs);
 
 #ifdef __cplusplus
 }