X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fbluesky-private.h;h=73f38e14c182faed76fb036f2c95d0cfabb53441;hb=c0d52390142a72a89aa632172e03a3ec909890ed;hp=418c1e587106c32e47aaf83a7a8a67a4650e2efe;hpb=f2586554fd55cd3cc1be65ac33d1122d00372133;p=bluesky.git

diff --git a/bluesky/bluesky-private.h b/bluesky/bluesky-private.h
index 418c1e5..73f38e1 100644
--- a/bluesky/bluesky-private.h
+++ b/bluesky/bluesky-private.h
@@ -44,7 +44,7 @@ BlueSkyInode *bluesky_list_tail(GList *head);
  * persistent storage. */
 void bluesky_serialize_superblock(GString *out, BlueSkyFS *fs);
 BlueSkyFS *bluesky_deserialize_superblock(const gchar *buf);
-void bluesky_serialize_inode(GString *out, BlueSkyInode *inode);
+BlueSkyCloudLog *bluesky_serialize_inode(BlueSkyInode *inode);
 gboolean bluesky_deserialize_inode(BlueSkyInode *inode, const gchar *buf);
 
 /* Storage layer.  Requests can be performed asynchronously, so these objects
@@ -207,8 +207,10 @@ struct _BlueSkyCloudLog {
     // TODO: Location in journal/cache
     int log_seq, log_offset, log_size;
 
-    // Pointers to other objects
-    GArray *pointers;
+    // Pointers to other objects.  Each link counts towards the reference count
+    // of the pointed-to object.  To avoid memory leaks there should be no
+    // cycles in the reference graph.
+    GArray *links;
 
     // Serialized data, if available in memory (otherwise NULL), and a lock
     // count which tracks if there are users that require the data to be kept
@@ -231,10 +233,13 @@ gchar *bluesky_cloudlog_id_to_string(BlueSkyCloudID id);
 BlueSkyCloudID bluesky_cloudlog_id_from_string(const gchar *idstr);
 void bluesky_cloudlog_ref(BlueSkyCloudLog *log);
 void bluesky_cloudlog_unref(BlueSkyCloudLog *log);
+void bluesky_cloudlog_stats_update(BlueSkyCloudLog *log, int type);
 void bluesky_cloudlog_sync(BlueSkyCloudLog *log);
 void bluesky_cloudlog_insert(BlueSkyCloudLog *log);
-void bluesky_cloudlog_write_log(BlueSkyFS *fs);
 void bluesky_cloudlog_fetch(BlueSkyCloudLog *log);
+BlueSkyCloudPointer bluesky_cloudlog_serialize(BlueSkyCloudLog *log,
+                                               BlueSkyFS *fs);
+void bluesky_cloudlog_flush(BlueSkyFS *fs);
 
 /* Logging infrastructure for ensuring operations are persistently recorded to
  * disk. */
@@ -252,25 +257,40 @@ struct _BlueSkyLog {
     /* 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;
 };
 
-/* Reference-counted blocks of memory, used for passing data in and out of
- * storage backends and in other places.  This may also refer to read-only
- * mmaped data. */
-struct _BlueSkyMmap {
+/* 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 {
+    GMutex *lock;
+    GCond *cond;
     gint refcount;
+    int type;                   // Only one of CLOUDLOG_{JOURNAL,CLOUD}
+    int log_dir;
     int log_seq;
-    const char *addr;
+    char *filename;             // Local filename, relateive to log directory
+    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;
+    int64_t atime;              // Access time, for cache management
 };
 
 BlueSkyLog *bluesky_log_new(const char *log_directory);
 void bluesky_log_item_submit(BlueSkyCloudLog *item, BlueSkyLog *log);
 void bluesky_log_finish_all(GList *log_items);
-BlueSkyRCStr *bluesky_log_map_object(BlueSkyLog *log, int log_seq,
+BlueSkyRCStr *bluesky_log_map_object(BlueSkyFS *fs, int log_dir, int log_seq,
                                      int log_offset, int log_size);
-void bluesky_mmap_unref(BlueSkyMmap *mmap);
+void bluesky_mmap_unref(BlueSkyCacheFile *mmap);
+
+void bluesky_cachefile_gc(BlueSkyFS *fs);
 
 #ifdef __cplusplus
 }