Skip to content

ext/pcntl simplification. #13975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −57
Open

ext/pcntl simplification. #13975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ext/pcntl/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,5 @@ int main(void) {
AC_MSG_RESULT([no, cross-compiling])
])

AC_CHECK_TYPE([siginfo_t],[PCNTL_CFLAGS="-DHAVE_STRUCT_SIGINFO_T"],,[#include <signal.h>])

PHP_NEW_EXTENSION(pcntl, pcntl.c php_signal.c, $ext_shared, cli, $PCNTL_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
fi
33 changes: 8 additions & 25 deletions ext/pcntl/pcntl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,8 @@ ZEND_GET_MODULE(pcntl)

static void (*orig_interrupt_function)(zend_execute_data *execute_data);

#ifdef HAVE_STRUCT_SIGINFO_T
static void pcntl_signal_handler(int, siginfo_t*, void*);
static void pcntl_siginfo_to_zval(int, siginfo_t*, zval*);
#else
static void pcntl_signal_handler(int);
#endif
static void pcntl_signal_dispatch(void);
static void pcntl_signal_dispatch_tick_function(int dummy_int, void *dummy_pointer);
static void pcntl_interrupt_function(zend_execute_data *execute_data);
Expand Down Expand Up @@ -166,7 +162,7 @@ PHP_RSHUTDOWN_FUNCTION(pcntl)
/* Reset all signals to their default disposition */
ZEND_HASH_FOREACH_NUM_KEY_VAL(&PCNTL_G(php_signal_table), signo, handle) {
if (Z_TYPE_P(handle) != IS_LONG || Z_LVAL_P(handle) != (zend_long)SIG_DFL) {
php_signal(signo, (Sigfunc *)(zend_long)SIG_DFL, 0);
php_signal(signo, (Sigfunc *)(zend_long)SIG_DFL, false);
}
} ZEND_HASH_FOREACH_END();

Expand Down Expand Up @@ -662,7 +658,7 @@ PHP_FUNCTION(pcntl_signal)
zend_argument_value_error(2, "must be either SIG_DFL or SIG_IGN when an integer value is given");
RETURN_THROWS();
}
if (php_signal(signo, (Sigfunc *) Z_LVAL_P(handle), (int) restart_syscalls) == (void *)SIG_ERR) {
if (php_signal(signo, (Sigfunc *) Z_LVAL_P(handle), restart_syscalls) == (void *)SIG_ERR) {
PCNTL_G(last_error) = errno;
php_error_docref(NULL, E_WARNING, "Error assigning signal");
RETURN_FALSE;
Expand All @@ -682,7 +678,7 @@ PHP_FUNCTION(pcntl_signal)
handle = zend_hash_index_update(&PCNTL_G(php_signal_table), signo, handle);
Z_TRY_ADDREF_P(handle);

if (php_signal4(signo, pcntl_signal_handler, (int) restart_syscalls, 1) == (void *)SIG_ERR) {
if (php_signal4(signo, pcntl_signal_handler, restart_syscalls, true) == (void *)SIG_ERR) {
PCNTL_G(last_error) = errno;
php_error_docref(NULL, E_WARNING, "Error assigning signal");
RETURN_FALSE;
Expand Down Expand Up @@ -841,8 +837,7 @@ PHP_FUNCTION(pcntl_sigprocmask)
/* }}} */
#endif

#ifdef HAVE_STRUCT_SIGINFO_T
# ifdef HAVE_SIGWAITINFO
#ifdef HAVE_SIGWAITINFO

/* {{{ Synchronously wait for queued signals */
PHP_FUNCTION(pcntl_sigwaitinfo)
Expand Down Expand Up @@ -884,8 +879,9 @@ PHP_FUNCTION(pcntl_sigwaitinfo)
RETURN_LONG(signal_no);
}
/* }}} */
# endif
# ifdef HAVE_SIGTIMEDWAIT
#endif

#ifdef HAVE_SIGTIMEDWAIT
/* {{{ Wait for queued signals */
PHP_FUNCTION(pcntl_sigtimedwait)
{
Expand Down Expand Up @@ -947,7 +943,7 @@ PHP_FUNCTION(pcntl_sigtimedwait)
RETURN_LONG(signal_no);
}
/* }}} */
# endif
#endif

static void pcntl_siginfo_to_zval(int signo, siginfo_t *siginfo, zval *user_siginfo) /* {{{ */
{
Expand Down Expand Up @@ -1003,7 +999,6 @@ static void pcntl_siginfo_to_zval(int signo, siginfo_t *siginfo, zval *user_sigi
}
}
/* }}} */
#endif

#ifdef HAVE_GETPRIORITY
/* {{{ Get the priority of any process */
Expand Down Expand Up @@ -1145,11 +1140,7 @@ PHP_FUNCTION(pcntl_strerror)
/* }}} */

/* Our custom signal handler that calls the appropriate php_function */
#ifdef HAVE_STRUCT_SIGINFO_T
static void pcntl_signal_handler(int signo, siginfo_t *siginfo, void *context)
#else
static void pcntl_signal_handler(int signo)
#endif
{
struct php_pcntl_pending_signal *psig = PCNTL_G(spares);
if (!psig) {
Expand All @@ -1161,9 +1152,7 @@ static void pcntl_signal_handler(int signo)
psig->signo = signo;
psig->next = NULL;

#ifdef HAVE_STRUCT_SIGINFO_T
psig->siginfo = *siginfo;
#endif

/* the head check is important, as the tick handler cannot atomically clear both
* the head and tail */
Expand Down Expand Up @@ -1215,20 +1204,14 @@ void pcntl_signal_dispatch(void)
if (Z_TYPE_P(handle) != IS_LONG) {
ZVAL_NULL(&retval);
ZVAL_LONG(&params[0], queue->signo);
#ifdef HAVE_STRUCT_SIGINFO_T
array_init(&params[1]);
pcntl_siginfo_to_zval(queue->signo, &queue->siginfo, &params[1]);
#else
ZVAL_NULL(&params[1]);
#endif

/* Call php signal handler - Note that we do not report errors, and we ignore the return value */
/* FIXME: this is probably broken when multiple signals are handled in this while loop (retval) */
call_user_function(NULL, NULL, handle, &retval, 2, params);
zval_ptr_dtor(&retval);
#ifdef HAVE_STRUCT_SIGINFO_T
zval_ptr_dtor(&params[1]);
#endif
}
}

Expand Down
2 changes: 0 additions & 2 deletions ext/pcntl/pcntl.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,15 +932,13 @@ function pcntl_signal_dispatch(): bool {}
function pcntl_sigprocmask(int $mode, array $signals, &$old_signals = null): bool {}
#endif

#ifdef HAVE_STRUCT_SIGINFO_T
#if (defined(HAVE_SIGWAITINFO) && defined(HAVE_SIGTIMEDWAIT))
/** @param array $info */
function pcntl_sigwaitinfo(array $signals, &$info = []): int|false {}

/** @param array $info */
function pcntl_sigtimedwait(array $signals, &$info = [], int $seconds = 0, int $nanoseconds = 0): int|false {}
#endif
#endif

function pcntl_wifexited(int $status): bool {}

Expand Down
14 changes: 7 additions & 7 deletions ext/pcntl/pcntl_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions ext/pcntl/php_pcntl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ PHP_MINFO_FUNCTION(pcntl);
struct php_pcntl_pending_signal {
struct php_pcntl_pending_signal *next;
zend_long signo;
#ifdef HAVE_STRUCT_SIGINFO_T
siginfo_t siginfo;
#endif
};

ZEND_BEGIN_MODULE_GLOBALS(pcntl)
Expand Down
16 changes: 3 additions & 13 deletions ext/pcntl/php_signal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,18 @@

/* php_signal using sigaction is derived from Advanced Programming
* in the Unix Environment by W. Richard Stevens p 298. */
Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all)
Sigfunc *php_signal4(int signo, Sigfunc *func, bool restart, bool mask_all)
{
struct sigaction act,oact;

#ifdef HAVE_STRUCT_SIGINFO_T
act.sa_sigaction = func;
#else
act.sa_handler = func;
#endif
if (mask_all) {
sigfillset(&act.sa_mask);
} else {
sigemptyset(&act.sa_mask);
}
act.sa_flags = SA_ONSTACK;
#ifdef HAVE_STRUCT_SIGINFO_T
act.sa_flags |= SA_SIGINFO;
#endif
if (!restart) {
#ifdef SA_INTERRUPT
act.sa_flags |= SA_INTERRUPT; /* SunOS */
Expand All @@ -50,14 +44,10 @@ Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all)
}
zend_sigaction(signo, &act, &oact);

#ifdef HAVE_STRUCT_SIGINFO_T
return oact.sa_sigaction;
#else
return oact.sa_handler;
#endif
}

Sigfunc *php_signal(int signo, Sigfunc *func, int restart)
Sigfunc *php_signal(int signo, Sigfunc *func, bool restart)
{
return php_signal4(signo, func, restart, 0);
return php_signal4(signo, func, restart, false);
}
9 changes: 3 additions & 6 deletions ext/pcntl/php_signal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,9 @@
#ifndef PHP_SIGNAL_H
#define PHP_SIGNAL_H

#ifdef HAVE_STRUCT_SIGINFO_T
typedef void Sigfunc(int, siginfo_t*, void*);
#else
typedef void Sigfunc(int);
#endif
Sigfunc *php_signal(int signo, Sigfunc *func, int restart);
Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all);

Sigfunc *php_signal(int signo, Sigfunc *func, bool restart);
Sigfunc *php_signal4(int signo, Sigfunc *func, bool restart, bool mask_all);

#endif
Loading