X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=config.m4;h=d83fb73c7636f2388293c98b508b27a4a64ac318;hp=ee54dac1f5b12d9a809dd7fe0d0771fd0d258ae4;hb=1d0049e066faab3c40dcf238c92daab45aadddd7;hpb=207ff7bc85e967235f0ad1ffbf47c0f85f375063

diff --git a/config.m4 b/config.m4
index ee54dac..d83fb73 100644
--- a/config.m4
+++ b/config.m4
@@ -92,7 +92,8 @@ if test "$PHP_PSI" != "no"; then
 	])
 
 	psi_type_pair() { # (type, size)
-		local psi_type_lower=`tr A-Z a-z <<<$1`
+		local psi_type_name=`tr -cd A-Za-z <<<$1`
+		local psi_type_lower=`tr A-Z a-z <<<$psi_type_name`
 		case $psi_type_lower in
 		int*|uint*)
 			local psi_type_upper=`tr a-z A-Z <<<$1`
@@ -103,7 +104,7 @@ if test "$PHP_PSI" != "no"; then
 			echo "PSI_T_STRUCT, \"$2\""
 			;;
 		*)
-			echo "PSI_T_NAME, \"$1\""
+			echo "PSI_T_NAME, \"$psi_type_name\""
 			;;
 		esac
 	}
@@ -192,33 +193,40 @@ if test "$PHP_PSI" != "no"; then
 		AC_DEFINE_UNQUOTED(
 			AS_TR_CPP(offsetof_$1_$2),
 			$AS_TR_SH([ac_cv_offsetof_$1_$2]),
-			[The offset of `$1' in `$2', as computed by offsetof.]
+			[The offset of `$2' in `$1', as computed by offsetof.]
 		)
 	])
 
