From: oetiker Date: Thu, 2 Feb 2012 15:38:44 +0000 (+0000) Subject: use posix_fallocate when initialiying rrd files ... instead of filling them with... X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=db7796a0c6540ad1d852616f2895b6c5205fbfe0;p=rrdtool.git use posix_fallocate when initialiying rrd files ... instead of filling them with yero explicitly -- Richard Laager git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2270 a5681a0c-68f1-0310-ab6d-d61299d08faa --- diff --git a/configure.ac b/configure.ac index b789a52..7fe70bc 100644 --- a/configure.ac +++ b/configure.ac @@ -281,6 +281,9 @@ AC_CHECK_DECLS(posix_fadvise, [], [], [#define _XOPEN_SOURCE 600 #include ]) AC_CHECK_FUNCS(posix_fadvise) +dnl can we use posix_fallocate +AC_CHECK_FUNCS(posix_fallocate) + CONFIGURE_PART(Libintl Processing) AM_GNU_GETTEXT_VERSION(0.17) diff --git a/src/rrd_open.c b/src/rrd_open.c index 117c79c..0de9b39 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -222,12 +222,20 @@ rrd_file_t *rrd_open( rrd_file->file_len = statb.st_size; } else { rrd_file->file_len = newfile_size; +#ifdef HAVE_POSIX_FALLOCATE + if (posix_fallocate(rrd_simple_file->fd, 0, newfile_size) == -1) { + rrd_set_error("posix_fallocate '%s': %s", file_name, + rrd_strerror(errno)); + goto out_close; + } +#else lseek(rrd_simple_file->fd, newfile_size - 1, SEEK_SET); if ( write(rrd_simple_file->fd, "\0", 1) == -1){ /* poke */ rrd_set_error("write '%s': %s", file_name, rrd_strerror(errno)); goto out_close; } lseek(rrd_simple_file->fd, 0, SEEK_SET); +#endif } #ifdef HAVE_POSIX_FADVISE /* In general we need no read-ahead when dealing with rrd_files. @@ -248,6 +256,7 @@ rrd_file_t *rrd_open( */ #ifdef HAVE_MMAP +#ifndef HAVE_POSIX_FALLOCATE /* force allocating the file on the underlaying filesystem to prevent any * future bus error when the filesystem is full and attempting to write * trough the file mapping. Filling the file using memset on the file @@ -279,6 +288,7 @@ rrd_file_t *rrd_open( lseek(rrd_simple_file->fd, 0, SEEK_SET); } +#endif data = mmap(0, rrd_file->file_len, rrd_simple_file->mm_prot, rrd_simple_file->mm_flags,