com php-src: fix for --enable-zend-signals and ZTS temporary fix to make queue size bigger in zend_signal while I work on it : Zend/zend_signal.c
Zend/zend_signal.h
| From: | Joe Watkins | Date: | Tue, 01 Sep 2015 15:51:40 +0000 |
| Subject: | com php-src: fix for --enable-zend-signals and ZTS temporary fix to make queue size bigger in zend_signal while I work on it : Zend/zend_signal.c Zend/zend_signal.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88817@lists.php.net to get a copy of this message | ||
Commit: a8a3b02fd9bbe65fe0ed5342423d2e1f62f7e171
Author: Joe Watkins <krakjoe@php.net> Tue, 1 Sep 2015 16:51:40 +0100
Parents: ccba374faf198db2c6cb0195b733387b6a27fbad
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a8a3b02fd9bbe65fe0ed5342423d2e1f62f7e171
Log:
fix for --enable-zend-signals and ZTS
temporary fix to make queue size bigger in zend_signal while I work on it
Changed paths:
M Zend/zend_signal.c
M Zend/zend_signal.h
Diff:
diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
index 1280a70..b4f5741 100644
--- a/Zend/zend_signal.c
+++ b/Zend/zend_signal.c
@@ -75,6 +75,10 @@ void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context)
int errno_save = errno;
zend_signal_queue_t *queue, *qtmp;
+#ifdef ZTS
+ ZEND_TSRMLS_CACHE_UPDATE();
+#endif
+
if (EXPECTED(SIGG(active))) {
if (UNEXPECTED(SIGG(depth) == 0)) { /* try to handle signal */
if (UNEXPECTED(SIGG(blocked))) {
diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h
index e70e409..0c32db5 100644
--- a/Zend/zend_signal.h
+++ b/Zend/zend_signal.h
@@ -32,7 +32,7 @@
#endif
#ifndef ZEND_SIGNAL_QUEUE_SIZE
-#define ZEND_SIGNAL_QUEUE_SIZE 32
+#define ZEND_SIGNAL_QUEUE_SIZE 64
#endif
/* Signal structs */