diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2020-03-26 10:59:46 +0100 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2020-04-14 09:49:45 +0200 |
| commit | 182dbdf0f4b6e6484b0d4588aaefacc75862a99c (patch) | |
| tree | 4e4a612a329ed8a3af42bb789c824474cf678ec5 | |
| parent | 7eed413e72a236b6f1475a198f7063fd24929e23 (diff) | |
util: Detect posix_fallocate() instead of assuming
Don't assume that `posix_fallocate()` is available on Linux and not
available on other operating systems. At least FreeBSD has it and we
are not using it.
Properly check whether `posix_fallocate()` is present and use it if it
is.
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | src/util/system.cpp | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ef87d759f1..c8984c83c3 100644 --- a/configure.ac +++ b/configure.ac @@ -851,6 +851,22 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <malloc.h>]], [ AC_MSG_RESULT(no)] ) +dnl Check for posix_fallocate +AC_MSG_CHECKING(for posix_fallocate) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + // same as in src/util/system.cpp + #ifdef __linux__ + #ifdef _POSIX_C_SOURCE + #undef _POSIX_C_SOURCE + #endif + #define _POSIX_C_SOURCE 200112L + #endif // __linux__ + #include <fcntl.h>]], + [[ int f = posix_fallocate(0, 0, 0); ]])], + [ AC_MSG_RESULT(yes); AC_DEFINE(HAVE_POSIX_FALLOCATE, 1,[Define this symbol if you have posix_fallocate]) ], + [ AC_MSG_RESULT(no)] +) + AC_MSG_CHECKING([for visibility attribute]) AC_LINK_IFELSE([AC_LANG_SOURCE([ int foo_def( void ) __attribute__((visibility("default"))); diff --git a/src/util/system.cpp b/src/util/system.cpp index b0a538b527..b4df0680af 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -17,7 +17,7 @@ #endif #ifndef WIN32 -// for posix_fallocate +// for posix_fallocate, in configure.ac we check if it is present after this #ifdef __linux__ #ifdef _POSIX_C_SOURCE @@ -1012,7 +1012,7 @@ void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length) { } ftruncate(fileno(file), static_cast<off_t>(offset) + length); #else - #if defined(__linux__) + #if defined(HAVE_POSIX_FALLOCATE) // Version using posix_fallocate off_t nEndPos = (off_t)offset + length; if (0 == posix_fallocate(fileno(file), 0, nEndPos)) return; |