-	dnl PSI_STRUCT(name, members, member type cases, includes)
+	dnl PSI_STRUCT(struct name, members, member type cases, includes)
 	PSI_STRUCTS=
 	AC_DEFUN(PSI_STRUCT, [
+		AC_CHECK_SIZEOF($1, [], PSI_INCLUDES_DEFAULT($4))
+		psi_struct_name=`echo $1 | cut -d" " -f2`
+		psi_struct_size=$AS_TR_SH(ac_cv_sizeof_struct_$1)
 		psi_struct_members=
 		m4_foreach(member, [$2], [
-			AC_CHECK_MEMBER(struct $1.member, [
+			AC_CHECK_MEMBER($1.member, [
+				psi_member_name=member
+				AC_CHECK_SIZEOF(AS_TR_SH($1)[_]member, [], PSI_INCLUDES_DEFAULT($4,
+					[#define ]AS_TR_SH($1)[_]member (($1 *)0)->member
+				))
+				psi_member_size=$AS_TR_SH(ac_cv_sizeof_$1[]_[]member)
+				PSI_CHECK_OFFSETOF($1, member, PSI_INCLUDES_DEFAULT($4))
+				psi_member_offset=$AS_TR_SH(ac_cv_offsetof_$1[]_[]member)
+				# type
 				case member in
 				$3
 				*) psi_member_type=int ;;
 				esac
-				AC_CHECK_SIZEOF(struct_$1[_]member, [], PSI_INCLUDES_DEFAULT($4,
-					[#define struct_$1_]member ((struct $1 *)0)->member
-				))
-				PSI_CHECK_OFFSETOF(struct $1, member, PSI_INCLUDES_DEFAULT($4))
 				# pointer level
 				psi_struct_member_pl=`echo $psi_member_type | tr -cd '*' | wc -c`
 				# array size
-				psi_struct_member_as=`echo $psi_member_type | $AWK -F'\x5b\x5d\x5b\x5d' 'END {print 0} /\\x5b\x5b\x5b:digit:\x5d\x5d+\\x5d/ {print$[]2; exit}'`
+				psi_struct_member_as=`echo $psi_member_type | $AWK -F'@<:@@:>@@<:@@:>@' 'END {if(!found)print 0} /\@<:@@<:@@<:@:digit:@:>@@:>@+\@:>@/ {found=1; print$[]2}'`
 				if test $psi_struct_member_as -gt 0
 				then
 					psi_struct_member_pl=`expr $psi_struct_member_pl + 1`
 				fi
-				psi_struct_member="{`psi_type_pair $psi_member_type $ac_cv_sizeof_struct_$1[]_[]member`, \"[]member[]\", $ac_cv_offsetof_struct_$1[]_[]member, $ac_cv_sizeof_struct_$1[]_[]member, $psi_struct_member_pl, $psi_struct_member_as}"
+				psi_struct_member="{`psi_type_pair $psi_member_type $psi_member_size`, \"$psi_member_name\", $psi_member_offset, $psi_member_size, $psi_struct_member_pl, $psi_struct_member_as}"
 				if test "$psi_struct_members"
 				then
 					psi_struct_members="$psi_struct_members, $psi_struct_member"
@@ -227,7 +235,47 @@ if test "$PHP_PSI" != "no"; then
 				fi
 			], [], PSI_INCLUDES_DEFAULT($4))
 		])
-		PSI_STRUCTS="{\"$1\", {$psi_struct_members}}, $PSI_STRUCTS"
+		if test "$1" != "$psi_struct_name"
+		then
+			PSI_TYPES="{PSI_T_STRUCT, \"$psi_struct_name\", \"$psi_struct_name\"}, $PSI_TYPES"
+		fi
+		PSI_STRUCTS="{\"$psi_struct_name\", $psi_struct_size, {$psi_struct_members}}, $PSI_STRUCTS"
+	])
+
+	PSI_INCLUDES=
+	AC_PROG_NM
+	AC_PROG_AWK
+	PSI_FUNCS=
+	dnl PSI_FUNC(fn)
+	AC_DEFUN(PSI_FUNC, [
+		psi_symbol=$1
+		AC_CACHE_CHECK(for $1, psi_cv_fn_$1, [
+			psi_symbol_redirect=
+			AC_TRY_LINK_FUNC($1, [
+				psi_symbol_redirect=`$NM -g conftest$ac_exeext | $AWK -F" *|@" '/ U .*$1.*/ {print$[]3}'`
+			])
+			case "$psi_symbol_redirect" in
+			"_$psi_symbol"|"$psi_symbol"|"")
+				psi_cv_fn_$1=$psi_symbol
+				;;
+			*)
+				psi_cv_fn_$1=$psi_symbol_redirect
+				;;
+			esac
+		])
+		if test "$psi_cv_fn_$1" != "$psi_symbol"
+		then
+			PSI_FUNCS="{\"$psi_symbol\", (void *) $psi_symbol}, $PSI_FUNCS"
+		fi
+	])
+
+	PSI_MACROS=
+	dnl PSI_MACRO(macro, return type, decl args, call args, include)
+	AC_DEFUN(PSI_MACRO, [
+		AC_CHECK_DECL($1$3, [
+			PSI_MACROS="static $2 psi_macro_$1$3 {return $1$4;} $PSI_MACROS"
+			PSI_FUNCS="{\"$1\", (void *) psi_macro_$1}, $PSI_FUNCS"
+		], [], PSI_INCLUDES_DEFAULT($5))
 	])
 
 	AC_TYPE_INT8_T
@@ -255,6 +303,112 @@ if test "$PHP_PSI" != "no"; then
 	PSI_TYPE(double)
 	PSI_TYPE(void *)
 
+	dnl errno.h
+	PSI_MACRO(errno, int, [()], [], errno.h)
+	PSI_CONST(E2BIG, int, errno.h)
+	PSI_CONST(EACCES, int, errno.h)
+	PSI_CONST(EADDRINUSE, int, errno.h)
+	PSI_CONST(EADDRNOTAVAIL, int, errno.h)
+	PSI_CONST(EAFNOSUPPORT, int, errno.h)
+	PSI_CONST(EAGAIN, int, errno.h)
+	PSI_CONST(EALREADY, int, errno.h)
+	PSI_CONST(EBADF, int, errno.h)
+	PSI_CONST(EBADMSG, int, errno.h)
+	PSI_CONST(EBUSY, int, errno.h)
+	PSI_CONST(ECANCELED, int, errno.h)
+	PSI_CONST(ECHILD, int, errno.h)
+	PSI_CONST(ECONNABORTED, int, errno.h)
+	PSI_CONST(ECONNREFUSED, int, errno.h)
+	PSI_CONST(ECONNRESET, int, errno.h)
+	PSI_CONST(EDEADLK, int, errno.h)
+	PSI_CONST(EDESTADDRREQ, int, errno.h)
+	PSI_CONST(EDOM, int, errno.h)
+	PSI_CONST(EDQUOT, int, errno.h)
+	PSI_CONST(EEXIST, int, errno.h)
+	PSI_CONST(EFAULT, int, errno.h)
+	PSI_CONST(EFBIG, int, errno.h)
+	PSI_CONST(EHOSTUNREACH, int, errno.h)
+	PSI_CONST(EIDRM, int, errno.h)
+	PSI_CONST(EILSEQ, int, errno.h)
+	PSI_CONST(EINPROGRESS, int, errno.h)
+	PSI_CONST(EINTR, int, errno.h)
+	PSI_CONST(EINVAL, int, errno.h)
+	PSI_CONST(EIO, int, errno.h)
+	PSI_CONST(EISCONN, int, errno.h)
+	PSI_CONST(EISDIR, int, errno.h)
+	PSI_CONST(ELOOP, int, errno.h)
+	PSI_CONST(EMFILE, int, errno.h)
+	PSI_CONST(EMLINK, int, errno.h)
+	PSI_CONST(EMSGSIZE, int, errno.h)
+	PSI_CONST(EMULTIHOP, int, errno.h)
+	PSI_CONST(ENAMETOOLONG, int, errno.h)
+	PSI_CONST(ENETDOWN, int, errno.h)
+	PSI_CONST(ENETRESET, int, errno.h)
+	PSI_CONST(ENETUNREACH, int, errno.h)
+	PSI_CONST(ENFILE, int, errno.h)
+	PSI_CONST(ENOBUFS, int, errno.h)
+	PSI_CONST(ENODATA, int, errno.h)
+	PSI_CONST(ENODEV, int, errno.h)
+	PSI_CONST(ENOENT, int, errno.h)
+	PSI_CONST(ENOEXEC, int, errno.h)
+	PSI_CONST(ENOLCK, int, errno.h)
+	PSI_CONST(ENOLINK, int, errno.h)
+	PSI_CONST(ENOMEM, int, errno.h)
+	PSI_CONST(ENOMSG, int, errno.h)
+	PSI_CONST(ENOPROTOOPT, int, errno.h)
+	PSI_CONST(ENOSPC, int, errno.h)
+	PSI_CONST(ENOSR, int, errno.h)
+	PSI_CONST(ENOSTR, int, errno.h)
+	PSI_CONST(ENOSYS, int, errno.h)
+	PSI_CONST(ENOTCONN, int, errno.h)
+	PSI_CONST(ENOTDIR, int, errno.h)
+	PSI_CONST(ENOTEMPTY, int, errno.h)
+	PSI_CONST(ENOTRECOVERABLE, int, errno.h)
+	PSI_CONST(ENOTSOCK, int, errno.h)
+	PSI_CONST(ENOTSUP, int, errno.h)
+	PSI_CONST(ENOTTY, int, errno.h)
+	PSI_CONST(ENXIO, int, errno.h)
+	PSI_CONST(EOPNOTSUPP, int, errno.h)
+	PSI_CONST(EOVERFLOW, int, errno.h)
+	PSI_CONST(EOWNERDEAD, int, errno.h)
+	PSI_CONST(EPERM, int, errno.h)
+	PSI_CONST(EPIPE, int, errno.h)
+	PSI_CONST(EPROTO, int, errno.h)
+	PSI_CONST(EPROTONOSUPPORT, int, errno.h)
+	PSI_CONST(EPROTOTYPE, int, errno.h)
+	PSI_CONST(ERANGE, int, errno.h)
+	PSI_CONST(EROFS, int, errno.h)
+	PSI_CONST(ESPIPE, int, errno.h)
+	PSI_CONST(ESRCH, int, errno.h)
+	PSI_CONST(ESTALE, int, errno.h)
+	PSI_CONST(ETIME, int, errno.h)
+	PSI_CONST(ETIMEDOUT, int, errno.h)
+	PSI_CONST(ETXTBSY, int, errno.h)
+	PSI_CONST(EWOULDBLOCK, int, errno.h)
+	PSI_CONST(EXDEV, int, errno.h)
+
+	dnl glob.h
+	PSI_FUNC(glob)
+	PSI_FUNC(globfree)
+	PSI_STRUCT(glob_t, [
+		[gl_pathc], [gl_matchc],
+		[gl_pathv],
+		[gl_offs],
+		[gl_flags]], [
+		gl_pathc|gloffs) psi_member_type=uint ;;
+		gl_pathv)  psi_member_type="char**" ;;
+	], glob.h)
+	PSI_CONST(GLOB_APPEND, int, glob.h)
+	PSI_CONST(GLOB_DOOFFS, int, glob.h)
+	PSI_CONST(GLOB_ERR, int, glob.h)
+	PSI_CONST(GLOB_MARK, int, glob.h)
+	PSI_CONST(GLOB_NOCHECK, int, glob.h)
+	PSI_CONST(GLOB_NOESCAPE, int, glob.h)
+	PSI_CONST(GLOB_NOSORT, int, glob.h)
+	PSI_CONST(GLOB_ABORTED, int, glob.h)
+	PSI_CONST(GLOB_NOMATCH, int, glob.h)
+	PSI_CONST(GLOB_NOSPACE, int, glob.h)
+
 	dnl stdint.h
 	PSI_TYPE(int_least8_t, int)
 	PSI_TYPE(int_least16_t, int)
