We have a series of I/O functions which change depending on whether we're
inside a transaction or not. This makes them return enum TDB_ERROR instead
of int.
tdb_off_t prev, unsigned int ftable,
unsigned int bucket)
{
tdb_off_t prev, unsigned int ftable,
unsigned int bucket)
{
+ enum TDB_ERROR ecode;
+
if (frec_magic(frec) != TDB_FREE_MAGIC) {
tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
"tdb_check: offset %llu bad magic 0x%llx",
if (frec_magic(frec) != TDB_FREE_MAGIC) {
tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
"tdb_check: offset %llu bad magic 0x%llx",
- if (tdb->methods->oob(tdb, off
- + frec_len(frec) + sizeof(struct tdb_used_record),
- false))
+ ecode = tdb->methods->oob(tdb, off
+ + frec_len(frec)
+ + sizeof(struct tdb_used_record),
+ false);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
if (size_to_bucket(frec_len(frec)) != bucket) {
tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
"tdb_check: offset %llu in wrong bucket %u vs %u",
if (size_to_bucket(frec_len(frec)) != bucket) {
tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
"tdb_check: offset %llu in wrong bucket %u vs %u",
size_t dead_space(struct tdb_context *tdb, tdb_off_t off)
{
size_t len;
size_t dead_space(struct tdb_context *tdb, tdb_off_t off)
{
size_t len;
for (len = 0; off + len < tdb->map_size; len++) {
char c;
for (len = 0; off + len < tdb->map_size; len++) {
char c;
- if (tdb->methods->tread(tdb, off, &c, 1))
+ ecode = tdb->methods->tread(tdb, off, &c, 1);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
if (c != 0 && c != 0x43)
break;
}
if (c != 0 && c != 0x43)
break;
}
- if (tdb->methods->expand_file(tdb, wanted) == -1) {
+ ecode = tdb->methods->expand_file(tdb, wanted);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
tdb_unlock_expand(tdb, F_WRLCK);
return -1;
}
tdb_unlock_expand(tdb, F_WRLCK);
return -1;
}
if necessary
note that "len" is the minimum length needed for the db
*/
if necessary
note that "len" is the minimum length needed for the db
*/
-static int tdb_oob(struct tdb_context *tdb, tdb_off_t len, bool probe)
+static enum TDB_ERROR tdb_oob(struct tdb_context *tdb, tdb_off_t len,
+ bool probe)
{
struct stat st;
enum TDB_ERROR ecode;
{
struct stat st;
enum TDB_ERROR ecode;
(long long)len,
(long long)tdb->map_size);
}
(long long)len,
(long long)tdb->map_size);
}
}
ecode = tdb_lock_expand(tdb, F_RDLCK);
if (ecode != TDB_SUCCESS) {
}
ecode = tdb_lock_expand(tdb, F_RDLCK);
if (ecode != TDB_SUCCESS) {
- tdb->ecode = ecode;
- return -1;
}
if (fstat(tdb->fd, &st) != 0) {
tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"Failed to fstat file: %s", strerror(errno));
tdb_unlock_expand(tdb, F_RDLCK);
}
if (fstat(tdb->fd, &st) != 0) {
tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"Failed to fstat file: %s", strerror(errno));
tdb_unlock_expand(tdb, F_RDLCK);
}
tdb_unlock_expand(tdb, F_RDLCK);
}
tdb_unlock_expand(tdb, F_RDLCK);
"tdb_oob len %zu beyond eof at %zu",
(size_t)len, st.st_size);
}
"tdb_oob len %zu beyond eof at %zu",
(size_t)len, st.st_size);
}
}
/* Unmap, update size, remap */
}
/* Unmap, update size, remap */
tdb->map_size = st.st_size;
tdb_mmap(tdb);
tdb->map_size = st.st_size;
tdb_mmap(tdb);
}
/* Endian conversion: we only ever deal with 8 byte quantities */
}
/* Endian conversion: we only ever deal with 8 byte quantities */
{
char buf[8192] = { 0 };
void *p = tdb->methods->direct(tdb, off, len, true);
{
char buf[8192] = { 0 };
void *p = tdb->methods->direct(tdb, off, len, true);
assert(!tdb->read_only);
if (p) {
assert(!tdb->read_only);
if (p) {
}
while (len) {
unsigned todo = len < sizeof(buf) ? len : sizeof(buf);
}
while (len) {
unsigned todo = len < sizeof(buf) ? len : sizeof(buf);
- if (tdb->methods->twrite(tdb, off, buf, todo) == -1)
+ ecode = tdb->methods->twrite(tdb, off, buf, todo);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
len -= todo;
off += todo;
}
len -= todo;
off += todo;
}
}
/* write a lump of data at a specified offset */
}
/* write a lump of data at a specified offset */
-static int tdb_write(struct tdb_context *tdb, tdb_off_t off,
- const void *buf, tdb_len_t len)
+static enum TDB_ERROR tdb_write(struct tdb_context *tdb, tdb_off_t off,
+ const void *buf, tdb_len_t len)
+ enum TDB_ERROR ecode;
+
- tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
- "Write to read-only database");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
+ "Write to read-only database");
}
/* FIXME: Bogus optimization? */
if (len == 0) {
}
/* FIXME: Bogus optimization? */
if (len == 0) {
- if (tdb->methods->oob(tdb, off + len, 0) != 0)
- return -1;
+ ecode = tdb->methods->oob(tdb, off + len, 0);
+ if (ecode != TDB_SUCCESS) {
+ return ecode;
+ }
if (tdb->map_ptr) {
memcpy(off + (char *)tdb->map_ptr, buf, len);
if (tdb->map_ptr) {
memcpy(off + (char *)tdb->map_ptr, buf, len);
if (ret >= 0)
errno = ENOSPC;
if (ret >= 0)
errno = ENOSPC;
- tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
- "tdb_write: %zi at %zu len=%zu (%s)",
- ret, (size_t)off, (size_t)len,
- strerror(errno));
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb_write: %zi at %zu len=%zu (%s)",
+ ret, (size_t)off, (size_t)len,
+ strerror(errno));
}
/* read a lump of data at a specified offset */
}
/* read a lump of data at a specified offset */
-static int tdb_read(struct tdb_context *tdb, tdb_off_t off, void *buf,
- tdb_len_t len)
+static enum TDB_ERROR tdb_read(struct tdb_context *tdb, tdb_off_t off,
+ void *buf, tdb_len_t len)
- if (tdb->methods->oob(tdb, off + len, 0) != 0) {
- return -1;
+ enum TDB_ERROR ecode;
+
+ ecode = tdb->methods->oob(tdb, off + len, 0);
+ if (ecode != TDB_SUCCESS) {
+ return ecode;
} else {
ssize_t r = pread(tdb->fd, buf, len, off);
if (r != len) {
} else {
ssize_t r = pread(tdb->fd, buf, len, off);
if (r != len) {
- tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
- "tdb_read failed with %zi at %zu "
- "len=%zu (%s) map_size=%zu",
- r, (size_t)off, (size_t)len,
- strerror(errno),
- (size_t)tdb->map_size);
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb_read failed with %zi at %zu "
+ "len=%zu (%s) map_size=%zu",
+ r, (size_t)off, (size_t)len,
+ strerror(errno),
+ (size_t)tdb->map_size);
}
int tdb_write_convert(struct tdb_context *tdb, tdb_off_t off,
const void *rec, size_t len)
{
}
int tdb_write_convert(struct tdb_context *tdb, tdb_off_t off,
const void *rec, size_t len)
{
+ enum TDB_ERROR ecode;
+
if (unlikely((tdb->flags & TDB_CONVERT))) {
void *conv = malloc(len);
if (!conv) {
if (unlikely((tdb->flags & TDB_CONVERT))) {
void *conv = malloc(len);
if (!conv) {
return -1;
}
memcpy(conv, rec, len);
return -1;
}
memcpy(conv, rec, len);
- ret = tdb->methods->twrite(tdb, off,
+ ecode = tdb->methods->twrite(tdb, off,
tdb_convert(tdb, conv, len), len);
free(conv);
tdb_convert(tdb, conv, len), len);
free(conv);
- } else
- ret = tdb->methods->twrite(tdb, off, rec, len);
+ } else {
+ ecode = tdb->methods->twrite(tdb, off, rec, len);
+ }
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
+ return -1;
+ }
+ return 0;
}
int tdb_read_convert(struct tdb_context *tdb, tdb_off_t off,
void *rec, size_t len)
{
}
int tdb_read_convert(struct tdb_context *tdb, tdb_off_t off,
void *rec, size_t len)
{
- int ret = tdb->methods->tread(tdb, off, rec, len);
+ enum TDB_ERROR ecode = tdb->methods->tread(tdb, off, rec, len);
tdb_convert(tdb, rec, len);
tdb_convert(tdb, rec, len);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
+ return -1;
+ }
+ return 0;
}
int tdb_write_off(struct tdb_context *tdb, tdb_off_t off, tdb_off_t val)
}
int tdb_write_off(struct tdb_context *tdb, tdb_off_t off, tdb_off_t val)
tdb_len_t len, unsigned int prefix)
{
void *buf;
tdb_len_t len, unsigned int prefix)
{
void *buf;
/* some systems don't like zero length malloc */
buf = malloc(prefix + len ? prefix + len : 1);
/* some systems don't like zero length malloc */
buf = malloc(prefix + len ? prefix + len : 1);
tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_USE_ERROR,
"tdb_alloc_read malloc failed len=%zu",
(size_t)(prefix + len));
tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_USE_ERROR,
"tdb_alloc_read malloc failed len=%zu",
(size_t)(prefix + len));
- } else if (unlikely(tdb->methods->tread(tdb, offset, buf+prefix, len)
- == -1)) {
- free(buf);
- buf = NULL;
+ } else {
+ ecode = tdb->methods->tread(tdb, offset, buf+prefix, len);
+ if (unlikely(ecode != TDB_SUCCESS)) {
+ tdb->ecode = ecode;
+ free(buf);
+ buf = NULL;
+ }
/* expand a file. we prefer to use ftruncate, as that is what posix
says to use for mmap expansion */
/* expand a file. we prefer to use ftruncate, as that is what posix
says to use for mmap expansion */
-static int tdb_expand_file(struct tdb_context *tdb, tdb_len_t addition)
+static enum TDB_ERROR tdb_expand_file(struct tdb_context *tdb,
+ tdb_len_t addition)
{
char buf[8192];
if (tdb->read_only) {
{
char buf[8192];
if (tdb->read_only) {
- tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
- "Expand on read-only database");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_RDONLY, TDB_LOG_USE_ERROR,
+ "Expand on read-only database");
}
if (tdb->flags & TDB_INTERNAL) {
char *new = realloc(tdb->map_ptr, tdb->map_size + addition);
if (!new) {
}
if (tdb->flags & TDB_INTERNAL) {
char *new = realloc(tdb->map_ptr, tdb->map_size + addition);
if (!new) {
- tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
- "No memory to expand database");
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
+ "No memory to expand database");
}
tdb->map_ptr = new;
tdb->map_size += addition;
}
tdb->map_ptr = new;
tdb->map_size += addition;
disk. This must be done with write, not via mmap */
memset(buf, 0x43, sizeof(buf));
if (fill(tdb, buf, sizeof(buf), tdb->map_size, addition) == -1)
disk. This must be done with write, not via mmap */
memset(buf, 0x43, sizeof(buf));
if (fill(tdb, buf, sizeof(buf), tdb->map_size, addition) == -1)
tdb->map_size += addition;
tdb_mmap(tdb);
}
tdb->map_size += addition;
tdb_mmap(tdb);
}
}
const void *tdb_access_read(struct tdb_context *tdb,
}
const void *tdb_access_read(struct tdb_context *tdb,
if (unlikely(!tdb->map_ptr))
return NULL;
if (unlikely(!tdb->map_ptr))
return NULL;
- if (unlikely(tdb_oob(tdb, off + len, true) == -1))
+ if (unlikely(tdb_oob(tdb, off + len, true) != TDB_SUCCESS))
return NULL;
return (char *)tdb->map_ptr + off;
}
return NULL;
return (char *)tdb->map_ptr + off;
}
- int (*tread)(struct tdb_context *, tdb_off_t, void *, tdb_len_t);
- int (*twrite)(struct tdb_context *, tdb_off_t, const void *, tdb_len_t);
- int (*oob)(struct tdb_context *, tdb_off_t, bool);
- int (*expand_file)(struct tdb_context *, tdb_len_t);
+ enum TDB_ERROR (*tread)(struct tdb_context *, tdb_off_t, void *,
+ tdb_len_t);
+ enum TDB_ERROR (*twrite)(struct tdb_context *, tdb_off_t, const void *,
+ tdb_len_t);
+ enum TDB_ERROR (*oob)(struct tdb_context *, tdb_off_t, bool);
+ enum TDB_ERROR (*expand_file)(struct tdb_context *, tdb_len_t);
void *(*direct)(struct tdb_context *, tdb_off_t, size_t, bool);
};
void *(*direct)(struct tdb_context *, tdb_off_t, size_t, bool);
};
bool growing)
{
tdb_off_t new_off;
bool growing)
{
tdb_off_t new_off;
/* Allocate a new record. */
new_off = alloc(tdb, key.dsize, dbuf.dsize, h->h, TDB_USED_MAGIC,
/* Allocate a new record. */
new_off = alloc(tdb, key.dsize, dbuf.dsize, h->h, TDB_USED_MAGIC,
}
new_off += sizeof(struct tdb_used_record);
}
new_off += sizeof(struct tdb_used_record);
- if (tdb->methods->twrite(tdb, new_off, key.dptr, key.dsize) == -1)
+ ecode = tdb->methods->twrite(tdb, new_off, key.dptr, key.dsize);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
- if (tdb->methods->twrite(tdb, new_off, dbuf.dptr, dbuf.dsize) == -1)
+ ecode = tdb->methods->twrite(tdb, new_off, dbuf.dptr, dbuf.dsize);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
/* FIXME: tdb_increment_seqnum(tdb); */
return 0;
/* FIXME: tdb_increment_seqnum(tdb); */
return 0;
tdb_len_t old_room = 0;
struct tdb_used_record rec;
int ret;
tdb_len_t old_room = 0;
struct tdb_used_record rec;
int ret;
off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL);
if (unlikely(off == TDB_OFF_ERR))
off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL);
if (unlikely(off == TDB_OFF_ERR))
key.dsize, dbuf.dsize,
&rec, h.h))
goto fail;
key.dsize, dbuf.dsize,
&rec, h.h))
goto fail;
- if (tdb->methods->twrite(tdb, off + sizeof(rec)
- + key.dsize,
- dbuf.dptr, dbuf.dsize))
+ ecode = tdb->methods->twrite(tdb,
+ off + sizeof(rec)
+ + key.dsize,
+ dbuf.dptr,
+ dbuf.dsize);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
tdb_unlock_hashes(tdb, h.hlock_start,
h.hlock_range, F_WRLCK);
return 0;
tdb_unlock_hashes(tdb, h.hlock_start,
h.hlock_range, F_WRLCK);
return 0;
tdb_len_t old_room = 0, old_dlen;
unsigned char *newdata;
struct tdb_data new_dbuf;
tdb_len_t old_room = 0, old_dlen;
unsigned char *newdata;
struct tdb_data new_dbuf;
int ret;
off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL);
int ret;
off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL);
goto fail;
off += sizeof(rec) + key.dsize + old_dlen;
goto fail;
off += sizeof(rec) + key.dsize + old_dlen;
- if (tdb->methods->twrite(tdb, off, dbuf.dptr,
- dbuf.dsize) == -1)
+ ecode = tdb->methods->twrite(tdb, off, dbuf.dptr,
+ dbuf.dsize);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
/* FIXME: tdb_increment_seqnum(tdb); */
tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range,
/* FIXME: tdb_increment_seqnum(tdb); */
tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range,
(size_t)(key.dsize+old_dlen+dbuf.dsize));
goto fail;
}
(size_t)(key.dsize+old_dlen+dbuf.dsize));
goto fail;
}
- if (tdb->methods->tread(tdb, off + sizeof(rec) + key.dsize,
- newdata, old_dlen) != 0) {
+ ecode = tdb->methods->tread(tdb, off + sizeof(rec) + key.dsize,
+ newdata, old_dlen);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
free(newdata);
goto fail;
}
free(newdata);
goto fail;
}
read while in a transaction. We need to check first if the data is in our list
of transaction elements, then if not do a real read
*/
read while in a transaction. We need to check first if the data is in our list
of transaction elements, then if not do a real read
*/
-static int transaction_read(struct tdb_context *tdb, tdb_off_t off, void *buf,
- tdb_len_t len)
+static enum TDB_ERROR transaction_read(struct tdb_context *tdb, tdb_off_t off,
+ void *buf, tdb_len_t len)
/* break it down into block sized ops */
while (len + (off % getpagesize()) > getpagesize()) {
tdb_len_t len2 = getpagesize() - (off % getpagesize());
/* break it down into block sized ops */
while (len + (off % getpagesize()) > getpagesize()) {
tdb_len_t len2 = getpagesize() - (off % getpagesize());
- if (transaction_read(tdb, off, buf, len2) != 0) {
- return -1;
+ ecode = transaction_read(tdb, off, buf, len2);
+ if (ecode != TDB_SUCCESS) {
+ return ecode;
}
len -= len2;
off += len2;
}
len -= len2;
off += len2;
}
blk = off / getpagesize();
}
blk = off / getpagesize();
if (tdb->transaction->num_blocks <= blk ||
tdb->transaction->blocks[blk] == NULL) {
/* nope, do a real read */
if (tdb->transaction->num_blocks <= blk ||
tdb->transaction->blocks[blk] == NULL) {
/* nope, do a real read */
- if (tdb->transaction->io_methods->tread(tdb, off, buf, len)
- != 0) {
+ ecode = tdb->transaction->io_methods->tread(tdb, off, buf, len);
+ if (ecode != TDB_SUCCESS) {
/* it is in the block list. Now check for the last block */
if (blk == tdb->transaction->num_blocks-1) {
if (len > tdb->transaction->last_block_size) {
/* it is in the block list. Now check for the last block */
if (blk == tdb->transaction->num_blocks-1) {
if (len > tdb->transaction->last_block_size) {
goto fail;
}
}
/* now copy it out of this block */
memcpy(buf, tdb->transaction->blocks[blk] + (off % getpagesize()), len);
goto fail;
}
}
/* now copy it out of this block */
memcpy(buf, tdb->transaction->blocks[blk] + (off % getpagesize()), len);
- tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
- "transaction_read: failed at off=%zu len=%zu",
- (size_t)off, (size_t)len);
tdb->transaction->transaction_error = 1;
tdb->transaction->transaction_error = 1;
+ return tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
+ "transaction_read: failed at off=%zu len=%zu",
+ (size_t)off, (size_t)len);
}
/*
write while in a transaction
*/
}
/*
write while in a transaction
*/
-static int transaction_write(struct tdb_context *tdb, tdb_off_t off,
- const void *buf, tdb_len_t len)
+static enum TDB_ERROR transaction_write(struct tdb_context *tdb, tdb_off_t off,
+ const void *buf, tdb_len_t len)
/* Only a commit is allowed on a prepared transaction */
if (tdb->transaction->prepared) {
/* Only a commit is allowed on a prepared transaction */
if (tdb->transaction->prepared) {
- tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_ERROR,
- "transaction_write: transaction already prepared,"
- " write not allowed");
+ ecode = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_ERROR,
+ "transaction_write: transaction already"
+ " prepared, write not allowed");
goto fail;
}
/* break it up into block sized chunks */
while (len + (off % getpagesize()) > getpagesize()) {
tdb_len_t len2 = getpagesize() - (off % getpagesize());
goto fail;
}
/* break it up into block sized chunks */
while (len + (off % getpagesize()) > getpagesize()) {
tdb_len_t len2 = getpagesize() - (off % getpagesize());
- if (transaction_write(tdb, off, buf, len2) != 0) {
+ ecode = transaction_write(tdb, off, buf, len2);
+ if (ecode != TDB_SUCCESS) {
return -1;
}
len -= len2;
return -1;
}
len -= len2;
}
blk = off / getpagesize();
}
blk = off / getpagesize();
(blk+1)*sizeof(uint8_t *));
}
if (new_blocks == NULL) {
(blk+1)*sizeof(uint8_t *));
}
if (new_blocks == NULL) {
- tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
- "transaction_write: failed to allocate");
+ ecode = tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
+ "transaction_write:"
+ " failed to allocate");
goto fail;
}
memset(&new_blocks[tdb->transaction->num_blocks], 0,
goto fail;
}
memset(&new_blocks[tdb->transaction->num_blocks], 0,
if (tdb->transaction->blocks[blk] == NULL) {
tdb->transaction->blocks[blk] = (uint8_t *)calloc(getpagesize(), 1);
if (tdb->transaction->blocks[blk] == NULL) {
if (tdb->transaction->blocks[blk] == NULL) {
tdb->transaction->blocks[blk] = (uint8_t *)calloc(getpagesize(), 1);
if (tdb->transaction->blocks[blk] == NULL) {
- tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
- "transaction_write: failed to allocate");
+ ecode = tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
+ "transaction_write:"
+ " failed to allocate");
goto fail;
}
if (tdb->transaction->old_map_size > blk * getpagesize()) {
goto fail;
}
if (tdb->transaction->old_map_size > blk * getpagesize()) {
if (len2 + (blk * getpagesize()) > tdb->transaction->old_map_size) {
len2 = tdb->transaction->old_map_size - (blk * getpagesize());
}
if (len2 + (blk * getpagesize()) > tdb->transaction->old_map_size) {
len2 = tdb->transaction->old_map_size - (blk * getpagesize());
}
- if (tdb->transaction->io_methods->tread(tdb, blk * getpagesize(),
- tdb->transaction->blocks[blk],
- len2) != 0) {
- tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
- "transaction_write: failed to"
- " read old block: %s",
- strerror(errno));
+ ecode = tdb->transaction->io_methods->tread(tdb,
+ blk * getpagesize(),
+ tdb->transaction->blocks[blk],
+ len2);
+ if (ecode != TDB_SUCCESS) {
+ ecode = tdb_logerr(tdb, ecode,
+ TDB_LOG_ERROR,
+ "transaction_write:"
+ " failed to"
+ " read old block: %s",
+ strerror(errno));
SAFE_FREE(tdb->transaction->blocks[blk]);
goto fail;
}
SAFE_FREE(tdb->transaction->blocks[blk]);
goto fail;
}
fail:
tdb->transaction->transaction_error = 1;
fail:
tdb->transaction->transaction_error = 1;
/*
out of bounds check during a transaction
*/
/*
out of bounds check during a transaction
*/
-static int transaction_oob(struct tdb_context *tdb, tdb_off_t len, bool probe)
+static enum TDB_ERROR transaction_oob(struct tdb_context *tdb, tdb_off_t len,
+ bool probe)
{
if (len <= tdb->map_size) {
{
if (len <= tdb->map_size) {
- tdb->ecode = TDB_ERR_IO;
if (!probe) {
tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"tdb_oob len %lld beyond transaction size %lld",
(long long)len,
(long long)tdb->map_size);
}
if (!probe) {
tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"tdb_oob len %lld beyond transaction size %lld",
(long long)len,
(long long)tdb->map_size);
}
}
/*
transaction version of tdb_expand().
*/
}
/*
transaction version of tdb_expand().
*/
-static int transaction_expand_file(struct tdb_context *tdb, tdb_off_t addition)
+static enum TDB_ERROR transaction_expand_file(struct tdb_context *tdb,
+ tdb_off_t addition)
+ enum TDB_ERROR ecode;
+
/* add a write to the transaction elements, so subsequent
reads see the zero data */
/* add a write to the transaction elements, so subsequent
reads see the zero data */
- if (transaction_write(tdb, tdb->map_size, NULL, addition) != 0) {
- return -1;
+ ecode = transaction_write(tdb, tdb->map_size, NULL, addition);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
+ return ecode;
}
tdb->map_size += addition;
}
tdb->map_size += addition;
}
static void *transaction_direct(struct tdb_context *tdb, tdb_off_t off,
}
static void *transaction_direct(struct tdb_context *tdb, tdb_off_t off,
-static int transaction_sync(struct tdb_context *tdb, tdb_off_t offset, tdb_len_t length)
+static enum TDB_ERROR transaction_sync(struct tdb_context *tdb,
+ tdb_off_t offset, tdb_len_t length)
{
if (tdb->flags & TDB_NOSYNC) {
{
if (tdb->flags & TDB_NOSYNC) {
}
if (fsync(tdb->fd) != 0) {
}
if (fsync(tdb->fd) != 0) {
- tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
- "tdb_transaction: fsync failed: %s",
- strerror(errno));
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb_transaction: fsync failed: %s",
+ strerror(errno));
}
#ifdef MS_SYNC
if (tdb->map_ptr) {
tdb_off_t moffset = offset & ~(getpagesize()-1);
if (msync(moffset + (char *)tdb->map_ptr,
length + (offset - moffset), MS_SYNC) != 0) {
}
#ifdef MS_SYNC
if (tdb->map_ptr) {
tdb_off_t moffset = offset & ~(getpagesize()-1);
if (msync(moffset + (char *)tdb->map_ptr,
length + (offset - moffset), MS_SYNC) != 0) {
- tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
- "tdb_transaction: msync failed: %s",
- strerror(errno));
- return -1;
+ return tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb_transaction: msync failed: %s",
+ strerror(errno));
}
static void _tdb_transaction_cancel(struct tdb_context *tdb)
{
int i;
}
static void _tdb_transaction_cancel(struct tdb_context *tdb)
{
int i;
if (tdb->transaction == NULL) {
tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
if (tdb->transaction == NULL) {
tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
uint64_t invalid = TDB_RECOVERY_INVALID_MAGIC;
/* remove the recovery marker */
uint64_t invalid = TDB_RECOVERY_INVALID_MAGIC;
/* remove the recovery marker */
- if (methods->twrite(tdb, tdb->transaction->magic_offset,
- &invalid, sizeof(invalid)) == -1 ||
- transaction_sync(tdb, tdb->transaction->magic_offset,
- sizeof(invalid)) == -1) {
- tdb_logerr(tdb, tdb->ecode, TDB_LOG_ERROR,
+ ecode = methods->twrite(tdb, tdb->transaction->magic_offset,
+ &invalid, sizeof(invalid));
+ if (ecode == TDB_SUCCESS)
+ ecode = transaction_sync(tdb,
+ tdb->transaction->magic_offset,
+ sizeof(invalid));
+ if (ecode != TDB_SUCCESS) {
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_transaction_cancel: failed to remove"
" recovery magic");
}
"tdb_transaction_cancel: failed to remove"
" recovery magic");
}
const struct tdb_methods *methods = tdb->transaction->io_methods;
tdb_off_t recovery_head;
size_t addition;
const struct tdb_methods *methods = tdb->transaction->io_methods;
tdb_off_t recovery_head;
size_t addition;
recovery_head = tdb_read_off(tdb, offsetof(struct tdb_header,recovery));
if (recovery_head == TDB_OFF_ERR) {
recovery_head = tdb_read_off(tdb, offsetof(struct tdb_header,recovery));
if (recovery_head == TDB_OFF_ERR) {
}
if (recovery_head != 0) {
}
if (recovery_head != 0) {
- if (methods->tread(tdb, recovery_head, &rec, sizeof(rec))) {
- tdb_logerr(tdb, tdb->ecode, TDB_LOG_ERROR,
+ ecode = methods->tread(tdb, recovery_head, &rec, sizeof(rec));
+ if (ecode != TDB_SUCCESS) {
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_recovery_allocate:"
" failed to read recovery record");
return -1;
"tdb_recovery_allocate:"
" failed to read recovery record");
return -1;
addition = (tdb->map_size - tdb->transaction->old_map_size) +
sizeof(rec) + *recovery_max_size;
tdb->map_size = tdb->transaction->old_map_size;
addition = (tdb->map_size - tdb->transaction->old_map_size) +
sizeof(rec) + *recovery_max_size;
tdb->map_size = tdb->transaction->old_map_size;
- if (methods->expand_file(tdb, addition) == -1) {
- tdb_logerr(tdb, tdb->ecode, TDB_LOG_ERROR,
+ ecode = methods->expand_file(tdb, addition);
+ if (ecode != TDB_SUCCESS) {
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_recovery_allocate:"
" failed to create recovery area");
return -1;
"tdb_recovery_allocate:"
" failed to create recovery area");
return -1;
/* write the recovery header offset and sync - we can sync without a race here
as the magic ptr in the recovery record has not been set */
tdb_convert(tdb, &recovery_head, sizeof(recovery_head));
/* write the recovery header offset and sync - we can sync without a race here
as the magic ptr in the recovery record has not been set */
tdb_convert(tdb, &recovery_head, sizeof(recovery_head));
- if (methods->twrite(tdb, offsetof(struct tdb_header, recovery),
- &recovery_head, sizeof(tdb_off_t)) == -1) {
- tdb_logerr(tdb, tdb->ecode, TDB_LOG_ERROR,
+ ecode = methods->twrite(tdb, offsetof(struct tdb_header, recovery),
+ &recovery_head, sizeof(tdb_off_t));
+ if (ecode != TDB_SUCCESS) {
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_recovery_allocate:"
" failed to write recovery head");
return -1;
"tdb_recovery_allocate:"
" failed to write recovery head");
return -1;
tdb_off_t old_map_size = tdb->transaction->old_map_size;
uint64_t magic, tailer;
int i;
tdb_off_t old_map_size = tdb->transaction->old_map_size;
uint64_t magic, tailer;
int i;
/*
check that the recovery area has enough space
/*
check that the recovery area has enough space
/* the recovery area contains the old data, not the
new data, so we have to call the original tdb_read
method to get it */
/* the recovery area contains the old data, not the
new data, so we have to call the original tdb_read
method to get it */
- if (methods->tread(tdb, offset,
- p + sizeof(offset) + sizeof(length),
- length) != 0) {
+ ecode = methods->tread(tdb, offset,
+ p + sizeof(offset) + sizeof(length),
+ length);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
tdb_convert(tdb, p, sizeof(tailer));
/* write the recovery data to the recovery area */
tdb_convert(tdb, p, sizeof(tailer));
/* write the recovery data to the recovery area */
- if (methods->twrite(tdb, recovery_offset, data,
- sizeof(*rec) + recovery_size) == -1) {
- tdb_logerr(tdb, tdb->ecode, TDB_LOG_ERROR,
+ ecode = methods->twrite(tdb, recovery_offset, data,
+ sizeof(*rec) + recovery_size);
+ if (ecode != TDB_SUCCESS) {
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_transaction_setup_recovery:"
" failed to write recovery data");
free(data);
"tdb_transaction_setup_recovery:"
" failed to write recovery data");
free(data);
/* as we don't have ordered writes, we have to sync the recovery
data before we update the magic to indicate that the recovery
data is present */
/* as we don't have ordered writes, we have to sync the recovery
data before we update the magic to indicate that the recovery
data is present */
- if (transaction_sync(tdb, recovery_offset,
- sizeof(*rec) + recovery_size) == -1) {
+ ecode = transaction_sync(tdb, recovery_offset,
+ sizeof(*rec) + recovery_size);
+ if (ecode != TDB_SUCCESS) {
*magic_offset = recovery_offset + offsetof(struct tdb_recovery_record,
magic);
*magic_offset = recovery_offset + offsetof(struct tdb_recovery_record,
magic);
- if (methods->twrite(tdb, *magic_offset, &magic, sizeof(magic)) == -1) {
- tdb_logerr(tdb, tdb->ecode, TDB_LOG_ERROR,
+ ecode = methods->twrite(tdb, *magic_offset, &magic, sizeof(magic));
+ if (ecode != TDB_SUCCESS) {
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_transaction_setup_recovery:"
" failed to write recovery magic");
return -1;
"tdb_transaction_setup_recovery:"
" failed to write recovery magic");
return -1;
transaction_write_existing(tdb, *magic_offset, &magic, sizeof(magic));
/* ensure the recovery magic marker is on disk */
transaction_write_existing(tdb, *magic_offset, &magic, sizeof(magic));
/* ensure the recovery magic marker is on disk */
- if (transaction_sync(tdb, *magic_offset, sizeof(magic)) == -1) {
+ ecode = transaction_sync(tdb, *magic_offset, sizeof(magic));
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
tdb_len_t add = tdb->map_size - tdb->transaction->old_map_size;
/* Restore original map size for tdb_expand_file */
tdb->map_size = tdb->transaction->old_map_size;
tdb_len_t add = tdb->map_size - tdb->transaction->old_map_size;
/* Restore original map size for tdb_expand_file */
tdb->map_size = tdb->transaction->old_map_size;
- if (methods->expand_file(tdb, add) == -1) {
- tdb_logerr(tdb, tdb->ecode, TDB_LOG_ERROR,
+ ecode = methods->expand_file(tdb, add);
+ if (ecode != TDB_SUCCESS) {
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_transaction_prepare_commit:"
" expansion failed");
_tdb_transaction_cancel(tdb);
"tdb_transaction_prepare_commit:"
" expansion failed");
_tdb_transaction_cancel(tdb);
{
const struct tdb_methods *methods;
int i;
{
const struct tdb_methods *methods;
int i;
if (tdb->transaction == NULL) {
tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
if (tdb->transaction == NULL) {
tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
length = tdb->transaction->last_block_size;
}
length = tdb->transaction->last_block_size;
}
- if (methods->twrite(tdb, offset, tdb->transaction->blocks[i],
- length) == -1) {
- tdb_logerr(tdb, tdb->ecode, TDB_LOG_ERROR,
+ ecode = methods->twrite(tdb, offset,
+ tdb->transaction->blocks[i], length);
+ if (ecode != TDB_SUCCESS) {
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_transaction_commit:"
" write failed during commit");
"tdb_transaction_commit:"
" write failed during commit");
tdb->transaction->num_blocks = 0;
/* ensure the new data is on disk */
tdb->transaction->num_blocks = 0;
/* ensure the new data is on disk */
- if (transaction_sync(tdb, 0, tdb->map_size) == -1) {
+ ecode = transaction_sync(tdb, 0, tdb->map_size);
+ if (ecode != TDB_SUCCESS) {
+ tdb->ecode = ecode;
tdb_off_t recovery_head, recovery_eof;
unsigned char *data, *p;
struct tdb_recovery_record rec;
tdb_off_t recovery_head, recovery_eof;
unsigned char *data, *p;
struct tdb_recovery_record rec;
/* find the recovery area */
recovery_head = tdb_read_off(tdb, offsetof(struct tdb_header,recovery));
/* find the recovery area */
recovery_head = tdb_read_off(tdb, offsetof(struct tdb_header,recovery));
}
/* read the full recovery data */
}
/* read the full recovery data */
- if (tdb->methods->tread(tdb, recovery_head + sizeof(rec), data,
- rec.len) == -1) {
- tdb_logerr(tdb, tdb->ecode, TDB_LOG_ERROR,
+ ecode = tdb->methods->tread(tdb, recovery_head + sizeof(rec), data,
+ rec.len);
+ if (ecode != TDB_SUCCESS) {
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_transaction_recover:"
" failed to read recovery data");
return -1;
"tdb_transaction_recover:"
" failed to read recovery data");
return -1;
memcpy(&len, p + sizeof(ofs), sizeof(len));
p += sizeof(ofs) + sizeof(len);
memcpy(&len, p + sizeof(ofs), sizeof(len));
p += sizeof(ofs) + sizeof(len);
- if (tdb->methods->twrite(tdb, ofs, p, len) == -1) {
+ ecode = tdb->methods->twrite(tdb, ofs, p, len);
+ if (ecode != TDB_SUCCESS) {
- tdb_logerr(tdb, tdb->ecode, TDB_LOG_ERROR,
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_transaction_recover:"
" failed to recover %zu bytes at offset %zu",
(size_t)len, (size_t)ofs);
"tdb_transaction_recover:"
" failed to recover %zu bytes at offset %zu",
(size_t)len, (size_t)ofs);
- if (transaction_sync(tdb, 0, tdb->map_size) == -1) {
- tdb_logerr(tdb, tdb->ecode, TDB_LOG_ERROR,
+ ecode = transaction_sync(tdb, 0, tdb->map_size);
+ if (ecode != TDB_SUCCESS) {
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_transaction_recover: failed to sync recovery");
return -1;
}
"tdb_transaction_recover: failed to sync recovery");
return -1;
}
- if (transaction_sync(tdb, 0, recovery_eof) == -1) {
- tdb_logerr(tdb, tdb->ecode, TDB_LOG_ERROR,
+ ecode = transaction_sync(tdb, 0, recovery_eof);
+ if (ecode != TDB_SUCCESS) {
+ tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_transaction_recover: failed to sync2 recovery");
return -1;
}
"tdb_transaction_recover: failed to sync2 recovery");
return -1;
}