tdb2: merge tdb1_context into tdb_context.

Finally, we split out the tdb2-specific parts of tdb_context, and put
them into a "tdb2" sub-struct; the tdb1 parts go into a "tdb1"
sub-struct.  We get rido of tdb1_context and use tdb_context
everywhere.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit bbeb528e74c0e234e1f724ac8d54be404cfc6f9a)

1 files changed, 47 insertions, 155 deletions

diff --git a/lib/tdb2/tdb1_private.h b/lib/tdb2/tdb1_private.h
index bff967b25b..034c7e3328 100644
--- a/lib/tdb2/tdb1_private.h
+++ b/lib/tdb2/tdb1_private.h
@@ -28,44 +28,6 @@
 #include "private.h"
 #include "tdb1.h"
 
-/**** FIXME: Type overrides for tdb2, for transition! */
-#define tdb_logerr(tdb, ecode, level, ...) \
-	tdb_logerr((struct tdb_context *)(tdb), (ecode), (level), __VA_ARGS__)
-
-#define tdb_error(tdb) \
-	tdb_error((struct tdb_context *)(tdb))
-
-#define tdb_brlock(tdb1, rw_type, offset, len, flags)	\
-	tdb_brlock((struct tdb_context *)(tdb1),	\
-		   (rw_type), (offset), (len), (flags))
-
-#define tdb_brunlock(tdb1, rw_type, offset, len) \
-	tdb_brunlock((struct tdb_context *)(tdb1), (rw_type), (offset), (len))
-
-#define tdb_nest_lock(tdb1, offset, ltype, flags)	\
-	tdb_nest_lock((struct tdb_context *)(tdb1), (offset), (ltype), (flags))
-
-#define tdb_nest_unlock(tdb1, offset, ltype)	\
-	tdb_nest_unlock((struct tdb_context *)(tdb1), (offset), (ltype))
-
-#define tdb_allrecord_lock(tdb1, offset, flags, upgradable)		\
-	tdb_allrecord_lock((struct tdb_context *)(tdb1),		\
-			   (offset), (flags), (upgradable))
-
-#define tdb_allrecord_unlock(tdb1, ltype)				\
-	tdb_allrecord_unlock((struct tdb_context *)(tdb1), (ltype))
-
-#define tdb_allrecord_upgrade(tdb1, start)				\
-	tdb_allrecord_upgrade((struct tdb_context *)(tdb1), (start))
-
-#define tdb_hash(tdb1, ptr, len) \
-	tdb_hash((struct tdb_context *)(tdb1), (ptr), (len))
-
-#define tdb_lock_gradual(tdb1, ltype, flags, off, len)	\
-	tdb_lock_gradual((struct tdb_context *)(tdb1),	\
-			 (ltype), (flags), (off), (len))
-/***** END FIXME ***/
-
 #include <limits.h>
 
 /* #define TDB_TRACE 1 */
@@ -85,9 +47,6 @@
 #define __location__ __FILE__ ":" __STRINGSTRING(__LINE__)
 #endif
 
-typedef uint32_t tdb1_len_t;
-typedef uint32_t tdb1_off_t;
-
 #ifndef offsetof
 #define offsetof(t,f) ((unsigned int)&((t *)0)->f)
 #endif
@@ -107,7 +66,7 @@ typedef uint32_t tdb1_off_t;
 #define TDB1_DEAD(r) ((r)->magic == TDB1_DEAD_MAGIC)
 #define TDB1_BAD_MAGIC(r) ((r)->magic != TDB1_MAGIC && !TDB1_DEAD(r))
 #define TDB1_HASH_TOP(hash) (TDB1_FREELIST_TOP + (TDB1_BUCKET(hash)+1)*sizeof(tdb1_off_t))
-#define TDB1_HASHTABLE_SIZE(tdb) ((tdb->header.hash_size+1)*sizeof(tdb1_off_t))
+#define TDB1_HASHTABLE_SIZE(tdb) ((tdb->tdb1.header.hash_size+1)*sizeof(tdb1_off_t))
 #define TDB1_DATA_START(hash_size) (TDB1_HASH_TOP(hash_size-1) + sizeof(tdb1_off_t))
 #define TDB1_RECOVERY_HEAD offsetof(struct tdb1_header, recovery_start)
 #define TDB1_SEQNUM_OFS    offsetof(struct tdb1_header, sequence_number)
