X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fbluesky.h;h=e9e40d81686818b8c4dba4fa7ed93651ae10a34f;hb=f2586554fd55cd3cc1be65ac33d1122d00372133;hp=4b17bda743e6c6917f4cc4628343962625d72a5e;hpb=8ec7f79f834ff8c3493b1bbdd63314d276786aa4;p=bluesky.git diff --git a/bluesky/bluesky.h b/bluesky/bluesky.h index 4b17bda..e9e40d8 100644 --- a/bluesky/bluesky.h +++ b/bluesky/bluesky.h @@ -63,16 +63,20 @@ void bluesky_init(void); gchar *bluesky_lowercase(const gchar *s); -/* Reference-counted blocks of memory, used for passing data in and out of - * storage backends and in other places. */ +struct _BlueSkyMmap; +typedef struct _BlueSkyMmap BlueSkyMmap; + typedef struct { gint refcount; + BlueSkyMmap *mmap; gchar *data; gsize len; } BlueSkyRCStr; BlueSkyRCStr *bluesky_string_new(gpointer data, gsize len); BlueSkyRCStr *bluesky_string_new_from_gstring(GString *s); +BlueSkyRCStr *bluesky_string_new_from_mmap(BlueSkyMmap *mmap, + int offset, gsize len); void bluesky_string_ref(BlueSkyRCStr *string); void bluesky_string_unref(BlueSkyRCStr *string); BlueSkyRCStr *bluesky_string_dup(BlueSkyRCStr *string); @@ -220,9 +224,6 @@ typedef struct { /* 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 */ - /* Version of the object last serialized and committed to storage. */ BlueSkyCloudLog *committed_item; @@ -271,15 +272,14 @@ typedef struct { #define BLUESKY_MAX_FILE_SIZE (BLUESKY_BLOCK_SIZE << 24) typedef enum { BLUESKY_BLOCK_ZERO = 0, /* Data is all zeroes, not explicitly stored */ - BLUESKY_BLOCK_REF = 1, /* Reference to key/value store, not cached */ - BLUESKY_BLOCK_CACHED = 2, /* Data is cached in memory, clean */ - BLUESKY_BLOCK_DIRTY = 3, /* Data needs to be committed to store */ + BLUESKY_BLOCK_REF = 1, /* Reference to cloud log item, data clean */ + BLUESKY_BLOCK_DIRTY = 2, /* Data needs to be committed to store */ } BlueSkyBlockType; typedef struct { BlueSkyBlockType type; - BlueSkyRCStr *data; /* Pointer to data in memory if cached */ - BlueSkyCloudLog *cloudref; /* Reference to cloud log entry with data */ + BlueSkyCloudLog *ref; /* if REF: cloud log entry with data */ + BlueSkyRCStr *dirty; /* if DIRTY: raw data in memory */ } BlueSkyBlock; BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store);