*/
int tdb1_brlock(struct tdb1_context *tdb,
int rw_type, tdb1_off_t offset, size_t len,
- enum tdb1_lock_flags flags)
+ enum tdb_lock_flags flags)
{
int ret;
}
if ((rw_type == F_WRLCK) && (tdb->read_only || tdb->traverse_read)) {
- tdb->ecode = TDB1_ERR_RDONLY;
+ tdb->last_error = TDB_ERR_RDONLY;
return -1;
}
do {
ret = fcntl_lock(tdb, rw_type, offset, len,
- flags & TDB1_LOCK_WAIT);
+ flags & TDB_LOCK_WAIT);
} while (ret == -1 && errno == EINTR);
if (ret == -1) {
- tdb->ecode = TDB1_ERR_LOCK;
+ tdb->last_error = TDB_ERR_LOCK;
/* Generic lock error. errno set by fcntl.
* EAGAIN is an expected return from non-blocking
* locks. */
- if (!(flags & TDB1_LOCK_PROBE) && errno != EAGAIN) {
- TDB1_LOG((tdb, TDB1_DEBUG_TRACE,"tdb1_brlock failed (fd=%d) at offset %d rw_type=%d flags=%d len=%d\n",
- tdb->fd, offset, rw_type, flags, (int)len));
+ if (!(flags & TDB_LOCK_PROBE) && errno != EAGAIN) {
+ tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb1_brlock failed (fd=%d) at offset %d rw_type=%d flags=%d len=%d",
+ tdb->fd, offset, rw_type, flags, (int)len);
}
return -1;
}
} while (ret == -1 && errno == EINTR);
if (ret == -1) {
- TDB1_LOG((tdb, TDB1_DEBUG_TRACE,"tdb1_brunlock failed (fd=%d) at offset %d rw_type=%d len=%d\n",
- tdb->fd, offset, rw_type, (int)len));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb1_brunlock failed (fd=%d) at offset"
+ " %d rw_type=%d len=%d",
+ tdb->fd, offset, rw_type, (int)len);
}
return ret;
}
int count = 1000;
if (tdb->allrecord_lock.count != 1) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "tdb1_allrecord_upgrade failed: count %u too high\n",
- tdb->allrecord_lock.count));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb1_allrecord_upgrade failed: "
+ "count %u too high",
+ tdb->allrecord_lock.count);
return -1;
}
if (tdb->allrecord_lock.off != 1) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,
- "tdb1_allrecord_upgrade failed: already upgraded?\n"));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb1_allrecord_upgrade failed:"
+ " already upgraded?");
return -1;
}
while (count--) {
struct timeval tv;
if (tdb1_brlock(tdb, F_WRLCK, TDB1_FREELIST_TOP, 0,
- TDB1_LOCK_WAIT|TDB1_LOCK_PROBE) == 0) {
+ TDB_LOCK_WAIT|TDB_LOCK_PROBE) == 0) {
tdb->allrecord_lock.ltype = F_WRLCK;
tdb->allrecord_lock.off = 0;
return 0;
tv.tv_usec = 1;
select(0, NULL, NULL, NULL, &tv);
}
- TDB1_LOG((tdb, TDB1_DEBUG_TRACE,"tdb1_allrecord_upgrade failed\n"));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb1_allrecord_upgrade failed");
return -1;
}
/* lock an offset in the database. */
int tdb1_nest_lock(struct tdb1_context *tdb, uint32_t offset, int ltype,
- enum tdb1_lock_flags flags)
+ enum tdb_lock_flags flags)
{
struct tdb1_lock_type *new_lck;
if (offset >= lock_offset(tdb->header.hash_size)) {
- tdb->ecode = TDB1_ERR_LOCK;
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR,"tdb1_lock: invalid offset %u for ltype=%d\n",
- offset, ltype));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb1_lock: invalid offset %u for"
+ " ltype=%d",
+ offset, ltype);
return -1;
}
if (tdb->flags & TDB1_NOLOCK)
int ret;
/* We need to match locking order in transaction commit. */
- if (tdb1_brlock(tdb, F_WRLCK, TDB1_FREELIST_TOP, 0, TDB1_LOCK_WAIT)) {
+ if (tdb1_brlock(tdb, F_WRLCK, TDB1_FREELIST_TOP, 0, TDB_LOCK_WAIT)) {
return -1;
}
- if (tdb1_brlock(tdb, F_WRLCK, TDB1_OPEN_LOCK, 1, TDB1_LOCK_WAIT)) {
+ if (tdb1_brlock(tdb, F_WRLCK, TDB1_OPEN_LOCK, 1, TDB_LOCK_WAIT)) {
tdb1_brunlock(tdb, F_WRLCK, TDB1_FREELIST_TOP, 0);
return -1;
}
}
static int tdb1_lock_list(struct tdb1_context *tdb, int list, int ltype,
- enum tdb1_lock_flags waitflag)
+ enum tdb_lock_flags waitflag)
{
int ret;
bool check = false;
}
if (tdb->allrecord_lock.count) {
- tdb->ecode = TDB1_ERR_LOCK;
+ tdb->last_error = TDB_ERR_LOCK;
ret = -1;
} else {
/* Only check when we grab first data lock. */
{
int ret;
- ret = tdb1_lock_list(tdb, list, ltype, TDB1_LOCK_WAIT);
+ ret = tdb1_lock_list(tdb, list, ltype, TDB_LOCK_WAIT);
if (ret) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_lock failed on list %d "
- "ltype=%d (%s)\n", list, ltype, strerror(errno)));
+ tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+ "tdb1_lock failed on list %d "
+ "ltype=%d (%s)", list, ltype, strerror(errno));
}
return ret;
}
/* Sanity checks */
if (offset >= lock_offset(tdb->header.hash_size)) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_unlock: offset %u invalid (%d)\n", offset, tdb->header.hash_size));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb1_unlock: offset %u invalid (%d)",
+ offset, tdb->header.hash_size);
return ret;
}
lck = tdb1_find_nestlock(tdb, offset);
if ((lck == NULL) || (lck->count == 0)) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_unlock: count is 0\n"));
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
+ "tdb1_unlock: count is 0");
return -1;
}
SAFE_FREE(tdb->lockrecs);
}
- if (ret)
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_unlock: An error occurred unlocking!\n"));
return ret;
}
}
if (tdb->allrecord_lock.count) {
- tdb->ecode = TDB1_ERR_LOCK;
+ tdb->last_error = TDB_ERR_LOCK;
return -1;
}
get the transaction lock
*/
int tdb1_transaction_lock(struct tdb1_context *tdb, int ltype,
- enum tdb1_lock_flags lockflags)
+ enum tdb_lock_flags lockflags)
{
return tdb1_nest_lock(tdb, TDB1_TRANSACTION_LOCK, ltype, lockflags);
}
/* Returns 0 if all done, -1 if error, 1 if ok. */
static int tdb1_allrecord_check(struct tdb1_context *tdb, int ltype,
- enum tdb1_lock_flags flags, bool upgradable)
+ enum tdb_lock_flags flags, bool upgradable)
{
/* There are no locks on read-only dbs */
if (tdb->read_only || tdb->traverse_read) {
- tdb->ecode = TDB1_ERR_LOCK;
+ tdb->last_error = TDB_ERR_LOCK;
return -1;
}
if (tdb->allrecord_lock.count) {
/* a global lock of a different type exists */
- tdb->ecode = TDB1_ERR_LOCK;
+ tdb->last_error = TDB_ERR_LOCK;
return -1;
}
if (tdb1_have_extra_locks(tdb)) {
/* can't combine global and chain locks */
- tdb->ecode = TDB1_ERR_LOCK;
+ tdb->last_error = TDB_ERR_LOCK;
return -1;
}
if (upgradable && ltype != F_RDLCK) {
/* tdb error: you can't upgrade a write lock! */
- tdb->ecode = TDB1_ERR_LOCK;
+ tdb->last_error = TDB_ERR_LOCK;
return -1;
}
return 1;
/* We only need to lock individual bytes, but Linux merges consecutive locks
* so we lock in contiguous ranges. */
static int tdb1_chainlock_gradual(struct tdb1_context *tdb,
- int ltype, enum tdb1_lock_flags flags,
+ int ltype, enum tdb_lock_flags flags,
size_t off, size_t len)
{
int ret;
- enum tdb1_lock_flags nb_flags = (flags & ~TDB1_LOCK_WAIT);
+ enum tdb_lock_flags nb_flags = (flags & ~TDB_LOCK_WAIT);
if (len <= 4) {
/* Single record. Just do blocking lock. */
* other way of guaranteeing exclusivity (ie. transaction write lock).
* We do the locking gradually to avoid being starved by smaller locks. */
int tdb1_allrecord_lock(struct tdb1_context *tdb, int ltype,
- enum tdb1_lock_flags flags, bool upgradable)
+ enum tdb_lock_flags flags, bool upgradable)
{
switch (tdb1_allrecord_check(tdb, ltype, flags, upgradable)) {
case -1:
{
/* There are no locks on read-only dbs */
if (tdb->read_only || tdb->traverse_read) {
- tdb->ecode = TDB1_ERR_LOCK;
+ tdb->last_error = TDB_ERR_LOCK;
return -1;
}
if (tdb->allrecord_lock.count == 0) {
- tdb->ecode = TDB1_ERR_LOCK;
+ tdb->last_error = TDB_ERR_LOCK;
return -1;
}
/* Upgradable locks are marked as write locks. */
if (tdb->allrecord_lock.ltype != ltype
&& (!tdb->allrecord_lock.off || ltype != F_RDLCK)) {
- tdb->ecode = TDB1_ERR_LOCK;
+ tdb->last_error = TDB_ERR_LOCK;
return -1;
}
}
if (tdb1_brunlock(tdb, ltype, TDB1_FREELIST_TOP, 0)) {
- TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_unlockall failed (%s)\n", strerror(errno)));
+ tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+ "tdb1_unlockall failed (%s)", strerror(errno));
return -1;
}
/* lock entire database with write lock */
int tdb1_lockall(struct tdb1_context *tdb)
{
- return tdb1_allrecord_lock(tdb, F_WRLCK, TDB1_LOCK_WAIT, false);
+ return tdb1_allrecord_lock(tdb, F_WRLCK, TDB_LOCK_WAIT, false);
}
/* unlock entire database with write lock */
/* lock entire database with read lock */
int tdb1_lockall_read(struct tdb1_context *tdb)
{
- return tdb1_allrecord_lock(tdb, F_RDLCK, TDB1_LOCK_WAIT, false);
+ return tdb1_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false);
}
/* unlock entire database with read lock */
/* lock/unlock one hash chain. This is meant to be used to reduce
contention - it cannot guarantee how many records will be locked */
-int tdb1_chainlock(struct tdb1_context *tdb, TDB1_DATA key)
+int tdb1_chainlock(struct tdb1_context *tdb, TDB_DATA key)
{
int ret = tdb1_lock(tdb, TDB1_BUCKET(tdb->hash_fn(&key)), F_WRLCK);
return ret;
}
-int tdb1_chainunlock(struct tdb1_context *tdb, TDB1_DATA key)
+int tdb1_chainunlock(struct tdb1_context *tdb, TDB_DATA key)
{
return tdb1_unlock(tdb, TDB1_BUCKET(tdb->hash_fn(&key)), F_WRLCK);
}
-int tdb1_chainlock_read(struct tdb1_context *tdb, TDB1_DATA key)
+int tdb1_chainlock_read(struct tdb1_context *tdb, TDB_DATA key)
{
int ret;
ret = tdb1_lock(tdb, TDB1_BUCKET(tdb->hash_fn(&key)), F_RDLCK);
return ret;
}
-int tdb1_chainunlock_read(struct tdb1_context *tdb, TDB1_DATA key)
+int tdb1_chainunlock_read(struct tdb1_context *tdb, TDB_DATA key)
{
return tdb1_unlock(tdb, TDB1_BUCKET(tdb->hash_fn(&key)), F_RDLCK);
}
if (tdb->allrecord_lock.count) {
return 0;
}
- return off ? tdb1_brlock(tdb, F_RDLCK, off, 1, TDB1_LOCK_WAIT) : 0;
+ return off ? tdb1_brlock(tdb, F_RDLCK, off, 1, TDB_LOCK_WAIT) : 0;
}
/*
}
return -1;
}
- return tdb1_brlock(tdb, F_WRLCK, off, 1, TDB1_LOCK_NOWAIT|TDB1_LOCK_PROBE);
+ return tdb1_brlock(tdb, F_WRLCK, off, 1, TDB_LOCK_NOWAIT|TDB_LOCK_PROBE);
}
int tdb1_write_unlock_record(struct tdb1_context *tdb, tdb1_off_t off)