@@ -121,10 +80,10 @@ typedef uint32_t tdb1_off_t;
 
 /* free memory if the pointer is valid and zero the pointer */
 #ifndef SAFE_FREE
-#define SAFE_FREE(x) do { if ((x) != NULL) {free(x); (x)=NULL;} } while(0)
+#define SAFE_FREE(x) do { if ((x) != NULL) {free((void *)x); (x)=NULL;} } while(0)
 #endif
 
-#define TDB1_BUCKET(hash) ((hash) % tdb->header.hash_size)
+#define TDB1_BUCKET(hash) ((hash) % tdb->tdb1.header.hash_size)
 
 #define TDB1_DOCONV() (tdb->flags & TDB_CONVERT)
 #define TDB1_CONV(x) (TDB1_DOCONV() ? tdb1_convert(&x, sizeof(x)) : &x)
@@ -151,141 +110,74 @@ struct tdb1_record {
 };
 
 
-/* this is stored at the front of every database */
-struct tdb1_header {
-	char magic_food[32]; /* for /etc/magic */
-	uint32_t version; /* version of the code */
-	uint32_t hash_size; /* number of hash entries */
-	tdb1_off_t rwlocks; /* obsolete - kept to detect old formats */
-	tdb1_off_t recovery_start; /* offset of transaction recovery region */
-	tdb1_off_t sequence_number; /* used when TDB1_SEQNUM is set */
-	uint32_t magic1_hash; /* hash of TDB_MAGIC_FOOD. */
-	uint32_t magic2_hash; /* hash of TDB1_MAGIC. */
-	tdb1_off_t reserved[27];
-};
-
-struct tdb1_traverse_lock {
-	struct tdb1_traverse_lock *next;
-	uint32_t off;
-	uint32_t hash;
-	int lock_rw;
-};
-
-struct tdb1_context;
-
 struct tdb1_methods {
-	int (*tdb1_read)(struct tdb1_context *, tdb1_off_t , void *, tdb1_len_t , int );
-	int (*tdb1_write)(struct tdb1_context *, tdb1_off_t, const void *, tdb1_len_t);
-	void (*next_hash_chain)(struct tdb1_context *, uint32_t *);
-	int (*tdb1_oob)(struct tdb1_context *, tdb1_off_t , int );
-	int (*tdb1_expand_file)(struct tdb1_context *, tdb1_off_t , tdb1_off_t );
+	int (*tdb1_read)(struct tdb_context *, tdb1_off_t , void *, tdb1_len_t , int );
+	int (*tdb1_write)(struct tdb_context *, tdb1_off_t, const void *, tdb1_len_t);
+	void (*next_hash_chain)(struct tdb_context *, uint32_t *);
+	int (*tdb1_oob)(struct tdb_context *, tdb1_off_t , int );
+	int (*tdb1_expand_file)(struct tdb_context *, tdb1_off_t , tdb1_off_t );
 };
 
-struct tdb1_context {
-	struct tdb1_context *next;
-
-	char *name; /* the name of the database */
-
-	/* Logging function */
-	void (*log_fn)(struct tdb1_context *tdb,
-		       enum tdb_log_level level,
-		       enum TDB_ERROR ecode,
-		       const char *message,
-		       void *data);
-	void *log_data;
-
-	/* Last error we returned. */
-	enum TDB_ERROR last_error; /* error code for last tdb error */
-
-	/* The actual file information */
-	struct tdb_file *file;
-
-	int open_flags; /* flags used in the open - needed by reopen */
-
-	/* low level (fnctl) lock functions. */
-	int (*lock_fn)(int fd, int rw, off_t off, off_t len, bool w, void *);
-	int (*unlock_fn)(int fd, int rw, off_t off, off_t len, void *);
-	void *lock_data;
-
-	uint32_t flags; /* the flags passed to tdb1_open */
-
-	/* Our statistics. */
-	struct tdb_attribute_stats stats;
-
-	/* Hash function. */
-	uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
-	void *hash_data;
-	uint64_t hash_seed;
-
-	int traverse_read; /* read-only traversal */
-	int traverse_write; /* read-write traversal */
-	struct tdb1_header header; /* a cached copy of the header */
-	struct tdb1_traverse_lock travlocks; /* current traversal locks */
-	const struct tdb1_methods *methods;
-	struct tdb1_transaction *transaction;
-	int page_size;
-	int max_dead_records;
-};
 
 /*
   internal prototypes
 */
