mirror of
https://github.com/php/php-src.git
synced 2024-09-23 10:57:26 +00:00
d11734b4b0
TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current patch suffers from bugs which are hard to find, but prevent it to be worky with apache. What is done here is mainly uses the idea from the RFC patch, but - __thread variable is removed - offset math and declarations are removed - extra macros and definitions are removed What is done merely is - use an inline function to access the tsrm cache. The function uses the portable tsrm_tls_get macro which is cheap - all the TSRM_* macros are set to placebo. Thus this opens the way remove them later Except that, the logic is old. TSRMLS_FETCH will have to be done once per thread, then tsrm_get_ls_cache() can be used. Things seeming to be worky are cli, cli server and apache. I also tried to enable bz2 shared and it has worked out of the box. The change is yet minimal diffing to the current master bus is a worky start, IMHO. Though will have to recheck the other previously done SAPIs - embed and cgi. The offsets can be added to the tsrm_resource_type struct, then it'll not be needed to declare them in the userspace. Even the "done" member type can be changed to int16 or smaller, then adding the offset as int16 will not change the struct size. As well on the todo might be removing the hashed storage, thread_id != thread_id and linked list logic in favour of the explicit TLS operations.
131 lines
2.8 KiB
Plaintext
131 lines
2.8 KiB
Plaintext
|
|
dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)
|
|
AC_DEFUN([TSRM_CHECK_GCC_ARG],[
|
|
gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
|
|
AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
|
|
echo 'void somefunc() { };' > conftest.c
|
|
cmd='$CC $1 -c conftest.c'
|
|
if eval $cmd 2>&1 | egrep -e $1 >/dev/null ; then
|
|
ac_result=no
|
|
else
|
|
ac_result=yes
|
|
fi
|
|
eval $gcc_arg_name=$ac_result
|
|
rm -f conftest.*
|
|
])
|
|
if eval test "\$$gcc_arg_name" = "yes"; then
|
|
$2
|
|
else
|
|
:
|
|
$3
|
|
fi
|
|
])
|
|
|
|
AC_DEFUN([TSRM_BASIC_CHECKS],[
|
|
|
|
AC_REQUIRE([AC_PROG_CC])dnl
|
|
dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
|
|
AC_REQUIRE([AC_PROG_CC_C_O])dnl
|
|
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
|
|
|
AC_CHECK_HEADERS(stdarg.h)
|
|
|
|
AC_CHECK_FUNCS(sigprocmask)
|
|
|
|
])
|
|
|
|
|
|
AC_DEFUN([TSRM_CHECK_PTH],[
|
|
|
|
AC_MSG_CHECKING(for GNU Pth)
|
|
PTH_PREFIX="`$1 --prefix`"
|
|
if test -z "$PTH_PREFIX"; then
|
|
AC_MSG_RESULT(Please check your Pth installation)
|
|
fi
|
|
|
|
CPPFLAGS="$CPPFLAGS `$1 --cflags`"
|
|
LDFLAGS="$LDFLAGS `$1 --ldflags`"
|
|
LIBS="$LIBS `$1 --libs`"
|
|
|
|
AC_DEFINE(GNUPTH, 1, [Whether you use GNU Pth])
|
|
AC_MSG_RESULT(yes - installed in $PTH_PREFIX)
|
|
|
|
])
|
|
|
|
AC_DEFUN([TSRM_CHECK_ST],[
|
|
if test -r "$1/include/st.h"; then
|
|
CPPFLAGS="$CPPFLAGS -I$1/include"
|
|
LDFLAGS="$LDFLAGS -L$1/lib"
|
|
elif test -r "$1/st.h"; then
|
|
CPPFLAGS="$CPPFLAGS -I$1"
|
|
LDFLAGS="$LDFLAGS -L$1"
|
|
fi
|
|
AC_CHECK_HEADERS(st.h,[],[
|
|
AC_MSG_ERROR([Sorry[,] I was unable to locate the State Threads header file. Please specify the prefix using --with-tsrm-st=/prefix])
|
|
])
|
|
LIBS="$LIBS -lst"
|
|
AC_MSG_CHECKING(for SGI's State Threads)
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE(TSRM_ST, 1, [ ])
|
|
])
|
|
|
|
sinclude(threads.m4)
|
|
|
|
AC_DEFUN([TSRM_CHECK_PTHREADS],[
|
|
|
|
PTHREADS_CHECK
|
|
|
|
if test "$beos_threads" = "1"; then
|
|
AC_DEFINE(BETHREADS, 1, Whether to use native BeOS threads)
|
|
else
|
|
if test "$pthreads_working" != "yes"; then
|
|
AC_MSG_ERROR(Your system seems to lack POSIX threads.)
|
|
fi
|
|
|
|
AC_DEFINE(PTHREADS, 1, Whether to use Pthreads)
|
|
|
|
AC_MSG_CHECKING(for POSIX threads)
|
|
AC_MSG_RESULT(yes)
|
|
fi
|
|
])
|
|
|
|
|
|
AC_DEFUN([TSRM_THREADS_CHECKS],[
|
|
|
|
dnl For the thread implementations, we always use --with-*
|
|
dnl to maintain consistency
|
|
|
|
AC_ARG_WITH(tsrm-pth,
|
|
[ --with-tsrm-pth[=pth-config]
|
|
Use GNU Pth],[
|
|
TSRM_PTH=$withval
|
|
],[
|
|
TSRM_PTH=no
|
|
])
|
|
|
|
AC_ARG_WITH(tsrm-st,
|
|
[ --with-tsrm-st Use SGI's State Threads],[
|
|
TSRM_ST=$withval
|
|
],[
|
|
TSRM_ST=no
|
|
])
|
|
|
|
AC_ARG_WITH(tsrm-pthreads,
|
|
[ --with-tsrm-pthreads Use POSIX threads (default)],[
|
|
TSRM_PTHREADS=$withval
|
|
],[
|
|
TSRM_PTHREADS=yes
|
|
])
|
|
|
|
test "$TSRM_PTH" = "yes" && TSRM_PTH=pth-config
|
|
|
|
if test "$TSRM_PTH" != "no"; then
|
|
TSRM_CHECK_PTH($TSRM_PTH)
|
|
elif test "$TSRM_ST" != "no"; then
|
|
TSRM_CHECK_ST($TSRM_ST)
|
|
elif test "$TSRM_PTHREADS" != "no"; then
|
|
TSRM_CHECK_PTHREADS
|
|
fi
|
|
|
|
])
|