@@ -351,13 +505,100 @@ if test "$PHP_PSI" != "no"; then
 	PSI_CONST(P_tmpdir, string)
 	PSI_CONST(L_ctermid, int)
 	PSI_CONST(L_tmpnam, int)
+	PSI_FUNC(clearerr)
+	PSI_FUNC(ctermid)
+	PSI_FUNC(dprintf)
+	PSI_FUNC(fclose)
+	PSI_FUNC(fdopen)
+	PSI_FUNC(feof)
+	PSI_FUNC(ferror)
+	PSI_FUNC(fflush)
+	PSI_FUNC(fgetc)
+	PSI_FUNC(fgetpos)
+	PSI_FUNC(fgets)
+	PSI_FUNC(fileno)
+	PSI_FUNC(flockfile)
+	PSI_FUNC(fmemopen)
+	PSI_FUNC(fopen)
+	PSI_FUNC(fprintf)
+	PSI_FUNC(fputc)
+	PSI_FUNC(fputs)
+	PSI_FUNC(fread)
+	PSI_FUNC(freopen)
+	PSI_FUNC(fscanf)
+	PSI_FUNC(fseek)
+	PSI_FUNC(fseeko)
+	PSI_FUNC(fsetpos)
+	PSI_FUNC(ftell)
+	PSI_FUNC(ftello)
+	PSI_FUNC(ftrylockfile)
+	PSI_FUNC(funlockfile)
+	PSI_FUNC(fwrite)
+	PSI_FUNC(getc)
+	PSI_FUNC(getchar)
+	PSI_FUNC(getc_unlocked)
+	PSI_FUNC(getchar_unlocked)
+	PSI_FUNC(getdelim)
+	PSI_FUNC(getline)
+	PSI_FUNC(gets)
+	PSI_FUNC(open_memstream)
+	PSI_FUNC(pclose)
+	PSI_FUNC(perror)
+	PSI_FUNC(popen)
+	PSI_FUNC(printf)
+	PSI_FUNC(putc)
+	PSI_FUNC(putchar)
+	PSI_FUNC(putc_unlocked)
+	PSI_FUNC(putchar_unlocked)
+	PSI_FUNC(puts)
+	PSI_FUNC(remove)
+	PSI_FUNC(rename)
+	PSI_FUNC(renameat)
+	PSI_FUNC(rewind)
+	PSI_FUNC(scanf)
+	PSI_FUNC(setbuf)
+	PSI_FUNC(setvbuf)
+	PSI_FUNC(snprintf)
+	PSI_FUNC(sprintf)
+	PSI_FUNC(sscanf)
+	PSI_FUNC(tempnam)
+	PSI_FUNC(tmpfile)
+	PSI_FUNC(tmpnam)
+	PSI_FUNC(ungetc)
+	PSI_FUNC(vdprintf)
+	PSI_FUNC(vfprintf)
+	PSI_FUNC(vfscanf)
+	PSI_FUNC(vprintf)
+	PSI_FUNC(vscanf)
+	PSI_FUNC(vsnprintf)
+	PSI_FUNC(vsprintf)
+	PSI_FUNC(vsscanf)
+
 	dnl stdlib.h
