X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=6c727aff4a20a62dc800e5806079742cd32d7ec1;hp=a241210bebc0a559a087881f11d1d413c364656d;hb=d71f8b0bc81f564b57a062561dd136c6467f57e5;hpb=6804501c350181dea8f531142b28c620b70edbd9

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index a241210b..6c727aff 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <sys/time.h>
 #include <sys/mman.h>
 #include <unistd.h>
@@ -60,10 +61,6 @@
 typedef uint64_t tdb_len_t;
 typedef uint64_t tdb_off_t;
 
-#ifndef offsetof
-#define offsetof(t,f) ((unsigned int)&((t *)0)->f)
-#endif
-
 #define TDB_MAGIC_FOOD "TDB file\n"
 #define TDB_VERSION ((uint64_t)(0x26011967 + 7))
 #define TDB_MAGIC ((uint64_t)0x1999)
@@ -113,6 +110,10 @@ typedef uint64_t tdb_off_t;
 #define TDB_OFF_MASK \
 	(((1ULL << (64 - TDB_OFF_UPPER_STEAL)) - 1) - TDB_OFF_HASH_GROUP_MASK)
 
+/* We have to be able to fit a free record here. */
+#define TDB_MIN_DATA_LEN	\
+	(sizeof(struct tdb_free_record) - sizeof(struct tdb_used_record))
+
 /* We ensure buckets up to size 1 << (zone_bits - TDB_COMFORT_FACTOR_BITS). */
 /* FIXME: test this matches size_to_bucket! */
 #define BUCKETS_FOR_ZONE(zone_bits) ((zone_bits) + 2 - TDB_COMFORT_FACTOR_BITS)
@@ -242,7 +243,6 @@ struct hash_info {
 struct traverse_info {
 	struct traverse_level {
 		tdb_off_t hashtable;
-		const tdb_off_t *entries;
 		/* We ignore groups here, and treat it as a big array. */
 		unsigned entry;
 		unsigned int total_buckets;
@@ -283,9 +283,12 @@ struct tdb_context {
 	/* How much space has been mapped (<= current file size) */
 	tdb_len_t map_size;
 
-	/* Opened read-only? */
+	/* Operating read-only? (Opened O_RDONLY, or in traverse_read) */
 	bool read_only;
 
+	/* mmap read only? */
+	int mmap_flags;
+
 	/* Error code for last tdb error. */
 	enum TDB_ERROR ecode; 
 
@@ -347,7 +350,8 @@ tdb_off_t find_and_lock(struct tdb_context *tdb,
 			struct tdb_data key,
 			int ltype,
 			struct hash_info *h,
-			struct tdb_used_record *rec);
+			struct tdb_used_record *rec,
+			struct traverse_info *tinfo);
 
 int replace_in_hash(struct tdb_context *tdb,
 		    struct hash_info *h,
@@ -418,9 +422,11 @@ int tdb_write_off(struct tdb_context *tdb, tdb_off_t off, tdb_off_t val);
 /* Clear an ondisk area. */
 int zero_out(struct tdb_context *tdb, tdb_off_t off, tdb_len_t len);
 
-/* Return a non-zero offset in this array, or num. */
-tdb_off_t tdb_find_nonzero_off(struct tdb_context *tdb, tdb_off_t off,
-			       uint64_t num);
+/* Return a non-zero offset between >= start < end in this array (or end). */
+tdb_off_t tdb_find_nonzero_off(struct tdb_context *tdb,
+			       tdb_off_t base,
+			       uint64_t start,
+			       uint64_t end);
 
 /* Return a zero offset in this array, or num. */
 tdb_off_t tdb_find_zero_off(struct tdb_context *tdb, tdb_off_t off,