X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb2.h;h=d194de36aebc568b40962ef7a29fbe1e34b97144;hp=232d72a5e918a4b2326ad965c77e80ec519f87ad;hb=37e247dbcb57f4b2effd44b37b96dc679ee525d0;hpb=fe55330a60e4e14ea6cac2ff40d50eddca4cf140

diff --git a/ccan/tdb2/tdb2.h b/ccan/tdb2/tdb2.h
index 232d72a5..d194de36 100644
--- a/ccan/tdb2/tdb2.h
+++ b/ccan/tdb2/tdb2.h
@@ -67,7 +67,7 @@ enum TDB_ERROR {TDB_SUCCESS=0, TDB_ERR_CORRUPT, TDB_ERR_IO, TDB_ERR_LOCK,
 /* flags for tdb_summary. Logical or to combine. */
 enum tdb_summary_flags { TDB_SUMMARY_HISTOGRAMS = 1 };
 
-/* debugging uses one of the following levels */
+/* logging uses one of the following levels */
 enum tdb_debug_level {TDB_DEBUG_FATAL = 0, TDB_DEBUG_ERROR, 
 		      TDB_DEBUG_WARNING, TDB_DEBUG_TRACE};
 
@@ -80,7 +80,7 @@ struct tdb_context;
 
 /* FIXME: Make typesafe */
 typedef int (*tdb_traverse_func)(struct tdb_context *, TDB_DATA, TDB_DATA, void *);
-typedef void (*tdb_logfn_t)(struct tdb_context *, enum tdb_debug_level, void *priv, const char *, ...) PRINTF_FMT(4, 5);
+typedef void (*tdb_logfn_t)(struct tdb_context *, enum tdb_debug_level, void *, const char *);
 typedef uint64_t (*tdb_hashfn_t)(const void *key, size_t len, uint64_t seed,
 				 void *priv);
 
@@ -118,6 +118,7 @@ struct tdb_attribute_stats {
 	size_t size; /* = sizeof(struct tdb_attribute_stats) */
 	uint64_t allocs;
 	uint64_t   alloc_subhash;
+	uint64_t   alloc_chain;
 	uint64_t   alloc_bucket_exact;
 	uint64_t   alloc_bucket_max;
 	uint64_t   alloc_leftover;
@@ -126,6 +127,12 @@ struct tdb_attribute_stats {
 	uint64_t     alloc_coalesce_race;
 	uint64_t     alloc_coalesce_succeeded;
 	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 expands;
 	uint64_t frees;
 	uint64_t locks;
@@ -161,8 +168,8 @@ int tdb_check(struct tdb_context *tdb,
 	      int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
 	      void *private_data);
 
-enum TDB_ERROR tdb_error(struct tdb_context *tdb);
-const char *tdb_errorstr(struct tdb_context *tdb);
+enum TDB_ERROR tdb_error(const struct tdb_context *tdb);
+const char *tdb_errorstr(const struct tdb_context *tdb);
 
 int tdb_transaction_start(struct tdb_context *tdb);
 void tdb_transaction_cancel(struct tdb_context *tdb);