+	PSI_FUNC(free)
 	PSI_CONST(EXIT_FAILURE, int)
 	PSI_CONST(EXIT_SUCCESS, int)
 	PSI_CONST(RAND_MAX, int)
 	PSI_CONST(MB_CUR_MAX, int)
+
 	dnl sys/stat.h
-	PSI_STRUCT(stat, [
+	PSI_FUNC(chmod)
+	PSI_FUNC(fchmod)
+	PSI_FUNC(fchmodat)
+	PSI_FUNC(fstat)
+	PSI_FUNC(fstatat)
+	PSI_FUNC(futimens)
+	PSI_FUNC(lstat)
+	PSI_FUNC(mkdir)
+	PSI_FUNC(mkdirat)
+	PSI_FUNC(mkfifo)
+	PSI_FUNC(mkfifoat)
+	PSI_FUNC(mknod)
+	PSI_FUNC(mknodat)
+	PSI_FUNC(stat)
+	PSI_FUNC(umask)
+	PSI_FUNC(utimensat)
+	PSI_STRUCT(struct stat, [
 		[st_dev],
 		[st_ino],
 		[st_mode],
@@ -374,7 +615,8 @@ if test "$PHP_PSI" != "no"; then
 		[st_blocks],
 		[st_flags],
 		[st_gen]], [
-		st_?tim*) psi_member_type="struct timespec" ;;
+		st_?tim) psi_member_type="struct timespec" ;;
+		st_*timespec) psi_member_type="struct timespec" ;;
 	], sys/stat.h)
 	PSI_CONST(S_IFMT, int, sys/stat.h)
 	PSI_CONST(S_IFBLK, int, sys/stat.h)
