jani Tue Aug 5 15:12:11 2008 UTC
Modified files:
/php-src/ext/pcntl config.m4 pcntl.c php_pcntl.h php_signal.c
/php-src/ext/pcntl/tests 001.phpt 002.phpt
pcntl_signal_dispatch.phpt
signal_closure_handler.phpt
Log:
- Portability fix. (si_fd seems to be linux only thing)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/config.m4?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/pcntl/config.m4
diff -u php-src/ext/pcntl/config.m4:1.11 php-src/ext/pcntl/config.m4:1.12
--- php-src/ext/pcntl/config.m4:1.11 Tue Jul 29 16:56:26 2008
+++ php-src/ext/pcntl/config.m4 Tue Aug 5 15:12:10 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.11 2008/07/29 16:56:26 lbarnaud Exp $
+dnl $Id: config.m4,v 1.12 2008/08/05 15:12:10 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.65&r2=1.66&diff_format=u
Index: php-src/ext/pcntl/pcntl.c
diff -u php-src/ext/pcntl/pcntl.c:1.65 php-src/ext/pcntl/pcntl.c:1.66
--- php-src/ext/pcntl/pcntl.c:1.65 Sat Aug 2 04:40:44 2008
+++ php-src/ext/pcntl/pcntl.c Tue Aug 5 15:12:10 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pcntl.c,v 1.65 2008/08/02 04:40:44 felipe Exp $ */
+/* $Id: pcntl.c,v 1.66 2008/08/05 15:12:10 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_ascii_assoc_long_ex(user_siginfo,
"status", sizeof("status"), siginfo.si_status);
-#ifdef si_utime
+# ifdef si_utime
add_ascii_assoc_double_ex(user_siginfo,
"utime", sizeof("utime"), siginfo.si_utime);
-#endif
-#ifdef si_stime
+# endif
+# ifdef si_stime
add_ascii_assoc_double_ex(user_siginfo,
"stime", sizeof("stime"), siginfo.si_stime);
-#endif
+# endif
add_ascii_assoc_long_ex(user_siginfo, "pid",
sizeof("pid"), siginfo.si_pid);
add_ascii_assoc_long_ex(user_siginfo, "uid",
sizeof("uid"), siginfo.si_uid);
break;
@@ -883,7 +886,9 @@
#ifdef SIGPOLL
case SIGPOLL:
add_ascii_assoc_long_ex(user_siginfo, "band",
sizeof("band"), siginfo.si_band);
+#ifdef si_fd
add_ascii_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.26&r2=1.27&diff_format=u
Index: php-src/ext/pcntl/php_pcntl.h
diff -u php-src/ext/pcntl/php_pcntl.h:1.26 php-src/ext/pcntl/php_pcntl.h:1.27
--- php-src/ext/pcntl/php_pcntl.h:1.26 Tue Jul 29 16:56:26 2008
+++ php-src/ext/pcntl/php_pcntl.h Tue Aug 5 15:12:10 2008
@@ -16,14 +16,11 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcntl.h,v 1.26 2008/07/29 16:56:26 lbarnaud Exp $ */
+/* $Id: php_pcntl.h,v 1.27 2008/08/05 15:12:10 jani Exp $ */
#ifndef PHP_PCNTL_H
#define PHP_PCNTL_H
-#include <sys/wait.h>
-#include "php_signal.h"
-#include "php_ticks.h"
extern zend_module_entry pcntl_module_entry;
#define phpext_pcntl_ptr &pcntl_module_entry
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/php_signal.c?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/pcntl/php_signal.c
diff -u php-src/ext/pcntl/php_signal.c:1.12 php-src/ext/pcntl/php_signal.c:1.13
--- php-src/ext/pcntl/php_signal.c:1.12 Mon Dec 31 07:12:12 2007
+++ php-src/ext/pcntl/php_signal.c Tue Aug 5 15:12:10 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_signal.c,v 1.12 2007/12/31 07:12:12 sebastian Exp $ */
+/* $Id: php_signal.c,v 1.13 2008/08/05 15:12:10 jani Exp $ */
#include "php_signal.h"
@@ -24,7 +24,6 @@
* in the Unix Environment by W. Richard Stevens p 298. */
Sigfunc *php_signal(int signo, Sigfunc *func, int restart)
{
-
struct sigaction act,oact;
act.sa_handler = func;
sigemptyset(&act.sa_mask);
@@ -44,3 +43,11 @@
return oact.sa_handler;
}
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/tests/001.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/pcntl/tests/001.phpt
diff -u php-src/ext/pcntl/tests/001.phpt:1.8
php-src/ext/pcntl/tests/001.phpt:1.9
--- php-src/ext/pcntl/tests/001.phpt:1.8 Thu Dec 16 12:34:31 2004
+++ php-src/ext/pcntl/tests/001.phpt Tue Aug 5 15:12:11 2008
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
if (!extension_loaded("pcntl")) print "skip";
- if (!function_exists("posix_kill")) print "skip posix_kill() not
available";
+ elseif (!function_exists("posix_kill")) print "skip posix_kill() not
available";
?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/tests/002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/pcntl/tests/002.phpt
diff -u php-src/ext/pcntl/tests/002.phpt:1.1
php-src/ext/pcntl/tests/002.phpt:1.2
--- php-src/ext/pcntl/tests/002.phpt:1.1 Tue Jul 29 16:56:26 2008
+++ php-src/ext/pcntl/tests/002.phpt Tue Aug 5 15:12:11 2008
@@ -2,8 +2,8 @@
pcntl: pcntl_sigprocmask(), pcntl_sigwaitinfo(), pcntl_sigtimedwait()
--SKIPIF--
<?php
-if (!extension_loaded('pcntl')) die('skip pcntl extension not available');
-if (!extension_loaded('posix')) die('skip posix extension not available');
+ if (!extension_loaded('pcntl')) die('skip pcntl extension not
available');
+ elseif (!extension_loaded('posix')) die('skip posix extension not
available');
?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/tests/pcntl_signal_dispatch.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/pcntl/tests/pcntl_signal_dispatch.phpt
diff -u php-src/ext/pcntl/tests/pcntl_signal_dispatch.phpt:1.1
php-src/ext/pcntl/tests/pcntl_signal_dispatch.phpt:1.2
--- php-src/ext/pcntl/tests/pcntl_signal_dispatch.phpt:1.1 Tue Jul 29
16:46:03 2008
+++ php-src/ext/pcntl/tests/pcntl_signal_dispatch.phpt Tue Aug 5 15:12:11 2008
@@ -3,10 +3,10 @@
--SKIPIF--
<?php
if (!extension_loaded("pcntl")) print "skip";
- if (!function_exists("pcntl_signal")) print "skip pcntl_signal() not
available";
- if (!function_exists("pcntl_signal_dispatch")) print "skip
pcntl_signal_dispatch() not available";
- if (!function_exists("posix_kill")) print "skip posix_kill() not
available";
- if (!function_exists("posix_getpid")) print "skip posix_getpid() not
available";
+ elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal()
not available";
+ elseif (!function_exists("pcntl_signal_dispatch")) print "skip
pcntl_signal_dispatch() not available";
+ elseif (!function_exists("posix_kill")) print "skip posix_kill() not
available";
+ elseif (!function_exists("posix_getpid")) print "skip posix_getpid()
not available";
?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/tests/signal_closure_handler.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/pcntl/tests/signal_closure_handler.phpt
diff -u php-src/ext/pcntl/tests/signal_closure_handler.phpt:1.1
php-src/ext/pcntl/tests/signal_closure_handler.phpt:1.2
--- php-src/ext/pcntl/tests/signal_closure_handler.phpt:1.1 Thu Jul 17
09:52:51 2008
+++ php-src/ext/pcntl/tests/signal_closure_handler.phpt Tue Aug 5 15:12:11 2008
@@ -3,9 +3,9 @@
--SKIPIF--
<?php
if (!extension_loaded("pcntl")) print "skip";
- if (!function_exists("pcntl_signal")) print "skip pcntl_signal() not
available";
- if (!function_exists("posix_kill")) print "skip posix_kill() not
available";
- if (!function_exists("posix_getpid")) print "skip posix_getpid() not
available";
+ elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal()
not available";
+ elseif (!function_exists("posix_kill")) print "skip posix_kill() not
available";
+ elseif (!function_exists("posix_getpid")) print "skip posix_getpid()
not available";
?>
--FILE--
<?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
