/* And 8 entries in each group, ie 8 groups per sublevel. */
#define TDB_HASH_GROUP_BITS 3
-/* Extend file by least 32 times larger than needed. */
-#define TDB_EXTENSION_FACTOR 32
+/* Extend file by least 100 times larger than needed. */
+#define TDB_EXTENSION_FACTOR 100
/* We steal bits from the offsets to store hash info. */
#define TDB_OFF_HASH_GROUP_MASK ((1ULL << TDB_HASH_GROUP_BITS) - 1)
}
struct tdb_free_record {
- uint64_t magic_and_meta; /* TDB_OFF_UPPER_STEAL bits of magic */
- uint64_t data_len; /* Not counting these two fields. */
- /* This is why the minimum record size is 16 bytes. */
- uint64_t next, prev;
+ uint64_t magic_and_prev; /* TDB_OFF_UPPER_STEAL bits magic, then prev */
+ uint64_t flist_and_len; /* Len not counting these two fields. */
+ /* This is why the minimum record size is 8 bytes. */
+ uint64_t next;
};
+static inline uint64_t frec_prev(const struct tdb_free_record *f)
+{
+ return f->magic_and_prev & ((1ULL << (64 - TDB_OFF_UPPER_STEAL)) - 1);
+}
+
static inline uint64_t frec_magic(const struct tdb_free_record *f)
{
- return f->magic_and_meta >> (64 - TDB_OFF_UPPER_STEAL);
+ return f->magic_and_prev >> (64 - TDB_OFF_UPPER_STEAL);
+}
+
+static inline uint64_t frec_len(const struct tdb_free_record *f)
+{
+ return f->flist_and_len & ((1ULL << (64 - TDB_OFF_UPPER_STEAL))-1);
}
-static inline uint64_t frec_flist(const struct tdb_free_record *f)
+static inline unsigned frec_flist(const struct tdb_free_record *f)
{
- return f->magic_and_meta & ((1ULL << (64 - TDB_OFF_UPPER_STEAL)) - 1);
+ return f->flist_and_len >> (64 - TDB_OFF_UPPER_STEAL);
}
struct tdb_recovery_record {
/* What freelist are we using? */
uint64_t flist_off;
+ unsigned int flist;
/* IO methods: changes for transactions. */
const struct tdb_methods *methods;