@@ -400,23 +642,42 @@ if test "$PHP_PSI" != "no"; then
 	PSI_CONST(S_ISGID, int, sys/stat.h)
 	PSI_CONST(UTIME_NOW, int, sys/stat.h)
 	PSI_CONST(UTIME_OMIT, int, sys/stat.h)
+	PSI_MACRO(S_ISBLK, int, [(mode_t m)], [(m)], sys/stat.h)
+	PSI_MACRO(S_ISCHR, int, [(mode_t m)], [(m)], sys/stat.h)
+	PSI_MACRO(S_ISDIR, int, [(mode_t m)], [(m)], sys/stat.h)
+	PSI_MACRO(S_ISFIFO, int, [(mode_t m)], [(m)], sys/stat.h)
+	PSI_MACRO(S_ISREG, int, [(mode_t m)], [(m)], sys/stat.h)
+	PSI_MACRO(S_ISLNK, int, [(mode_t m)], [(m)], sys/stat.h)
+	PSI_MACRO(S_ISSOCK, int, [(mode_t m)], [(m)], sys/stat.h)
+	PSI_MACRO(S_TYPEISMQ, int, [(mode_t m)], [(m)], sys/stat.h)
+	PSI_MACRO(S_TYPEISSEM, int, [(mode_t m)], [(m)], sys/stat.h)
+	PSI_MACRO(S_TYPEISSHM, int, [(mode_t m)], [(m)], sys/stat.h)
+	PSI_MACRO(S_TYPEISTMO, int, [(mode_t m)], [(m)], sys/stat.h)
 	dnl sys/time.h
