janiTue Aug 5 15:12:19 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcntl config.m4 pcntl.c php_pcntl.h php_signal.c
/php-src/ext/pcntl/tests001.phpt 002.phpt
pcntl_signal_dispatch.phpt
signal_closure_handler.phpt
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/config.m4?r1=1.10.8.1r2=1.10.8.2diff_format=u
Index: php-src/ext/pcntl/config.m4
diff -u php-src/ext/pcntl/config.m4:1.10.8.1
php-src/ext/pcntl/config.m4:1.10.8.2
--- php-src/ext/pcntl/config.m4:1.10.8.1Tue Jul 29 16:59:10 2008
+++ php-src/ext/pcntl/config.m4 Tue Aug 5 15:12:19 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.10.8.1 2008/07/29 16:59:10 lbarnaud Exp $
+dnl $Id: config.m4,v 1.10.8.2 2008/08/05 15:12:19 jani Exp $
dnl
dnl Process Control (pcntl) extentsion --EXPERIMENTAL--
@@ -9,11 +9,9 @@
[ --enable-pcntl Enable experimental pcntl support (CLI/CGI only)])
if test $PHP_PCNTL != no; then
-
AC_CHECK_FUNCS(fork, [ AC_DEFINE(HAVE_FORK,1,[ ]) ], [ AC_MSG_ERROR(pcntl:
fork() not supported by this platform) ])
AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [
AC_MSG_ERROR(pcntl: fork() not supported by this platform) ])
AC_CHECK_FUNCS(sigaction, [ AC_DEFINE(HAVE_SIGACTION,1,[ ]) ], [
AC_MSG_ERROR(pcntl: sigaction() not supported by this platform) ])
- AC_CHECK_FUNCS(getpriority setpriority wait3 sigprocmask sigwaitinfo
sigtimedwait)
-
+ AC_CHECK_FUNCS([getpriority setpriority wait3 sigprocmask sigwaitinfo
sigtimedwait])
PHP_NEW_EXTENSION(pcntl, pcntl.c php_signal.c, $ext_shared, cli)
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/pcntl.c?r1=1.48.2.2.2.4.2.8r2=1.48.2.2.2.4.2.9diff_format=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.8
php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.9
--- php-src/ext/pcntl/pcntl.c:1.48.2.2.2.4.2.8 Sat Aug 2 04:46:06 2008
+++ php-src/ext/pcntl/pcntl.c Tue Aug 5 15:12:19 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pcntl.c,v 1.48.2.2.2.4.2.8 2008/08/02 04:46:06 felipe Exp $ */
+/* $Id: pcntl.c,v 1.48.2.2.2.4.2.9 2008/08/05 15:12:19 jani Exp $ */
#define PCNTL_DEBUG 0
@@ -35,8 +35,11 @@
#include php_ini.h
#include ext/standard/info.h
#include php_pcntl.h
+#include php_signal.h
+#include php_ticks.h
#if HAVE_GETPRIORITY || HAVE_SETPRIORITY || HAVE_WAIT3
+#include sys/wait.h
#include sys/time.h
#include sys/resource.h
#endif
@@ -864,12 +867,12 @@
#ifdef SIGCHLD
case SIGCHLD:
add_assoc_long_ex(user_siginfo, status,
sizeof(status), siginfo.si_status);
-#ifdef si_utime
+# ifdef si_utime
add_assoc_double_ex(user_siginfo, utime,
sizeof(utime), siginfo.si_utime);
-#endif
-#ifdef si_stime
+# endif
+# ifdef si_stime
add_assoc_double_ex(user_siginfo, stime,
sizeof(stime), siginfo.si_stime);
-#endif
+# endif
add_assoc_long_ex(user_siginfo, pid,
sizeof(pid),siginfo.si_pid);
add_assoc_long_ex(user_siginfo, uid,
sizeof(uid),siginfo.si_uid);
break;
@@ -883,7 +886,9 @@
#ifdef SIGPOLL
case SIGPOLL:
add_assoc_long_ex(user_siginfo, band,
sizeof(band), siginfo.si_band);
+# ifdef si_fd
add_assoc_long_ex(user_siginfo, fd,
sizeof(fd), siginfo.si_fd);
+# endif
break;
#endif
EMPTY_SWITCH_DEFAULT_CASE();
@@ -894,7 +899,7 @@
}
/* }}} */
-/* {{{ proto int sigwaitinfo(array set[, array siginfo])
+/* {{{ proto int pcnlt_sigwaitinfo(array set[, array siginfo])
Synchronously wait for queued signals */
PHP_FUNCTION(pcntl_sigwaitinfo)
{
@@ -902,7 +907,7 @@
}
/* }}} */
-/* {{{ proto int sigtimedwait(array set[, array siginfo[, int seconds[, int
nanoseconds]]])
+/* {{{ proto int pcntl_sigtimedwait(array set[, array siginfo[, int seconds[,
int nanoseconds]]])
Wait for queued signals */
PHP_FUNCTION(pcntl_sigtimedwait)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/php_pcntl.h?r1=1.20.2.1.2.1.2.4r2=1.20.2.1.2.1.2.5diff_format=u
Index: php-src/ext/pcntl/php_pcntl.h
diff -u php-src/ext/pcntl/php_pcntl.h:1.20.2.1.2.1.2.4
php-src/ext/pcntl/php_pcntl.h:1.20.2.1.2.1.2.5
--- php-src/ext/pcntl/php_pcntl.h:1.20.2.1.2.1.2.4 Tue Jul 29 16:59:10 2008
+++ php-src/ext/pcntl/php_pcntl.h Tue Aug 5 15:12:19 2008
@@ -16,14 +16,11 @@
+--+
*/
-/* $Id: php_pcntl.h,v 1.20.2.1.2.1.2.4 2008/07/29 16:59:10 lbarnaud Exp $ */
+/* $Id: php_pcntl.h,v 1.20.2.1.2.1.2.5 2008/08/05 15:12:19 jani Exp $ */
#ifndef PHP_PCNTL_H
#define PHP_PCNTL_H
-#include
