X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=3904442574a34b66d58bac1871e8d860ad18f2aa;hb=6b7c3c840eafbec211b9f58751c5ff754302a68e;hp=cc791b0bb4e3da3226c22862b21d03e32304e931;hpb=8cca0397ef6f6017b13ce9ab4999bf3d92a2dee5;p=ccan
diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index cc791b0b..39044425 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -18,26 +18,19 @@
License along with this library; if not, see .
*/
-#include "config.h"
-#include
-#include
+#include
#include
#include
#include
#include
#include
#include
-#include
#include
#include
#include
#include
-#include
#include
-#include
-#if HAVE_BYTESWAP_H
-#include
-#endif
+#include
#ifndef TEST_IT
#define TEST_IT(cond)
@@ -84,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
@@ -134,20 +127,6 @@ typedef int tdb_bool_err;
/* Indicates this entry is not on an flist (can happen during coalescing) */
#define TDB_FTABLE_NONE ((1ULL << TDB_OFF_UPPER_STEAL) - 1)
-#if !HAVE_BSWAP_64
-static inline uint64_t bswap_64(uint64_t x)
-{
- return (((x&0x000000FFULL)<<56)
- | ((x&0x0000FF00ULL)<<48)
- | ((x&0x00FF0000ULL)<<40)
- | ((x&0xFF000000ULL)<<32)
- | ((x>>8)&0xFF000000ULL)
- | ((x>>16)&0x00FF0000ULL)
- | ((x>>24)&0x0000FF00ULL)
- | ((x>>32)&0x000000FFULL));
-}
-#endif
-
struct tdb_used_record {
/* For on-disk compatibility, we avoid bitfields:
magic: 16, (highest)
@@ -219,7 +198,7 @@ static inline unsigned frec_ftable(const struct tdb_free_record *f)
struct tdb_recovery_record {
uint64_t magic;
- /* Length of record. */
+ /* Length of record (add this header to get total length). */
uint64_t max_len;
/* Length used. */
uint64_t len;
@@ -304,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;
};
@@ -355,8 +334,8 @@ struct tdb_context {
/* Operating read-only? (Opened O_RDONLY, or in traverse_read) */
bool read_only;
- /* mmap read only? */
- int mmap_flags;
+ /* Open flags passed to tdb_open. */
+ int open_flags;
/* the flags passed to tdb_open, for tdb_reopen. */
uint32_t flags;
@@ -364,6 +343,7 @@ struct tdb_context {
/* 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;
@@ -462,7 +442,9 @@ 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,
+ bool coalesce_ok);
/* Set up header for a used/ftable/htable/chain record. */
enum TDB_ERROR set_header(struct tdb_context *tdb,
@@ -565,8 +547,8 @@ enum TDB_ERROR tdb_allrecord_upgrade(struct tdb_context *tdb);
/* Serialize db open. */
enum TDB_ERROR tdb_lock_open(struct tdb_context *tdb,
- enum tdb_lock_flags flags);
-void tdb_unlock_open(struct tdb_context *tdb);
+ int ltype, enum tdb_lock_flags flags);
+void tdb_unlock_open(struct tdb_context *tdb, int ltype);
bool tdb_has_open_lock(struct tdb_context *tdb);
/* Serialize db expand. */