*/
static int transaction1_oob(struct tdb1_context *tdb, tdb1_off_t len, int probe)
{
- if (len <= tdb->map_size) {
+ if (len <= tdb->file->map_size) {
return 0;
}
tdb->last_error = TDB_ERR_IO;
/* make sure we know about any file expansions already done by
anyone else */
- tdb->methods->tdb1_oob(tdb, tdb->map_size + 1, 1);
- tdb->transaction->old_map_size = tdb->map_size;
+ tdb->methods->tdb1_oob(tdb, tdb->file->map_size + 1, 1);
+ tdb->transaction->old_map_size = tdb->file->map_size;
/* finally hook the io methods, replacing them with
transaction specific methods */
}
#if HAVE_FDATASYNC
- if (fdatasync(tdb->fd) != 0) {
+ if (fdatasync(tdb->file->fd) != 0) {
#else
- if (fsync(tdb->fd) != 0) {
+ if (fsync(tdb->file->fd) != 0) {
#endif
tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"tdb1_transaction: fsync failed");
return -1;
}
#if HAVE_MMAP
- if (tdb->map_ptr) {
+ if (tdb->file->map_ptr) {
tdb1_off_t moffset = offset & ~(tdb->page_size-1);
- if (msync(moffset + (char *)tdb->map_ptr,
+ if (msync(moffset + (char *)tdb->file->map_ptr,
length + (offset - moffset), MS_SYNC) != 0) {
tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
"tdb1_transaction:"
return 0;
}
- tdb->map_size = tdb->transaction->old_map_size;
+ tdb->file->map_size = tdb->transaction->old_map_size;
/* free all the transaction blocks */
for (i=0;i<tdb->transaction->num_blocks;i++) {
/* round up to a multiple of page size */
*recovery_max_size = TDB1_ALIGN(sizeof(rec) + *recovery_size, tdb->page_size) - sizeof(rec);
- *recovery_offset = tdb->map_size;
+ *recovery_offset = tdb->file->map_size;
recovery_head = *recovery_offset;
if (methods->tdb1_expand_file(tdb, tdb->transaction->old_map_size,
- (tdb->map_size - tdb->transaction->old_map_size) +
+ (tdb->file->map_size - tdb->transaction->old_map_size) +
sizeof(rec) + *recovery_max_size) == -1) {
tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
"tdb1_recovery_allocate:"
}
/* remap the file (if using mmap) */
- methods->tdb1_oob(tdb, tdb->map_size + 1, 1);
+ methods->tdb1_oob(tdb, tdb->file->map_size + 1, 1);
/* we have to reset the old map size so that we don't try to expand the file
again in the transaction commit, which would destroy the recovery area */
- tdb->transaction->old_map_size = tdb->map_size;
+ tdb->transaction->old_map_size = tdb->file->map_size;
/* 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->transaction->prepared = true;
/* expand the file to the new size if needed */
- if (tdb->map_size != tdb->transaction->old_map_size) {
+ if (tdb->file->map_size != tdb->transaction->old_map_size) {
if (methods->tdb1_expand_file(tdb, tdb->transaction->old_map_size,
- tdb->map_size -
+ tdb->file->map_size -
tdb->transaction->old_map_size) == -1) {
tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
"tdb1_transaction_prepare_commit:"
_tdb1_transaction_cancel(tdb);
return -1;
}
- tdb->map_size = tdb->transaction->old_map_size;
- methods->tdb1_oob(tdb, tdb->map_size + 1, 1);
+ tdb->file->map_size = tdb->transaction->old_map_size;
+ methods->tdb1_oob(tdb, tdb->file->map_size + 1, 1);
}
/* Keep the open lock until the actual commit */
tdb->transaction->num_blocks = 0;
/* ensure the new data is on disk */
- if (transaction1_sync(tdb, 0, tdb->map_size) == -1) {
+ if (transaction1_sync(tdb, 0, tdb->file->map_size) == -1) {
return -1;
}
free(data);
- if (transaction1_sync(tdb, 0, tdb->map_size) == -1) {
+ if (transaction1_sync(tdb, 0, tdb->file->map_size) == -1) {
tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
"tdb1_transaction_recover: failed to sync recovery");
return -1;