com php-src: Fix ZTS issue regarding new Windows CTRL handling API: sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt w in32/signal.c
| From: | Christoph Michael Becker | Date: | Sat, 01 Jun 2019 07:35:47 +0000 |
| Subject: | com php-src: Fix ZTS issue regarding new Windows CTRL handling API: sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt w in32/signal.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106503@lists.php.net to get a copy of this message | ||
Commit: 637d8677b3b5f523265ae4c9adc27344c1c70ed0
Author: Christoph M. Becker <cmbecker69@gmx.de> Sat, 1 Jun 2019 09:08:51 +0200
Parents: d669d55fe1aa5b94231fd2923748fd7bd26b1eb5
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=637d8677b3b5f523265ae4c9adc27344c1c70ed0
Log:
Fix ZTS issue regarding new Windows CTRL handling API
php_win32_signal_system_ctrl_handler() is called from a kernel thread,
so the former initialization of
vm_interrupt_flag has no effect,
since it is defined as thread-local. This is, however, not necessary,
since the CTRL signal handling is supposed to work only for the main
thread anyway. We therefore change vm_interrupt_flag and the related
variables to true globals.
This also allows us to unmark the respective test case as XFAIL.
Furthermore, vm_interrupt_flag is declared as zend_bool *, so we
better treat it such.
Changed paths:
M sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt
M win32/signal.c
Diff:
diff --git a/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt
b/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt
index 083ed8f..a5cb3ef 100644
--- a/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt
+++ b/sapi/cli/tests/sapi_windows_set_ctrl_handler.phpt
@@ -8,8 +8,6 @@ include "skipinf.inc";
if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
die("skip this test is for Windows platforms only");
?>
---XFAIL--
-Fails on AppVeyor
--FILE--
<?php
diff --git a/win32/signal.c b/win32/signal.c
index 586e125..bdfd703 100644
--- a/win32/signal.c
+++ b/win32/signal.c
@@ -21,9 +21,10 @@
#include "win32/console.h"
-ZEND_TLS zval ctrl_handler;
-ZEND_TLS DWORD ctrl_evt = (DWORD)-1;
-ZEND_TLS zend_bool *vm_interrupt_flag = NULL;
+/* true globals; only used from main thread and from kernel callback */
+static zval ctrl_handler;
+static DWORD ctrl_evt = (DWORD)-1;
+static zend_bool *vm_interrupt_flag = NULL;
static void (*orig_interrupt_function)(zend_execute_data *execute_data);
@@ -78,7 +79,7 @@ static BOOL WINAPI php_win32_signal_system_ctrl_handler(DWORD evt)
return FALSE;
}
- (void)InterlockedExchange((LONG*)vm_interrupt_flag, 1);
+ (void)InterlockedExchange8(vm_interrupt_flag, 1);
ctrl_evt = evt;