X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=m4%2Fpsi.m4;h=63407beb24bb9fd0c61856c65668475fd0da3aed;hp=e8d8069c35b4f0642a187cf3e0a3d07f05220813;hb=69fb17bcfa5ed9c32754fa143b59f4a4a2dd4bd8;hpb=ef5079cd02c9d8666f6b9336853d2ab393e33467

diff --git a/m4/psi.m4 b/m4/psi.m4
index e8d8069..63407be 100644
--- a/m4/psi.m4
+++ b/m4/psi.m4
@@ -3,6 +3,7 @@ PSI_STDINC=$PHP_PSI_SRCDIR/php_psi_stdinc.h
 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
@@ -49,6 +50,18 @@ static struct psi_predef_struct {
 	size_t pointer_level;
 	size_t array_size;
 } psi_predef_structs@<:@@:>@ = {
+EOF
+	cat >$PSI_UNIONS <<EOF
+/* generated by configure */
+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
 /* generated by configure */
@@ -91,7 +104,7 @@ AC_DEFUN(PSI_CONFIG_DONE, [
 /* generated by configure */
 PSI_INCLUDES
 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; do
 		cat >>$i <<EOF
 	{0}
 };
@@ -99,13 +112,59 @@ EOF
 	done
 ])
 
-dnl PSI_CONFIG_POSIX(section, headers)
-AC_DEFUN(PSI_CONFIG_POSIX, [
+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) ;;
-	*) expr "$PHP_PSI_POSIX" : '\b$1\b' >/dev/null || return 0 ;;
+	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
-	ifelse($2,,,AC_CHECK_HEADERS($2))
+	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()
@@ -169,6 +228,9 @@ AC_DEFUN(PSI_INCLUDES, [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
@@ -204,10 +266,22 @@ dnl PSI_SH_SIZEOF(type)
 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.
@@ -219,6 +293,17 @@ AC_DEFUN(PSI_CHECK_SIZEOF, [
 	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.
@@ -238,10 +323,6 @@ AC_DEFUN(PSI_CHECK_OFFSETOF, [
 	)
 ])
 
-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.