-int tdb1_munmap(struct tdb1_context *tdb);
-void tdb1_mmap(struct tdb1_context *tdb);
-int tdb1_lock(struct tdb1_context *tdb, int list, int ltype);
-int tdb1_nest_lock(struct tdb1_context *tdb, uint32_t offset, int ltype,
+int tdb1_munmap(struct tdb_context *tdb);
+void tdb1_mmap(struct tdb_context *tdb);
+int tdb1_lock(struct tdb_context *tdb, int list, int ltype);
+int tdb1_nest_lock(struct tdb_context *tdb, uint32_t offset, int ltype,
 		  enum tdb_lock_flags flags);
-int tdb1_nest_unlock(struct tdb1_context *tdb, uint32_t offset, int ltype);
-int tdb1_unlock(struct tdb1_context *tdb, int list, int ltype);
-int tdb1_brlock(struct tdb1_context *tdb,
+int tdb1_nest_unlock(struct tdb_context *tdb, uint32_t offset, int ltype);
+int tdb1_unlock(struct tdb_context *tdb, int list, int ltype);
+int tdb1_brlock(struct tdb_context *tdb,
 	       int rw_type, tdb1_off_t offset, size_t len,
 	       enum tdb_lock_flags flags);
-int tdb1_brunlock(struct tdb1_context *tdb,
+int tdb1_brunlock(struct tdb_context *tdb,
 		 int rw_type, tdb1_off_t offset, size_t len);
-bool tdb1_have_extra_locks(struct tdb1_context *tdb);
-void tdb1_release_transaction_locks(struct tdb1_context *tdb);
-int tdb1_transaction_lock(struct tdb1_context *tdb, int ltype,
+bool tdb1_have_extra_locks(struct tdb_context *tdb);
+void tdb1_release_transaction_locks(struct tdb_context *tdb);
+int tdb1_transaction_lock(struct tdb_context *tdb, int ltype,
 			 enum tdb_lock_flags lockflags);
-int tdb1_transaction_unlock(struct tdb1_context *tdb, int ltype);
-int tdb1_recovery_area(struct tdb1_context *tdb,
+int tdb1_transaction_unlock(struct tdb_context *tdb, int ltype);
+int tdb1_recovery_area(struct tdb_context *tdb,
 		      const struct tdb1_methods *methods,
 		      tdb1_off_t *recovery_offset,
 		      struct tdb1_record *rec);
-int tdb1_allrecord_lock(struct tdb1_context *tdb, int ltype,
+int tdb1_allrecord_lock(struct tdb_context *tdb, int ltype,
 		       enum tdb_lock_flags flags, bool upgradable);
-int tdb1_allrecord_unlock(struct tdb1_context *tdb, int ltype);
-int tdb1_allrecord_upgrade(struct tdb1_context *tdb);
-int tdb1_write_lock_record(struct tdb1_context *tdb, tdb1_off_t off);
-int tdb1_write_unlock_record(struct tdb1_context *tdb, tdb1_off_t off);
-int tdb1_ofs_read(struct tdb1_context *tdb, tdb1_off_t offset, tdb1_off_t *d);
-int tdb1_ofs_write(struct tdb1_context *tdb, tdb1_off_t offset, tdb1_off_t *d);
+int tdb1_allrecord_unlock(struct tdb_context *tdb, int ltype);
+int tdb1_allrecord_upgrade(struct tdb_context *tdb);
+int tdb1_write_lock_record(struct tdb_context *tdb, tdb1_off_t off);
+int tdb1_write_unlock_record(struct tdb_context *tdb, tdb1_off_t off);
+int tdb1_ofs_read(struct tdb_context *tdb, tdb1_off_t offset, tdb1_off_t *d);
+int tdb1_ofs_write(struct tdb_context *tdb, tdb1_off_t offset, tdb1_off_t *d);
 void *tdb1_convert(void *buf, uint32_t size);
-int tdb1_free(struct tdb1_context *tdb, tdb1_off_t offset, struct tdb1_record *rec);
-tdb1_off_t tdb1_allocate(struct tdb1_context *tdb, tdb1_len_t length, struct tdb1_record *rec);
-int tdb1_ofs_read(struct tdb1_context *tdb, tdb1_off_t offset, tdb1_off_t *d);
-int tdb1_ofs_write(struct tdb1_context *tdb, tdb1_off_t offset, tdb1_off_t *d);
-int tdb1_lock_record(struct tdb1_context *tdb, tdb1_off_t off);
-int tdb1_unlock_record(struct tdb1_context *tdb, tdb1_off_t off);
-bool tdb1_needs_recovery(struct tdb1_context *tdb);
-int tdb1_rec_read(struct tdb1_context *tdb, tdb1_off_t offset, struct tdb1_record *rec);
-int tdb1_rec_write(struct tdb1_context *tdb, tdb1_off_t offset, struct tdb1_record *rec);
-int tdb1_do_delete(struct tdb1_context *tdb, tdb1_off_t rec_ptr, struct tdb1_record *rec);
-unsigned char *tdb1_alloc_read(struct tdb1_context *tdb, tdb1_off_t offset, tdb1_len_t len);
-int tdb1_parse_data(struct tdb1_context *tdb, TDB_DATA key,
+int tdb1_free(struct tdb_context *tdb, tdb1_off_t offset, struct tdb1_record *rec);
+tdb1_off_t tdb1_allocate(struct tdb_context *tdb, tdb1_len_t length, struct tdb1_record *rec);
+int tdb1_ofs_read(struct tdb_context *tdb, tdb1_off_t offset, tdb1_off_t *d);
+int tdb1_ofs_write(struct tdb_context *tdb, tdb1_off_t offset, tdb1_off_t *d);
+int tdb1_lock_record(struct tdb_context *tdb, tdb1_off_t off);
+int tdb1_unlock_record(struct tdb_context *tdb, tdb1_off_t off);
+bool tdb1_needs_recovery(struct tdb_context *tdb);
+int tdb1_rec_read(struct tdb_context *tdb, tdb1_off_t offset, struct tdb1_record *rec);
+int tdb1_rec_write(struct tdb_context *tdb, tdb1_off_t offset, struct tdb1_record *rec);
+int tdb1_do_delete(struct tdb_context *tdb, tdb1_off_t rec_ptr, struct tdb1_record *rec);
+unsigned char *tdb1_alloc_read(struct tdb_context *tdb, tdb1_off_t offset, tdb1_len_t len);
+int tdb1_parse_data(struct tdb_context *tdb, TDB_DATA key,
 		   tdb1_off_t offset, tdb1_len_t len,
 		   int (*parser)(TDB_DATA key, TDB_DATA data,
 				 void *private_data),
 		   void *private_data);
-tdb1_off_t tdb1_find_lock_hash(struct tdb1_context *tdb, TDB_DATA key, uint32_t hash, int locktype,
+tdb1_off_t tdb1_find_lock_hash(struct tdb_context *tdb, TDB_DATA key, uint32_t hash, int locktype,
 			   struct tdb1_record *rec);
-void tdb1_io_init(struct tdb1_context *tdb);
-int tdb1_expand(struct tdb1_context *tdb, tdb1_off_t size);
-int tdb1_rec_free_read(struct tdb1_context *tdb, tdb1_off_t off,
+void tdb1_io_init(struct tdb_context *tdb);
+int tdb1_expand(struct tdb_context *tdb, tdb1_off_t size);
+int tdb1_rec_free_read(struct tdb_context *tdb, tdb1_off_t off,
 		      struct tdb1_record *rec);
 bool tdb1_write_all(int fd, const void *buf, size_t count);
-int tdb1_transaction_recover(struct tdb1_context *tdb);
-void tdb1_header_hash(struct tdb1_context *tdb,
+int tdb1_transaction_recover(struct tdb_context *tdb);
+void tdb1_header_hash(struct tdb_context *tdb,
 		     uint32_t *magic1_hash, uint32_t *magic2_hash);
 uint64_t tdb1_old_hash(const void *key, size_t len, uint64_t seed, void *);
-size_t tdb1_dead_space(struct tdb1_context *tdb, tdb1_off_t off);
+size_t tdb1_dead_space(struct tdb_context *tdb, tdb1_off_t off);
 #endif /* CCAN_TDB2_TDB1_PRIVATE_H */