diff options
Diffstat (limited to 'Zend/zend_signal.h')
| -rw-r--r-- | Zend/zend_signal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h index 2f33ccb5b7..e70e409b4b 100644 --- a/Zend/zend_signal.h +++ b/Zend/zend_signal.h @@ -55,10 +55,9 @@ typedef struct _zend_signal_queue_t { /* Signal Globals */ typedef struct _zend_signal_globals_t { int depth; - int blocked; /* 0==TRUE, -1==FALSE */ + int blocked; /* 1==TRUE, 0==FALSE */ int running; /* in signal handler execution */ int active; /* internal signal handling is enabled */ - int initialized; /* memory initialized */ zend_bool check; /* check for replaced handlers on shutdown */ zend_signal_entry_t handlers[NSIG]; zend_signal_queue_t pstorage[ZEND_SIGNAL_QUEUE_SIZE], *phead, *ptail, *pavail; /* pending queue */ @@ -70,12 +69,12 @@ BEGIN_EXTERN_C() ZEND_API extern int zend_signal_globals_id; END_EXTERN_C() # define ZEND_SIGNAL_BLOCK_INTERRUPUTIONS() if (EXPECTED(zend_signal_globals_id)) { SIGG(depth)++; } -# define ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() if (EXPECTED(zend_signal_globals_id) && UNEXPECTED((--SIGG(depth))==SIGG(blocked))) { zend_signal_handler_unblock(); } +# define ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() if (EXPECTED(zend_signal_globals_id) && UNEXPECTED(((SIGG(depth)--) == SIGG(blocked)))) { zend_signal_handler_unblock(); } #else /* ZTS */ # define SIGG(v) (zend_signal_globals.v) extern ZEND_API zend_signal_globals_t zend_signal_globals; # define ZEND_SIGNAL_BLOCK_INTERRUPUTIONS() SIGG(depth)++; -# define ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() if (UNEXPECTED((--SIGG(depth))==SIGG(blocked))) { zend_signal_handler_unblock(); } +# define ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() if (((SIGG(depth)--) == SIGG(blocked))) { zend_signal_handler_unblock(); } #endif /* not ZTS */ # define SIGNAL_BEGIN_CRITICAL() sigset_t oldmask; \ @@ -87,6 +86,7 @@ ZEND_API void zend_signal_handler_unblock(); void zend_signal_activate(void); void zend_signal_deactivate(void); void zend_signal_startup(); +void zend_signal_init(); void zend_signal_shutdown(void); ZEND_API int zend_signal(int signo, void (*handler)(int)); ZEND_API int zend_sigaction(int signo, const struct sigaction *act, struct sigaction *oldact); |