-	PSI_STRUCT(timeval, [
+	PSI_STRUCT(struct timeval, [
 		[tv_sec],
 		[tv_usec]], [
 	], sys/time.h)
-	PSI_STRUCT(itimerval, [
+	PSI_STRUCT(struct itimerval, [
 		[it_interval],
 		[it_value]], [
 		it_*) psi_member_type="struct timeval" ;;
 	], sys/time.h)
-	PSI_STRUCT(timezone, [
+	PSI_STRUCT(struct timezone, [
 		[tz_minuteswest],
 		[tz_dsttime]], [
 	], sys/time.h)
 	PSI_CONST(ITIMER_REAL, int, sys/time.h)
 	PSI_CONST(ITIMER_VIRTUAL, int, sys/time.h)
 	PSI_CONST(ITIMER_PROF, int, sys/time.h)
+	dnl sys/times.h
+	PSI_FUNC(times)
+	PSI_STRUCT(struct tms, [
+		[tms_utime],
+		[tms_stime],
+		[tms_cutime],
+		[tms_cstime]], [
+	], sys/times.h)
 	dnl sys/types.h
 	PSI_TYPE(blkcnt_t, int)
 	PSI_TYPE(blksize_t, int)
@@ -438,8 +699,19 @@ if test "$PHP_PSI" != "no"; then
 	PSI_TYPE(time_t, int)
 	PSI_TYPE(timer_t, int)
 	PSI_TYPE(uid_t)
+	dnl sys/utsname.h
+	PSI_FUNC(uname)
+	PSI_STRUCT(struct utsname, [
+		[sysname],
+		[nodename],
+		[release],
+		[version],
+		[machine],
+		[domainname]], [
+		*) psi_member_type="char@<:@$psi_member_size@:>@" ;;
+	], sys/utsname.h)
 	dnl time.h
-	PSI_STRUCT(tm, [
+	PSI_STRUCT(struct tm, [
 		[tm_sec],
 		[tm_min],
 		[tm_hour],
@@ -450,7 +722,7 @@ if test "$PHP_PSI" != "no"; then
 		[tm_yday],
 		[tm_isdst]], [
 	], time.h)
-	PSI_STRUCT(timespec, [
+	PSI_STRUCT(struct timespec, [
 		[tv_sec],
 		[tv_nsec]], [
 	], time.h)
@@ -473,10 +745,14 @@ if test "$PHP_PSI" != "no"; then
 	])
 
 
+	AC_DEFINE_UNQUOTED(PHP_PSI_FUNCS, $PSI_FUNCS, Redirected functions)
+	AC_DEFINE_UNQUOTED(PHP_PSI_MACROS, $PSI_MACROS, Exported macros)
 	AC_DEFINE_UNQUOTED(PHP_PSI_TYPES, $PSI_TYPES, Predefined types)
 	AC_DEFINE_UNQUOTED(PHP_PSI_CONSTS, $PSI_CONSTS, Predefined constants)
 	AC_DEFINE_UNQUOTED(PHP_PSI_STRUCTS, $PSI_STRUCTS, Predefined structs)
 
+	AC_DEFINE_UNQUOTED(PHP_PSI_SHLIB_SUFFIX, $SHLIB_SUFFIX_NAME, DL suffix)
+
 	PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
 	PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)