Fix fsync code to test whether F_FULLFSYNC is available, instead of
assuming it always is on Darwin. Per report from Neil Brandt.
This commit is contained in:
parent
f3dda5be89
commit
558bc2584d
75
configure
vendored
75
configure
vendored
@ -13230,6 +13230,81 @@ fi
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# This is probably only present on Darwin, but may as well check always
|
||||||
|
echo "$as_me:$LINENO: checking whether F_FULLFSYNC is declared" >&5
|
||||||
|
echo $ECHO_N "checking whether F_FULLFSYNC is declared... $ECHO_C" >&6
|
||||||
|
if test "${ac_cv_have_decl_F_FULLFSYNC+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
/* confdefs.h. */
|
||||||
|
_ACEOF
|
||||||
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
|
/* end confdefs.h. */
|
||||||
|
#include <fcntl.h>
|
||||||
|
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
#ifndef F_FULLFSYNC
|
||||||
|
char *p = (char *) F_FULLFSYNC;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest.$ac_objext
|
||||||
|
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||||
|
(eval $ac_compile) 2>conftest.er1
|
||||||
|
ac_status=$?
|
||||||
|
grep -v '^ *+' conftest.er1 >conftest.err
|
||||||
|
rm -f conftest.er1
|
||||||
|
cat conftest.err >&5
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); } &&
|
||||||
|
{ ac_try='test -z "$ac_c_werror_flag"
|
||||||
|
|| test ! -s conftest.err'
|
||||||
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
(eval $ac_try) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; } &&
|
||||||
|
{ ac_try='test -s conftest.$ac_objext'
|
||||||
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
(eval $ac_try) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; }; then
|
||||||
|
ac_cv_have_decl_F_FULLFSYNC=yes
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
|
ac_cv_have_decl_F_FULLFSYNC=no
|
||||||
|
fi
|
||||||
|
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
fi
|
||||||
|
echo "$as_me:$LINENO: result: $ac_cv_have_decl_F_FULLFSYNC" >&5
|
||||||
|
echo "${ECHO_T}$ac_cv_have_decl_F_FULLFSYNC" >&6
|
||||||
|
if test $ac_cv_have_decl_F_FULLFSYNC = yes; then
|
||||||
|
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define HAVE_DECL_F_FULLFSYNC 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
|
||||||
|
else
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define HAVE_DECL_F_FULLFSYNC 0
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## Functions, global variables
|
## Functions, global variables
|
||||||
##
|
##
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
dnl Process this file with autoconf to produce a configure script.
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
dnl $PostgreSQL: pgsql/configure.in,v 1.442 2006/01/12 19:23:22 tgl Exp $
|
dnl $PostgreSQL: pgsql/configure.in,v 1.443 2006/01/17 23:52:30 tgl Exp $
|
||||||
dnl
|
dnl
|
||||||
dnl Developers, please strive to achieve this order:
|
dnl Developers, please strive to achieve this order:
|
||||||
dnl
|
dnl
|
||||||
@ -810,6 +810,9 @@ if test "$with_krb5" = yes; then
|
|||||||
[#include <krb5.h>])
|
[#include <krb5.h>])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# This is probably only present on Darwin, but may as well check always
|
||||||
|
AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
|
||||||
|
|
||||||
##
|
##
|
||||||
## Functions, global variables
|
## Functions, global variables
|
||||||
##
|
##
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* Portions Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.124 2005/12/08 15:38:29 tgl Exp $
|
* $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.125 2006/01/17 23:52:31 tgl Exp $
|
||||||
*
|
*
|
||||||
* NOTES:
|
* NOTES:
|
||||||
*
|
*
|
||||||
@ -265,13 +265,15 @@ int
|
|||||||
pg_fsync_writethrough(int fd)
|
pg_fsync_writethrough(int fd)
|
||||||
{
|
{
|
||||||
if (enableFsync)
|
if (enableFsync)
|
||||||
|
{
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
return _commit(fd);
|
return _commit(fd);
|
||||||
#elif defined(__darwin__)
|
#elif defined(F_FULLFSYNC)
|
||||||
return (fcntl(fd, F_FULLFSYNC, 0) == -1) ? -1 : 0;
|
return (fcntl(fd, F_FULLFSYNC, 0) == -1) ? -1 : 0;
|
||||||
#else
|
#else
|
||||||
return -1;
|
return -1;
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
else
|
else
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -72,6 +72,10 @@
|
|||||||
don't. */
|
don't. */
|
||||||
#undef HAVE_DECL_FDATASYNC
|
#undef HAVE_DECL_FDATASYNC
|
||||||
|
|
||||||
|
/* Define to 1 if you have the declaration of `F_FULLFSYNC', and to 0 if you
|
||||||
|
don't. */
|
||||||
|
#undef HAVE_DECL_F_FULLFSYNC
|
||||||
|
|
||||||
/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
|
/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
|
||||||
don't. */
|
don't. */
|
||||||
#undef HAVE_DECL_SNPRINTF
|
#undef HAVE_DECL_SNPRINTF
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
#define __darwin__ 1
|
#define __darwin__ 1
|
||||||
|
|
||||||
|
#if HAVE_DECL_F_FULLFSYNC /* not present before OS X 10.3 */
|
||||||
#define HAVE_FSYNC_WRITETHROUGH
|
#define HAVE_FSYNC_WRITETHROUGH
|
||||||
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user