aboutsummaryrefslogtreecommitdiff
path: root/src/update.c
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2011-08-10 22:00:34 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2011-08-10 22:00:34 +0000
commit74f7fe561e31637bdbf21aeb817d4a22bbf9c91a (patch)
treebae9da9f2c749d290ad4f1764dc205bcd23b750e /src/update.c
parent6b6dcc80555d77858733e44b72e92d1dc60e2c38 (diff)
downloadgdbm-74f7fe561e31637bdbf21aeb817d4a22bbf9c91a.tar.gz
gdbm-74f7fe561e31637bdbf21aeb817d4a22bbf9c91a.tar.bz2
Improve memory mapping support.
The new code is more flexible and performs better when lots of inserts are being made (e.g. when populating the database with new data). * src/gdbm.h.in (GDBM_SETMAXMAPSIZE): New constant. * src/gdbmconst.h (SIZE_T_MAX): New define. * src/gdbmdefs.h (gdbm_file_info) <cache_size>: Change type to size_t. <mmap_inited,mapped_size_max>: New member. <mapped_remap>: Remove. * src/gdbmopen.c: Fix a typo. (gdbm_open): Initialize new members. (_gdbm_init_cache): Second argument is size_t. * src/gdbmsetopt.c (gdbm_setopt): Optval argument is void*. Handle GDBM_SETMAXMAPSIZE. Improve error checking. * src/mmap.c (_GDBM_IN_MAPPED_REGION_P): Fix comparison with the lower bound. (_GDBM_NEED_REMAP): Return true if mapped_region is NULL. (SUM_FILE_SIZE): Rewrite. (_gdbm_mapped_unmap): Don't call msync. (_gdbm_internal_remap): Take 2 arguments, the second one giving the new mapped size. Unmap the region prior to remapping it. Always pass NULL as the argument to mmap. (_gdbm_mapped_remap): Rewrite the logic. Change semantics of the third argument. All uses updated. (_gdbm_mapped_init): Reflect the above changes. (_gdbm_mapped_read,_gdbm_mapped_write): Use mmap_inited to decide whether to use mmap, because mapped_region can be reset to zero by another functions (namely, _gdbm_mapped_lseek). Reset mmap_inited to FALSE, if _gdbm_mapped_remap fails. (_gdbm_mapped_lseek): Rewrite offset computations. Invalidate the mapped region. * src/proto.h (_gdbm_init_cache): Change prototype. * src/update.c (write_header, _gdbm_end_update): Remove checks for dbf->mapped_region. * tests/gtload.c: Implement the -maxmap option (set maximal mapped memory size). * doc/gdbm.texinfo: Document GDBM_SETMAXMAPSIZE.
Diffstat (limited to 'src/update.c')
-rw-r--r--src/update.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/update.c b/src/update.c
index aa9378f..b814415 100644
--- a/src/update.c
+++ b/src/update.c
@@ -38,8 +38,8 @@ write_header (GDBM_FILE dbf)
if (num_bytes != dbf->header->block_size)
_gdbm_fatal (dbf, "write error");
- /* Sync the file if fast_write is FALSE or it's mapped. */
- if (dbf->mapped_region != NULL || dbf->fast_write == FALSE)
+ /* Sync the file if fast_write is FALSE. */
+ if (dbf->fast_write == FALSE)
__fsync (dbf);
}
@@ -85,8 +85,7 @@ _gdbm_end_update (GDBM_FILE dbf)
if (num_bytes != dbf->header->dir_size)
_gdbm_fatal (dbf, "write error");
dbf->directory_changed = FALSE;
- if (!dbf->header_changed &&
- (dbf->fast_write == FALSE || dbf->mapped_region != NULL))
+ if (!dbf->header_changed && dbf->fast_write == FALSE)
__fsync (dbf);
}

Return to:

Send suggestions and report system problems to the System administrator.