X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb2.h;h=ffbc7760b11659af9ee8f78ca211b8d5c6123520;hb=63e80faf9b42fbe73e25c804dd734b6179e42c24;hp=fa5787c3779acd424e7f3cbde6a4c5e6746eb45d;hpb=f367a1dc8573db0a1f6f49fcda474eb51c192241;p=ccan

diff --git a/ccan/tdb2/tdb2.h b/ccan/tdb2/tdb2.h
index fa5787c3..ffbc7760 100644
--- a/ccan/tdb2/tdb2.h
+++ b/ccan/tdb2/tdb2.h
@@ -311,7 +311,7 @@ enum TDB_ERROR tdb_transaction_prepare_commit(struct tdb_context *tdb);
  * a negative enum TDB_ERROR value.
  */
 #define tdb_traverse(tdb, fn, p)					\
-	tdb_traverse_(tdb, typesafe_cb_preargs(int, (fn), (p),		\
+	tdb_traverse_(tdb, typesafe_cb_preargs(int, void *, (fn), (p),	\
 					       struct tdb_context *,	\
 					       TDB_DATA, TDB_DATA), (p))
 
@@ -334,7 +334,8 @@ int64_t tdb_traverse_(struct tdb_context *tdb,
  */
 #define tdb_parse_record(tdb, key, parse, p)				\
 	tdb_parse_record_((tdb), (key),					\
-			  typesafe_cb_preargs(enum TDB_ERROR, (parse), (p), \
+			  typesafe_cb_preargs(enum TDB_ERROR, void *,	\
+					      (parse), (p),		\
 					      TDB_DATA, TDB_DATA), (p))
 
 enum TDB_ERROR tdb_parse_record_(struct tdb_context *tdb,
@@ -411,8 +412,43 @@ enum TDB_ERROR tdb_chainlock(struct tdb_context *tdb, TDB_DATA key);
  * tdb_chainunlock - unlock a record in the TDB
  * @tdb: the tdb context returned from tdb_open()
  * @key: the key to unlock.
+ *
+ * The key must have previously been locked by tdb_chainlock().
+ */
+void tdb_chainunlock(struct tdb_context *tdb, TDB_DATA key);
+
+/**
+ * tdb_lockall - lock the entire TDB
+ * @tdb: the tdb context returned from tdb_open()
+ *
+ * You cannot hold a tdb_chainlock while calling this.  It nests, so you
+ * must call tdb_unlockall as many times as you call tdb_lockall.
+ */
+enum TDB_ERROR tdb_lockall(struct tdb_context *tdb);
+
+/**
+ * tdb_unlockall - unlock the entire TDB
+ * @tdb: the tdb context returned from tdb_open()
+ */
+void tdb_unlockall(struct tdb_context *tdb);
+
+/**
+ * tdb_lockall_read - lock the entire TDB for reading
+ * @tdb: the tdb context returned from tdb_open()
+ *
+ * This prevents others writing to the database, eg. tdb_delete, tdb_store,
+ * tdb_append, but not tdb_fetch.
+ *
+ * You cannot hold a tdb_chainlock while calling this.  It nests, so you
+ * must call tdb_unlockall_read as many times as you call tdb_lockall_read.
+ */
+enum TDB_ERROR tdb_lockall_read(struct tdb_context *tdb);
+
+/**
+ * tdb_unlockall_read - unlock the entire TDB for reading
+ * @tdb: the tdb context returned from tdb_open()
  */
-enum TDB_ERROR tdb_chainunlock(struct tdb_context *tdb, TDB_DATA key);
+void tdb_unlockall_read(struct tdb_context *tdb);
 
 /**
  * tdb_wipe_all - wipe the database clean
@@ -427,7 +463,7 @@ enum TDB_ERROR tdb_wipe_all(struct tdb_context *tdb);
  * tdb_check - check a TDB for consistency
  * @tdb: the tdb context returned from tdb_open()
  * @check: function to check each key/data pair (or NULL)
- * @private: argument for @check, must match type.
+ * @private_data: argument for @check, must match type.
  *
  * This performs a consistency check of the open database, optionally calling
  * a check() function on each record so you can do your own data consistency
@@ -436,18 +472,18 @@ enum TDB_ERROR tdb_wipe_all(struct tdb_context *tdb);
  *
  * Returns TDB_SUCCESS or an error.
  */
-#define tdb_check(tdb, check, private)					\
-	tdb_check_((tdb), typesafe_cb_preargs(enum TDB_ERROR,		\
-					      (check), (private),	\
+#define tdb_check(tdb, check, private_data)				\
+	tdb_check_((tdb), typesafe_cb_preargs(enum TDB_ERROR, void *,	\
+					      (check), (private_data),	\
 					      struct tdb_data,		\
 					      struct tdb_data),		\
-		   (private))
+		   (private_data))
 
 enum TDB_ERROR tdb_check_(struct tdb_context *tdb,
 			  enum TDB_ERROR (*check)(struct tdb_data key,
 						  struct tdb_data data,
-						  void *private),
-			  void *private);
+						  void *private_data),
+			  void *private_data);
 
 /**
  * tdb_error - get the last error (not threadsafe)