Skip to content
Snippets Groups Projects
Commit 77b044f2 authored by Bruce Momjian's avatar Bruce Momjian
Browse files

Disable effective_io_concurrency on Solaris because posix_fadvise() is 

no-op on that platform.
parent 555b46e2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
configure
+ 127
− 28
View file @ 77b044f2
......@@ -16324,8 +16324,7 @@ fi
 
 
 
for ac_func in cbrt dlopen fcvt fdatasync getpeereid getpeerucred getrlimit memmove poll posix_fadvise pstat readlink setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs
for ac_func in cbrt dlopen fcvt fdatasync getpeereid getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
......@@ -16419,9 +16418,17 @@ fi
done
 
 
{ echo "$as_me:$LINENO: checking whether fdatasync is declared" >&5
echo $ECHO_N "checking whether fdatasync is declared... $ECHO_C" >&6; }
if test "${ac_cv_have_decl_fdatasync+set}" = set; then
# posix_fadvise() is a no-op on Solaris, so don't incur function overhead
# by calling it, 2009-04-02
# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/gen/posix_fadvise.c
if test "$PORTNAME" != "solaris"; then
for ac_func in posix_fadvise
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
......@@ -16430,13 +16437,103 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <unistd.h>
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
#endif
 
int
main ()
{
#ifndef fdatasync
(void) fdatasync;
return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 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); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
{ echo "$as_me:$LINENO: checking whether posix_fadvise is declared" >&5
echo $ECHO_N "checking whether posix_fadvise is declared... $ECHO_C" >&6; }
if test "${ac_cv_have_decl_posix_fadvise+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 posix_fadvise
(void) posix_fadvise;
#endif
 
;
......@@ -16460,37 +16557,39 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_have_decl_fdatasync=yes
ac_cv_have_decl_posix_fadvise=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
 
ac_cv_have_decl_fdatasync=no
ac_cv_have_decl_posix_fadvise=no
fi
 
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_fdatasync" >&5
echo "${ECHO_T}$ac_cv_have_decl_fdatasync" >&6; }
if test $ac_cv_have_decl_fdatasync = yes; then
{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_posix_fadvise" >&5
echo "${ECHO_T}$ac_cv_have_decl_posix_fadvise" >&6; }
if test $ac_cv_have_decl_posix_fadvise = yes; then
 
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_FDATASYNC 1
#define HAVE_DECL_POSIX_FADVISE 1
_ACEOF
 
 
else
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_FDATASYNC 0
#define HAVE_DECL_POSIX_FADVISE 0
_ACEOF
 
 
fi
 
 
{ echo "$as_me:$LINENO: checking whether posix_fadvise is declared" >&5
echo $ECHO_N "checking whether posix_fadvise is declared... $ECHO_C" >&6; }
if test "${ac_cv_have_decl_posix_fadvise+set}" = set; then
fi
{ echo "$as_me:$LINENO: checking whether fdatasync is declared" >&5
echo $ECHO_N "checking whether fdatasync is declared... $ECHO_C" >&6; }
if test "${ac_cv_have_decl_fdatasync+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
......@@ -16499,13 +16598,13 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <fcntl.h>
#include <unistd.h>
 
int
main ()
{
#ifndef posix_fadvise
(void) posix_fadvise;
#ifndef fdatasync
(void) fdatasync;
#endif
 
;
......@@ -16529,28 +16628,28 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_have_decl_posix_fadvise=yes
ac_cv_have_decl_fdatasync=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
 
ac_cv_have_decl_posix_fadvise=no
ac_cv_have_decl_fdatasync=no
fi
 
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_posix_fadvise" >&5
echo "${ECHO_T}$ac_cv_have_decl_posix_fadvise" >&6; }
if test $ac_cv_have_decl_posix_fadvise = yes; then
{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_fdatasync" >&5
echo "${ECHO_T}$ac_cv_have_decl_fdatasync" >&6; }
if test $ac_cv_have_decl_fdatasync = yes; then
 
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_POSIX_FADVISE 1
#define HAVE_DECL_FDATASYNC 1
_ACEOF
 
 
else
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_POSIX_FADVISE 0
#define HAVE_DECL_FDATASYNC 0
_ACEOF
 
 
......
configure.in
+ 10
− 3
View file @ 77b044f2
dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.593 2009/04/04 21:55:50 tgl Exp $
dnl $PostgreSQL: pgsql/configure.in,v 1.594 2009/04/07 22:48:30 momjian Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
......@@ -1141,10 +1141,17 @@ PGAC_VAR_INT_TIMEZONE
AC_FUNC_ACCEPT_ARGTYPES
PGAC_FUNC_GETTIMEOFDAY_1ARG
AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getpeereid getpeerucred getrlimit memmove poll posix_fadvise pstat readlink setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs])
AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getpeereid getpeerucred getrlimit memmove poll pstat readlink setproctitle setsid sigprocmask symlink sysconf towlower utime utimes waitpid wcstombs])
AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])
# posix_fadvise() is a no-op on Solaris, so don't incur function overhead
# by calling it, 2009-04-02
# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/gen/posix_fadvise.c
if test "$PORTNAME" != "solaris"; then
AC_CHECK_FUNCS(posix_fadvise)
AC_CHECK_DECLS(posix_fadvise, [], [], [#include <fcntl.h>])
fi
AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])
AC_CHECK_DECLS([strlcat, strlcpy])
# This is probably only present on Darwin, but may as well check always
AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment