X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb2.h;h=5643ef4f8a1e2aeae9736dc8a18fbe29380b7ca8;hp=0d2e1c78b023a4c15c1395852d7139dd391457a0;hb=6e3d9e8a66bf8b45150500f176452ee8e9ee9927;hpb=72e974b25a04a72a1123501aafbb3b5d39019d42

diff --git a/ccan/tdb2/tdb2.h b/ccan/tdb2/tdb2.h
index 0d2e1c78..5643ef4f 100644
--- a/ccan/tdb2/tdb2.h
+++ b/ccan/tdb2/tdb2.h
@@ -30,6 +30,10 @@ extern "C" {
 #endif
 
 #ifndef _SAMBA_BUILD_
+#include "config.h"
+#if HAVE_FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
+#endif
 /* For mode_t */
 #include <sys/types.h>
 /* For O_* flags. */
@@ -700,6 +704,7 @@ struct tdb_attribute_log {
 	struct tdb_attribute_base base; /* .attr = TDB_ATTRIBUTE_LOG */
 	void (*fn)(struct tdb_context *tdb,
 		   enum tdb_log_level level,
+		   enum TDB_ERROR ecode,
 		   const char *message,
 		   void *data);
 	void *data;
@@ -757,21 +762,31 @@ struct tdb_attribute_stats {
 	uint64_t   alloc_bucket_max;
 	uint64_t   alloc_leftover;
 	uint64_t   alloc_coalesce_tried;
+	uint64_t     alloc_coalesce_iterate_clash;
 	uint64_t     alloc_coalesce_lockfail;
 	uint64_t     alloc_coalesce_race;
 	uint64_t     alloc_coalesce_succeeded;
-	uint64_t        alloc_coalesce_num_merged;
+	uint64_t       alloc_coalesce_num_merged;
 	uint64_t compares;
 	uint64_t   compare_wrong_bucket;
 	uint64_t   compare_wrong_offsetbits;
 	uint64_t   compare_wrong_keylen;
 	uint64_t   compare_wrong_rechash;
 	uint64_t   compare_wrong_keycmp;
+	uint64_t transactions;
+	uint64_t   transaction_cancel;
+	uint64_t   transaction_nest;
+	uint64_t   transaction_expand_file;
+	uint64_t   transaction_read_direct;
+	uint64_t      transaction_read_direct_fail;
+	uint64_t   transaction_write_direct;
+	uint64_t      transaction_write_direct_fail;
 	uint64_t expands;
 	uint64_t frees;
 	uint64_t locks;
-	uint64_t    lock_lowlevel;
-	uint64_t    lock_nonblock;
+	uint64_t   lock_lowlevel;
+	uint64_t   lock_nonblock;
+	uint64_t     lock_nonblock_fail;
 };
 
 /**