X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=8d961e82c365c6b0f6956fbf1019451c285597f5;hp=1650cf833d7988599e1d73e55181ed9317bbb1c6;hb=0fd5be2955f8e6487c0f4ab711e2a6958bb8f412;hpb=a8bb84de3dd8b14701c96e02da669abd8ac525ff

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 1650cf83..8d961e82 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -18,26 +18,18 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "config.h"
-#if HAVE_FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#endif
-#include <stdint.h>
-#include <stdbool.h>
+#include <ccan/tdb2/tdb2.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <sys/time.h>
 #include <sys/mman.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <string.h>
 #include <errno.h>
 #include <stdio.h>
 #include <utime.h>
 #include <unistd.h>
-#include <ccan/tdb2/tdb2.h>
 #include <ccan/likely/likely.h>
-#include <ccan/compiler/compiler.h>
 #include <ccan/endian/endian.h>
 
 #ifndef TEST_IT
@@ -85,10 +77,10 @@ typedef int tdb_bool_err;
 
 /* Prevent others from opening the file. */
 #define TDB_OPEN_LOCK 0
-/* Doing a transaction. */
-#define TDB_TRANSACTION_LOCK 1
 /* Expanding file. */
 #define TDB_EXPANSION_LOCK 2
+/* Doing a transaction. */
+#define TDB_TRANSACTION_LOCK 8
 /* Hash chain locks. */
 #define TDB_HASH_LOCK_START 64
 
@@ -291,7 +283,7 @@ enum tdb_lock_flags {
 
 struct tdb_lock {
 	struct tdb_context *owner;
-	uint32_t off;
+	off_t off;
 	uint32_t count;
 	uint32_t ltype;
 };
@@ -306,9 +298,6 @@ struct tdb_access_hdr {
 };
 
 struct tdb_file {
-	/* Single list of all TDBs, to detect multiple opens. */
-	struct tdb_file *next;
-
 	/* How many are sharing us? */
 	unsigned int refcnt;
 
@@ -333,38 +322,42 @@ struct tdb_file {
 };
 
 struct tdb_context {
+	/* Single list of all TDBs, to detect multiple opens. */
+	struct tdb_context *next;
+
 	/* Filename of the database. */
 	const char *name;
 
-	/* Are we accessing directly? (debugging check). */
-	int direct_access;
-
-	/* Operating read-only? (Opened O_RDONLY, or in traverse_read) */
-	bool read_only;
-
-	/* mmap read only? */
-	int mmap_flags;
-
-	/* the flags passed to tdb_open, for tdb_reopen. */
-	uint32_t flags;
-
 	/* Logging function */
 	void (*log_fn)(struct tdb_context *tdb,
 		       enum tdb_log_level level,
+		       enum TDB_ERROR ecode,
 		       const char *message,
 		       void *data);
 	void *log_data;
 
-	/* Hash function. */
-	uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
-	void *hash_data;
-	uint64_t hash_seed;
+	/* Open flags passed to tdb_open. */
+	int open_flags;
 
 	/* 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;
 
+	/* the flags passed to tdb_open. */
+	uint32_t flags;
+
+	/* Our statistics. */
+	struct tdb_attribute_stats stats;
+
+	/* Are we accessing directly? (debugging check). */
+	int direct_access;
+
+	/* Hash function. */
+	uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
+	void *hash_data;
+	uint64_t hash_seed;
+
 	/* Set if we are in a transaction. */
 	struct tdb_transaction *transaction;
 	
@@ -372,12 +365,13 @@ struct tdb_context {
 	tdb_off_t ftable_off;
 	unsigned int ftable;
 
+	/* Our open hook, if any. */
+	enum TDB_ERROR (*openhook)(int fd, void *data);
+	void *openhook_data;
+
 	/* IO methods: changes for transactions. */
 	const struct tdb_methods *methods;
 
-	/* Our statistics. */
-	struct tdb_attribute_stats stats;
-
 	/* Direct access information */
 	struct tdb_access_hdr *access;