X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=213e83615a33cc00090175badb2b05e1c3aca24e;hp=9cd8188c70c559c3f0e1c2a6f2845cab4571cc3c;hb=5c4a21ab03a428373e7659b9606facf85dcbe17b;hpb=7fe3218488f1bd25a4e50c27964752a18a64fb5f

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 9cd8188c..213e8361 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -19,6 +19,9 @@
 */
 
 #include "config.h"
+#if HAVE_FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
+#endif
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -358,9 +361,6 @@ struct tdb_context {
 	/* mmap read only? */
 	int mmap_flags;
 
-	/* Error code for last tdb error. */
-	enum TDB_ERROR ecode;
-
 	/* the flags passed to tdb_open, for tdb_reopen. */
 	uint32_t flags;
 
@@ -391,7 +391,8 @@ struct tdb_context {
 	/* IO methods: changes for transactions. */
 	const struct tdb_methods *methods;
 
-	struct tdb_attribute_stats *stats;
+	/* Our statistics. */
+	struct tdb_attribute_stats stats;
 
 	/* Direct access information */
 	struct tdb_access_hdr *access;
@@ -417,8 +418,6 @@ struct tdb_methods {
   internal prototypes
 */
 /* hash.c: */
-void tdb_hash_init(struct tdb_context *tdb);
-
 tdb_bool_err first_in_hash(struct tdb_context *tdb,
 			   struct traverse_info *tinfo,
 			   TDB_DATA *kbuf, size_t *dlen);
@@ -466,7 +465,8 @@ tdb_off_t alloc(struct tdb_context *tdb, size_t keylen, size_t datalen,
 
 /* Put this record in a free list. */
 enum TDB_ERROR add_free_record(struct tdb_context *tdb,
-			       tdb_off_t off, tdb_len_t len_with_header);
+			       tdb_off_t off, tdb_len_t len_with_header,
+			       enum tdb_lock_flags waitflag);
 
 /* Set up header for a used/ftable/htable/chain record. */
 enum TDB_ERROR set_header(struct tdb_context *tdb,
@@ -537,14 +537,6 @@ enum TDB_ERROR tdb_read_convert(struct tdb_context *tdb, tdb_off_t off,
 /* Bump the seqnum (caller checks for tdb->flags & TDB_SEQNUM) */
 void tdb_inc_seqnum(struct tdb_context *tdb);
 
-/* Adds a stat, if it's in range. */
-void add_stat_(struct tdb_context *tdb, uint64_t *stat, size_t val);
-#define add_stat(tdb, statname, val)					\
-	do {								\
-		if (unlikely((tdb)->stats))				\
-			add_stat_((tdb), &(tdb)->stats->statname, (val)); \
-	} while (0)
-
 /* lock.c: */
 /* Lock/unlock a range of hashes. */
 enum TDB_ERROR tdb_lock_hashes(struct tdb_context *tdb,