X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fbluesky.h;h=59a33c59354d03b31b377f0754bb989b1bf8ebb7;hb=e26a903ddf80011e3b72a780d7392a8333c996af;hp=7b8aad2073cfb787462f388995965320b75064fa;hpb=e6ca13c07e0cb5dd05d48a12cd50a2cf6179ce1a;p=bluesky.git

diff --git a/bluesky/bluesky.h b/bluesky/bluesky.h
index 7b8aad2..59a33c5 100644
--- a/bluesky/bluesky.h
+++ b/bluesky/bluesky.h
@@ -37,6 +37,10 @@ typedef struct {
 
 extern BlueSkyOptions bluesky_options;
 
+/* Maximum number of threads to use in any particular thread pool, or -1 for no
+ * limit */
+extern int bluesky_max_threads;
+
 /* BlueSky status and error codes.  Various frontends should translate these to
  * the appropriate error code for whatever protocol they implement. */
 typedef enum {
@@ -112,6 +116,19 @@ typedef struct {
     uint64_t next_inum;         /* Next available inode for allocation */
 
     BlueSkyStore *store;
+
+    /* 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
+     * data includes dirty data).  Updates to these variables must be made
+     * atomically. */
+    gint cache_total, cache_dirty;
+
+    /* Linked list of inodes, sorted by access/modification times for cache
+     * management.  Editing these lists is protected by the filesystem lock; to
+     * 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;
 } BlueSkyFS;
 
 /* Inode number of the root directory. */
@@ -169,9 +186,18 @@ typedef struct {
      * set to the current time.  If the inode is clean, it is set to zero. */
     int64_t change_time;
 
+    /* Last access time to this inode, for controlling cache evictions. */
+    int64_t access_time;
+
     /* Additional state for tracking cache writeback status. */
     uint64_t change_pending;    /* change_count version currently being committed to storage */
 
+    /* Pointers to the linked-list elements for this inode in the accessed and
+     * 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;
+
     int64_t atime;              /* Microseconds since the Unix epoch */
     int64_t ctime;
     int64_t mtime;
@@ -244,8 +270,6 @@ gboolean bluesky_directory_insert(BlueSkyInode *dir, const gchar *name,
                                   uint64_t inum);
 void bluesky_directory_dump(BlueSkyInode *dir);
 
-void bluesky_block_touch(BlueSkyInode *inode, uint64_t i);
-void bluesky_block_fetch(BlueSkyFS *fs, BlueSkyBlock *block);
 void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size);
 void bluesky_file_write(BlueSkyInode *inode, uint64_t offset,
                         const char *data, gint len);