mirror of
https://github.com/stefanocasazza/ULib.git
synced 2025-09-28 19:05:55 +08:00
sync
This commit is contained in:
parent
74c93d89c0
commit
693394d6e4
|
@ -334,6 +334,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
119
configure
vendored
119
configure
vendored
|
@ -928,6 +928,7 @@ CXX
|
|||
PKG_CONFIG
|
||||
CROSS_COMPILING_FALSE
|
||||
CROSS_COMPILING_TRUE
|
||||
PORTNAME
|
||||
EGREP
|
||||
GREP
|
||||
CPP
|
||||
|
@ -5774,6 +5775,48 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
|
|||
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
|
||||
|
||||
template=
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which template to use" >&5
|
||||
$as_echo_n "checking which template to use... " >&6; }
|
||||
|
||||
case $host_os in
|
||||
linux*|gnu*|k*bsd*-gnu)
|
||||
template=linux ;;
|
||||
mingw*) template=win32 ;;
|
||||
cygwin*) template=cygwin ;;
|
||||
# aix*) template=aix ;;
|
||||
# darwin*) template=darwin ;;
|
||||
#dragonfly*) template=netbsd ;;
|
||||
# freebsd*) template=freebsd ;;
|
||||
# hpux*) template=hpux ;;
|
||||
# netbsd*) template=netbsd ;;
|
||||
# openbsd*) template=openbsd ;;
|
||||
# sco*) template=sco ;;
|
||||
# solaris*) template=solaris ;;
|
||||
# sysv5*) template=unixware ;;
|
||||
esac
|
||||
|
||||
if test x"$template" = x"" ; then
|
||||
as_fn_error $? "
|
||||
***************************************************************************
|
||||
ULib has apparently not been ported to your platform yet. Try a manual
|
||||
configuration. Please also contact <stefano.casazza@gmail.com> to see about
|
||||
rectifying this. Include the above 'checking host system type...' line.
|
||||
***************************************************************************
|
||||
" "$LINENO" 5
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $template" >&5
|
||||
$as_echo "$template" >&6; }
|
||||
|
||||
PORTNAME=$template
|
||||
|
||||
|
||||
#
|
||||
# Read the template
|
||||
#
|
||||
# . "$srcdir/src/template/$template" || exit
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking initial CXX" >&5
|
||||
$as_echo_n "checking initial CXX... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
|
||||
|
@ -35200,6 +35243,82 @@ CXX=$CXX_save
|
|||
|
||||
|
||||
|
||||
# Check if the compiler still works with the final flag settings
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler still works" >&5
|
||||
$as_echo_n "checking whether the C compiler still works... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return 0;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_cxx_try_link "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
as_fn_error $? "cannot proceed" "$LINENO" 5
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
|
||||
if test "$cross_compiling" != "yes"; then
|
||||
# This test makes sure that run tests work at all. Sometimes a shared
|
||||
# library is found by the linker, but the runtime linker can't find it.
|
||||
# This check should come after all modifications of compiler or linker
|
||||
# variables, and before any other run tests
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking test program" >&5
|
||||
$as_echo_n "checking test program... " >&6; }
|
||||
if test "$cross_compiling" = yes; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling" >&5
|
||||
$as_echo "cross-compiling" >&6; }
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int main() { return 0; }
|
||||
_ACEOF
|
||||
if ac_fn_cxx_try_run "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
|
||||
$as_echo "ok" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
|
||||
$as_echo "failed" >&6; }
|
||||
as_fn_error $? "
|
||||
Could not execute a simple test program. This may be a problem
|
||||
related to locating shared libraries. Check the file 'config.log'
|
||||
for the exact reason." "$LINENO" 5
|
||||
fi
|
||||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
||||
conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
# Create compiler version string
|
||||
if test x"$GCC" = x"yes" ; then
|
||||
cc_string=`${CC} --version | sed q`
|
||||
case $cc_string in [A-Za-z]*) ;; *) cc_string="GCC $cc_string";; esac
|
||||
elif test x"$SUN_STUDIO_CC" = x"yes" ; then
|
||||
cc_string=`${CC} -V 2>&1 | sed q`
|
||||
else
|
||||
cc_string=$CC
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: using compiler=$cc_string" >&5
|
||||
$as_echo "$as_me: using compiler=$cc_string" >&6;}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS=$CFLAGS" >&5
|
||||
$as_echo "$as_me: using CFLAGS=$CFLAGS" >&6;}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: using CPPFLAGS=$CPPFLAGS" >&5
|
||||
$as_echo "$as_me: using CPPFLAGS=$CPPFLAGS" >&6;}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: using LDFLAGS=$LDFLAGS" >&5
|
||||
$as_echo "$as_me: using LDFLAGS=$LDFLAGS" >&6;}
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define CXX_VAR "$CXX"
|
||||
|
|
97
configure.ac
97
configure.ac
|
@ -8,17 +8,16 @@
|
|||
#
|
||||
# AC_INIT
|
||||
#
|
||||
# checks for programs
|
||||
# checks for libraries
|
||||
# checks for header files
|
||||
# checks for typedefs
|
||||
# checks for structures
|
||||
# checks for variables
|
||||
# checks for compiler characteristics
|
||||
# checks for library functions
|
||||
# checks for system services
|
||||
# 1. checks for programs
|
||||
# 2. checks for libraries
|
||||
# 3. checks for header files
|
||||
# 4. checks for typedefs
|
||||
# 5. checks for structures
|
||||
# 6. checks for compiler characteristics
|
||||
# 7. checks for library functions
|
||||
# 8. checks for system services
|
||||
#
|
||||
# AC_CONFIG_FILES([FILE...])
|
||||
# Read the Autoconf manual for details
|
||||
|
||||
# SECTION 1: AC_INIT
|
||||
#
|
||||
|
@ -59,6 +58,46 @@ AC_USE_SYSTEM_EXTENSIONS
|
|||
dnl This is a C++ library after all
|
||||
AC_LANG([C++])
|
||||
|
||||
template=
|
||||
AC_MSG_CHECKING([which template to use])
|
||||
|
||||
case $host_os in
|
||||
linux*|gnu*|k*bsd*-gnu)
|
||||
template=linux ;;
|
||||
mingw*) template=win32 ;;
|
||||
cygwin*) template=cygwin ;;
|
||||
# aix*) template=aix ;;
|
||||
# darwin*) template=darwin ;;
|
||||
#dragonfly*) template=netbsd ;;
|
||||
# freebsd*) template=freebsd ;;
|
||||
# hpux*) template=hpux ;;
|
||||
# netbsd*) template=netbsd ;;
|
||||
# openbsd*) template=openbsd ;;
|
||||
# sco*) template=sco ;;
|
||||
# solaris*) template=solaris ;;
|
||||
# sysv5*) template=unixware ;;
|
||||
esac
|
||||
|
||||
if test x"$template" = x"" ; then
|
||||
AC_MSG_ERROR([[
|
||||
***************************************************************************
|
||||
ULib has apparently not been ported to your platform yet. Try a manual
|
||||
configuration. Please also contact <stefano.casazza@gmail.com> to see about
|
||||
rectifying this. Include the above 'checking host system type...' line.
|
||||
***************************************************************************
|
||||
]])
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT([$template])
|
||||
|
||||
PORTNAME=$template
|
||||
AC_SUBST(PORTNAME)
|
||||
|
||||
#
|
||||
# Read the template
|
||||
#
|
||||
# . "$srcdir/src/template/$template" || exit
|
||||
|
||||
dnl Initial CXX, CFLAGS, CXXFLAGS, CPPFLAGS, LDFLAGS, LIBS
|
||||
AC_MSG_CHECKING(initial CXX)
|
||||
AC_MSG_RESULT($CXX)
|
||||
|
@ -2880,6 +2919,44 @@ AC_SUBST(LDFLAGS)
|
|||
AC_SUBST(CXXFLAGS)
|
||||
AC_SUBST(CPPFLAGS)
|
||||
|
||||
# Check if the compiler still works with the final flag settings
|
||||
AC_MSG_CHECKING([whether the C compiler still works])
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])],
|
||||
[AC_MSG_RESULT(yes)],
|
||||
[AC_MSG_RESULT(no)
|
||||
AC_MSG_ERROR([cannot proceed])])
|
||||
|
||||
if test "$cross_compiling" != "yes"; then
|
||||
# This test makes sure that run tests work at all. Sometimes a shared
|
||||
# library is found by the linker, but the runtime linker can't find it.
|
||||
# This check should come after all modifications of compiler or linker
|
||||
# variables, and before any other run tests
|
||||
AC_MSG_CHECKING([test program])
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])],
|
||||
[AC_MSG_RESULT(ok)],
|
||||
[AC_MSG_RESULT(failed)
|
||||
AC_MSG_ERROR([[
|
||||
Could not execute a simple test program. This may be a problem
|
||||
related to locating shared libraries. Check the file 'config.log'
|
||||
for the exact reason.]])],
|
||||
[AC_MSG_RESULT([cross-compiling])])
|
||||
fi
|
||||
|
||||
# Create compiler version string
|
||||
if test x"$GCC" = x"yes" ; then
|
||||
cc_string=`${CC} --version | sed q`
|
||||
case $cc_string in [[A-Za-z]]*) ;; *) cc_string="GCC $cc_string";; esac
|
||||
elif test x"$SUN_STUDIO_CC" = x"yes" ; then
|
||||
cc_string=`${CC} -V 2>&1 | sed q`
|
||||
else
|
||||
cc_string=$CC
|
||||
fi
|
||||
|
||||
AC_MSG_NOTICE([using compiler=$cc_string])
|
||||
AC_MSG_NOTICE([using CFLAGS=$CFLAGS])
|
||||
AC_MSG_NOTICE([using CPPFLAGS=$CPPFLAGS])
|
||||
AC_MSG_NOTICE([using LDFLAGS=$LDFLAGS])
|
||||
|
||||
AC_DEFINE_UNQUOTED(CXX_VAR, "$CXX", [Compiler])
|
||||
AC_DEFINE_UNQUOTED(LIBS_VAR, "$ULIB_LIBS", [Libraries])
|
||||
AC_DEFINE_UNQUOTED(CFLAGS_VAR, "$CFLAGS", [C Flags])
|
||||
|
|
|
@ -298,6 +298,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -280,6 +280,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -270,6 +270,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -269,6 +269,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -218,6 +218,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -365,6 +365,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -291,6 +291,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -366,6 +366,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -392,6 +392,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -301,6 +301,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -309,6 +309,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -283,6 +283,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -290,6 +290,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -270,6 +270,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -271,6 +271,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -271,6 +271,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -267,6 +267,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -269,6 +269,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -283,6 +283,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -299,6 +299,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -276,6 +276,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -284,6 +284,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -267,6 +267,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -276,6 +276,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -270,6 +270,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -301,6 +301,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -338,6 +338,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -290,6 +290,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -270,6 +270,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -281,6 +281,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -309,6 +309,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -218,6 +218,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -884,6 +884,8 @@ public:
|
|||
U_INTERNAL_DUMP("_length = %u", _length)
|
||||
|
||||
U_INTERNAL_ASSERT_EQUALS(_length, t._length)
|
||||
|
||||
// t.clear();
|
||||
}
|
||||
|
||||
// STREAMS
|
||||
|
|
|
@ -228,7 +228,12 @@ public:
|
|||
(void) pipeline.insert(0, U_CONSTANT_TO_PARAM("CLIENT REPLY OFF \r\n"));
|
||||
(void) pipeline.append(U_CONSTANT_TO_PARAM("CLIENT REPLY ON \r\n"));
|
||||
|
||||
return sendRequest(pipeline);
|
||||
bool result = sendRequest(pipeline);
|
||||
|
||||
// CLIENT REPLY ON responds with "+OK\r\n" and no way to silence it
|
||||
UClient_Base::readResponse();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
// STRING (@see http://redis.io/commands#string)
|
||||
|
@ -819,7 +824,6 @@ protected:
|
|||
U_TRACE_CTOR(0, UREDISClient_Base, "")
|
||||
|
||||
err = 0;
|
||||
U_NEW(UHashMap<void*>, pchannelCallbackMap, UHashMap<void*>());
|
||||
}
|
||||
|
||||
void init();
|
||||
|
@ -1036,7 +1040,7 @@ private:
|
|||
ClusterError error;
|
||||
UString temporaryASKip;
|
||||
UREDISClusterClient *subscriptionClient;
|
||||
UHashMap<RedisClusterNode *> clusterNodes; // when these call they need to be processed... also when MOVED... we need to set up and recalculate
|
||||
UHashMap<RedisClusterNode *> *clusterNodes; // when these call they need to be processed... also when MOVED... we need to set up and recalculate
|
||||
|
||||
uint16_t hashslotForKey(const UString& hashableKey) { return u_crc16(U_STRING_TO_PARAM(hashableKey)); }
|
||||
|
||||
|
@ -1056,7 +1060,7 @@ private:
|
|||
{
|
||||
U_TRACE(0, "UREDISClusterMaster::clientForHashslot(%u)", hashslot)
|
||||
|
||||
for (UHashMapNode *node : clusterNodes)
|
||||
for (UHashMapNode *node : *clusterNodes)
|
||||
{
|
||||
RedisClusterNode* workingNode = (RedisClusterNode *)(node->elem);
|
||||
|
||||
|
@ -1068,7 +1072,7 @@ private:
|
|||
|
||||
UREDISClusterClient* clientForASKip()
|
||||
{
|
||||
for (UHashMapNode *node : clusterNodes)
|
||||
for (UHashMapNode *node : *clusterNodes)
|
||||
{
|
||||
RedisClusterNode* workingNode = (RedisClusterNode *)(node->elem);
|
||||
|
||||
|
@ -1117,6 +1121,12 @@ public:
|
|||
{
|
||||
U_NEW(UREDISClusterClient, subscriptionClient, UREDISClusterClient(this));
|
||||
}
|
||||
|
||||
~UREDISClusterMaster()
|
||||
{
|
||||
U_DELETE(subscriptionClient);
|
||||
if (clusterNodes) U_DELETE(clusterNodes);
|
||||
}
|
||||
|
||||
#if defined(U_STDCPP_ENABLE) && defined(DEBUG)
|
||||
const char* dump(bool _reset) const { return subscriptionClient->UREDISClient_Base::dump(_reset); }
|
||||
|
|
|
@ -235,6 +235,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -660,6 +660,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -27,6 +27,7 @@ UREDISClient_Base::~UREDISClient_Base()
|
|||
if (pchannelCallbackMap)
|
||||
{
|
||||
U_DELETE(pchannelCallbackMap)
|
||||
pchannelCallbackMap = U_NULLPTR;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -518,8 +519,6 @@ int UREDISClient_Base::handlerRead()
|
|||
{
|
||||
U_TRACE_NO_PARAM(0, "UREDISClient_Base::handlerRead()")
|
||||
|
||||
U_INTERNAL_ASSERT_POINTER(pchannelCallbackMap)
|
||||
|
||||
if ((clear(), UClient_Base::response.setEmpty(), UClient_Base::readResponse(U_SINGLE_READ)))
|
||||
{
|
||||
char prefix = UClient_Base::response[0];
|
||||
|
@ -538,6 +537,8 @@ int UREDISClient_Base::handlerRead()
|
|||
|
||||
UString channel = vitem[1];
|
||||
|
||||
U_INTERNAL_ASSERT_POINTER(pchannelCallbackMap)
|
||||
|
||||
vPFcscs callback = (vPFcscs) pchannelCallbackMap->at(channel);
|
||||
|
||||
if (callback) callback(channel, vitem[2]);
|
||||
|
@ -633,7 +634,9 @@ void UREDISClusterMaster::calculateNodeMap()
|
|||
|
||||
(void) subscriptionClient->processRequest(U_RC_MULTIBULK, U_CONSTANT_TO_PARAM("CLUSTER SLOTS"));
|
||||
|
||||
UHashMap<RedisClusterNode *> newNodes;
|
||||
UHashMap<RedisClusterNode *> *newNodes;
|
||||
U_NEW(UHashMap<RedisClusterNode *>, newNodes, UHashMap<RedisClusterNode *>);
|
||||
|
||||
const UVector<UString>& rawNodes = subscriptionClient->vitem;
|
||||
|
||||
for (uint32_t a = 0, b = rawNodes.size(); a < b; a+=2)
|
||||
|
@ -656,7 +659,7 @@ void UREDISClusterMaster::calculateNodeMap()
|
|||
UString compositeAddress(50U);
|
||||
compositeAddress.snprintf(U_CONSTANT_TO_PARAM("%v.%v"), first.rep, second.rep);
|
||||
|
||||
RedisClusterNode *workingNode = clusterNodes.erase(compositeAddress);
|
||||
RedisClusterNode *workingNode = clusterNodes ? clusterNodes->erase(compositeAddress) : U_NULLPTR;
|
||||
|
||||
// in the case of MOVE some nodes will be new, but others we'll already be connected to
|
||||
if (workingNode)
|
||||
|
@ -664,18 +667,21 @@ void UREDISClusterMaster::calculateNodeMap()
|
|||
workingNode->lowHashSlot = workingLowHashSlot;
|
||||
workingNode->highHashSlot = workingHighHashSlot;
|
||||
}
|
||||
else workingNode = new RedisClusterNode(first, second.strtoul(), workingLowHashSlot, workingHighHashSlot, this);
|
||||
else
|
||||
{
|
||||
U_NEW(RedisClusterNode, workingNode, RedisClusterNode(first, second.strtoul(), workingLowHashSlot, workingHighHashSlot, this));
|
||||
}
|
||||
|
||||
newNodes.insert(compositeAddress, workingNode);
|
||||
|
||||
workingNode = newNodes[compositeAddress];
|
||||
newNodes->insert(compositeAddress, workingNode);
|
||||
|
||||
findHashSlots = true;
|
||||
}
|
||||
}
|
||||
|
||||
// if any nodes were taken offline, the clients would've disconnected by default
|
||||
clusterNodes.assign(newNodes);
|
||||
if (clusterNodes) U_DELETE(clusterNodes);
|
||||
|
||||
clusterNodes = newNodes;
|
||||
}
|
||||
|
||||
bool UREDISClusterMaster::connect(const char* host, unsigned int _port)
|
||||
|
@ -685,13 +691,16 @@ bool UREDISClusterMaster::connect(const char* host, unsigned int _port)
|
|||
if (subscriptionClient->connect(host, _port))
|
||||
{
|
||||
calculateNodeMap();
|
||||
|
||||
U_INTERNAL_ASSERT_EQUALS(UREDISClient_Base::pchannelCallbackMap, U_NULLPTR)
|
||||
|
||||
U_NEW(UHashMap<void*>, UREDISClient_Base::pchannelCallbackMap, UHashMap<void*>());
|
||||
|
||||
subscriptionClient->UEventFd::fd = subscriptionClient->getFd();
|
||||
subscriptionClient->UEventFd::op_mask |= EPOLLET;
|
||||
subscriptionClient->UEventFd::op_mask &= ~EPOLLRDHUP;
|
||||
|
||||
UServer_Base::addHandlerEvent(subscriptionClient); // NB: we ask to listen for events to a Redis publish channel...
|
||||
|
||||
|
||||
UServer_Base::addHandlerEvent(subscriptionClient);
|
||||
|
||||
U_RETURN(true);
|
||||
}
|
||||
|
||||
|
@ -755,7 +764,12 @@ const UVector<UString>& UREDISClusterMaster::processPipeline(UString& pipeline,
|
|||
|
||||
UREDISClusterClient* client = clientForHashslot(hashslot);
|
||||
|
||||
if constexpr (silence) (void) client->sendRequest(workingString);
|
||||
if constexpr (silence)
|
||||
{
|
||||
(void) client->sendRequest(workingString);
|
||||
// CLIENT REPLY ON responds with "+OK\r\n" and no way to silence it
|
||||
client->UClient_Base::readResponse();
|
||||
}
|
||||
else
|
||||
{
|
||||
replay: (void) client->processRequest(U_RC_MULTIBULK, U_STRING_TO_PARAM(workingString));
|
||||
|
|
|
@ -508,6 +508,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -297,6 +297,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -297,6 +297,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -298,6 +298,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -297,6 +297,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -298,6 +298,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -297,6 +297,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -305,6 +305,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -297,6 +297,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -4508,7 +4508,14 @@ void UServer_Base::runLoop(const char* user)
|
|||
|
||||
UNotifier::min_connection += n;
|
||||
|
||||
for (uint32_t i = 0; i < n; ++i) (*handler_other)[i]->UEventFd::op_mask &= ~EPOLLRDHUP;
|
||||
for (uint32_t i = 0; i < n; ++i)
|
||||
{
|
||||
U_INTERNAL_DUMP("(*handler_other)[%u]->UEventFd::fd = %d", i, (*handler_other)[i]->UEventFd::fd)
|
||||
|
||||
U_INTERNAL_ASSERT_DIFFERS((*handler_other)[i]->UEventFd::fd, -1)
|
||||
|
||||
(*handler_other)[i]->UEventFd::op_mask &= ~EPOLLRDHUP;
|
||||
}
|
||||
}
|
||||
|
||||
UNotifier::max_connection += (UNotifier::num_connection = UNotifier::min_connection);
|
||||
|
|
|
@ -332,6 +332,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -272,6 +272,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -280,6 +280,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -552,6 +552,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -423,6 +423,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -492,6 +492,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -508,6 +508,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -1 +1 @@
|
|||
0601
|
||||
0604
|
||||
|
|
|
@ -993,6 +993,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
|
@ -476,6 +476,7 @@ PHPCONFIGINCLUDES = @PHPCONFIGINCLUDES@
|
|||
PHPCONFIGLDFLAGS = @PHPCONFIGLDFLAGS@
|
||||
PHPCONFIGLIBS = @PHPCONFIGLIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PORTNAME = @PORTNAME@
|
||||
POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
|
||||
POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
|
||||
POSTGRESQL_LIBS = @POSTGRESQL_LIBS@
|
||||
|
|
Loading…
Reference in New Issue
Block a user