PSI_STDTYPES=$PHP_PSI_SRCDIR/php_psi_stdtypes.h
PSI_TYPES=$PHP_PSI_SRCDIR/php_psi_types.h
PSI_STRUCTS=$PHP_PSI_SRCDIR/php_psi_structs.h
+PSI_UNIONS=$PHP_PSI_SRCDIR/php_psi_unions.h
PSI_CONSTS=$PHP_PSI_SRCDIR/php_psi_consts.h
PSI_REDIRS=$PHP_PSI_SRCDIR/php_psi_redirs.h
PSI_MACROS=$PHP_PSI_SRCDIR/php_psi_macros.h
PSI_DECLS=$PHP_PSI_SRCDIR/php_psi_decls.h
PSI_VA_DECLS=$PHP_PSI_SRCDIR/php_psi_va_decls.h
+PSI_FN_DECLS=$PHP_PSI_SRCDIR/php_psi_fn_decls.h
dnl PSI_CONFIG_INIT()
dnl Creates stubs of the headers with pre-defined types etc.
dnl These headers are included by src/context.c.
dnl This macro must be called prior any checks for a type, struct, decl etc.
AC_DEFUN(PSI_CONFIG_INIT, [
- cat >$PSI_STDTYPES <<EOF
+ for i in $PSI_STDTYPES $PSI_TYPES $PSI_STRUCTS $PSI_UNIONS $PSI_CONSTS $PSI_REDIRS $PSI_MACROS $PSI_DECLS $PSI_VA_DECLS $PSI_FN_DECLS; do
+ cat >$i <<EOF
/* generated by configure */
-static struct psi_predef_type {
+#include "php_psi_stdinc.h"
+EOF
+ done
+ cat >>$PSI_STDTYPES <<EOF
+static struct psi_std_type {
token_t type_tag;
const char *type_name;
const char *alias;
{PSI_T_UINT32, "uint32_t", NULL},
{PSI_T_UINT64, "uint64_t", NULL},
EOF
- cat >$PSI_TYPES <<EOF
-/* generated by configure */
-static struct psi_predef_type psi_predef_types@<:@@:>@ = {
+ cat >>$PSI_TYPES <<EOF
+static struct psi_predef_type {
+ token_t type_tag;
+ const char *type_name;
+ const char *alias;
+} psi_predef_types@<:@@:>@ = {
EOF
- cat >$PSI_STRUCTS <<EOF
-/* generated by configure */
+ cat >>$PSI_STRUCTS <<EOF
static struct psi_predef_struct {
token_t type_tag;
const char *type_name;
size_t array_size;
} psi_predef_structs@<:@@:>@ = {
EOF
- cat >$PSI_CONSTS <<EOF
-/* generated by configure */
+ cat >>$PSI_UNIONS <<EOF
+static struct psi_predef_union {
+ token_t type_tag;
+ const char *type_name;
+ const char *var_name;
+ size_t offset;
+ size_t size;
+ size_t pointer_level;
+ size_t array_size;
+} psi_predef_unions@<:@@:>@ = {
+EOF
+ cat >>$PSI_CONSTS <<EOF
static struct psi_predef_const {
token_t type_tag;
const char *type_name;
token_t val_type_tag;
} psi_predef_consts@<:@@:>@ = {
EOF
- cat >$PSI_REDIRS <<EOF
-/* generated by configure */
+ cat >>$PSI_REDIRS <<EOF
+typedef void (*psi_func_ptr)();
static struct psi_func_redir {
const char *name;
- void (*func)(void);
+ psi_func_ptr func;
} psi_func_redirs@<:@@:>@ = {
EOF
- cat >$PSI_MACROS </dev/null
- cat >$PSI_DECLS <<EOF
-/* generated by configure */
+ cat >>$PSI_MACROS <<EOF
+EOF
+ cat >>$PSI_DECLS <<EOF
static struct psi_predef_decl {
token_t type_tag;
const char *type_name;
size_t array_size;
} psi_predef_decls@<:@@:>@ = {
EOF
- cat >$PSI_VA_DECLS <<EOF
-/* generated by configure */
+ cat >>$PSI_VA_DECLS <<EOF
static struct psi_predef_decl psi_predef_vararg_decls@<:@@:>@ = {
+EOF
+ cat >>$PSI_FN_DECLS <<EOF
+static struct psi_predef_decl psi_predef_functor_decls@<:@@:>@ = {
EOF
])
AC_DEFUN(PSI_CONFIG_DONE, [
cat >$PSI_STDINC <<EOF
/* generated by configure */
+#ifndef _PSI_STDINC
+#define _PSI_STDINC
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE
+#endif
PSI_INCLUDES
+#endif
EOF
- for i in $PSI_STDTYPES $PSI_TYPES $PSI_STRUCTS $PSI_CONSTS $PSI_REDIRS $PSI_DECLS $PSI_VA_DECLS; do
+ for i in $PSI_STDTYPES $PSI_TYPES $PSI_STRUCTS $PSI_UNIONS $PSI_CONSTS $PSI_REDIRS $PSI_DECLS $PSI_VA_DECLS $PSI_FN_DECLS; do
cat >>$i <<EOF
{0}
};
done
])
+dnl PSI_SH_CONFIG_POSIX_ENABLED(section)
+dnl Expand to $psi_config_posix_<section>
+AC_DEFUN(PSI_SH_CONFIG_POSIX_ENABLED, [$AS_TR_SH([psi_config_posix_]$1)])
+
+dnl PSI_CONFIG_POSIX_ENABLED(section, action-if-yes, action-if-not)
+dnl Internal. Used to check if --enable-psi-posix=section was given.
+AC_DEFUN(PSI_CONFIG_POSIX_ENABLED, [
+ AS_TR_SH([psi_config_posix_]$1)=false
+ case "$PHP_PSI_POSIX" in
+ yes|all)
+ AS_TR_SH([psi_config_posix_]$1)=true
+ ;;
+ *)
+ if expr "$PHP_PSI_POSIX" : '\b$1\b' >/dev/null; then
+ AS_TR_SH([psi_config_posix_]$1)=true
+ fi
+ ;;
+ esac
+ if $AS_TR_SH([psi_config_posix_]$1); then
+ ifelse([$2],,:,[$2])
+ else
+ ifelse([$3],,:,[$3])
+ fi
+])
+
+dnl PSI_TEST_POSIX_ENABLED(section, action-if-yes, action-if-not)
+dnl Shell-if test if PSI POSIX section was configured.
+AC_DEFUN(PSI_SH_TEST_POSIX_ENABLED, [
+ if test "PSI_SH_CONFIG_POSIX_ENABLED([$1])" && $PSI_SH_CONFIG_POSIX_ENABLED([$1]); then
+ ifelse([$2],,:,[$2])
+ else
+ ifelse([$3],,:,[$3])
+ fi
+])
+
+dnl PSI_CONFIG_POSIX(section, headers)
+AC_DEFUN(PSI_CONFIG_POSIX, [
+ PSI_CONFIG_POSIX_ENABLED($1, [
+ PHP_CONFIGURE_PART(Configuring PSI POSIX: $1)
+ ifelse([$2],,:,[AC_CHECK_HEADERS($2)])
+ ], [
+ return 0
+ ])
+])
+
+AC_DEFUN(PSI_PTHREAD_ONCE, [
+ AX_PTHREAD([
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ ])
+])
+AC_DEFUN(PSI_PTHREAD, [
+ AC_REQUIRE([PSI_PTHREAD_ONCE])
+])
+
dnl PSI_INCLUDES()
dnl Expands to a complete list of include statements including
dnl AC_INCLUDES_DEFAULT().
#ifdef HAVE_TIME_H
# include <time.h>
#endif
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
+#endif
#ifdef HAVE_SYSLOG_H
# include <syslog.h>
#endif
dnl expand to shell variable $ac_cv_sizeof_<TYPE>
AC_DEFUN([PSI_SH_SIZEOF], [$AS_TR_SH([ac_cv_sizeof_]$1)])
+dnl PSI_SH_OFFSETOF(type)
+dnl Expand to shell variable $ac_cv_offsetof_<TYPE>
+AC_DEFUN([PSI_SH_OFFSETOF], [$AS_TR_SH([ac_cv_offsetof_]$1)])
+
+dnl PSI_SH_ALIGNOF(type)
+dnl Expand to shell variable $ac_cv_offsetof_<TYPE>
+AC_DEFUN([PSI_SH_ALIGNOF], [$AS_TR_SH([ac_cv_alignof_]$1)])
+
dnl PSI_SH_TEST_SIZEOF(type)
dnl `if` condition to test if $ac_cv_sizeof_$1 is greater than 0.
AC_DEFUN([PSI_SH_TEST_SIZEOF], [test -n "$AS_TR_SH([ac_cv_sizeof_]$1)" && test "$AS_TR_SH([ac_cv_sizeof_]$1)" -gt 0])
+dnl PSI_SH_TEST_ALIGNOF(type)
+dnl `if` condition to test if $ac_cv_alignof_$1 is greater than 0.
+AC_DEFUN([PSI_SH_TEST_ALIGNOF], [test -n "$AS_TR_SH([ac_cv_alignof_]$1)" && test "$AS_TR_SH([ac_cv_alignof_]$1)" -gt 0])
+
dnl PSI_CHECK_SIZEOF(type, special-includes)
dnl AC_CHECK_SIZEOF wrapper with PSI_INCLUDES
dnl Defines psi\\SIZEOF_<TYPE> pre-defined constant in $PSI_CONSTS.
fi
])
+dnl PSI_CHECK_ALIGNOF(type, special-includes)
+dnl AC_CHECK_ALIGNOF wrapper with PSI_INCLUDES
+dnl Defines psi\\ALIGNOF_<TYPE> pre-defined constant in $PSI_CONSTS.
+AC_DEFUN(PSI_CHECK_ALIGNOF, [
+ AC_CHECK_ALIGNOF($1, PSI_INCLUDES
+ $2)
+ if PSI_SH_TEST_ALIGNOF($1); then
+ psi_add_int_const "AS_TR_CPP([ALIGNOF_]$1)" "$AS_TR_SH([ac_cv_alignof_]$1)"
+ fi
+])
+
dnl PSI_CHECK_OFFSETOF(struct, element)
dnl Check the offset of a struct element, implemented in the similar manner
dnl like AC_CHECK_SIZEOF.
)
])
-dnl PSI_SH_OFFSETOF(type)
-dnl Expand to shell variable $ac_cv_offsetof_<TYPE>
-AC_DEFUN([PSI_SH_OFFSETOF], [$AS_TR_SH([ac_cv_offsetof_]$1)])
-
dnl PSI_COMPUTE_STR(variable, string or expression)
dnl Compute a string constant value in a similar manner like AC_COMPUTE_INT.