diff options
Diffstat (limited to 'sapi/phpdbg/phpdbg_sigio_win32.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_sigio_win32.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/sapi/phpdbg/phpdbg_sigio_win32.c b/sapi/phpdbg/phpdbg_sigio_win32.c index 158e034872..7b99a66478 100644 --- a/sapi/phpdbg/phpdbg_sigio_win32.c +++ b/sapi/phpdbg/phpdbg_sigio_win32.c @@ -31,31 +31,28 @@ SigIoWatcherThread(VOID *p) { zend_uchar sig; struct win32_sigio_watcher_data *swd = (struct win32_sigio_watcher_data *)p; -#ifdef ZTS - void ***tsrm_ls = swd->tsrm_ls; -#endif top: - (void)phpdbg_consume_bytes(swd->fd, &sig, 1, -1 TSRMLS_CC); + (void)phpdbg_consume_bytes(swd->fd, &sig, 1, -1); if (3 == sig) { /* XXX completely not sure it is done right here */ - if (PHPDBG_G(flags) & PHPDBG_IS_INTERACTIVE) { + if (*swd->flags & PHPDBG_IS_INTERACTIVE) { if (raise(sig)) { goto top; } } - if (PHPDBG_G(flags) & PHPDBG_IS_SIGNALED) { - phpdbg_set_sigsafe_mem(&sig TSRMLS_CC); + if (*swd->flags & PHPDBG_IS_SIGNALED) { + phpdbg_set_sigsafe_mem(&sig); zend_try { - phpdbg_force_interruption(TSRMLS_C); + phpdbg_force_interruption(); } zend_end_try(); - phpdbg_clear_sigsafe_mem(TSRMLS_C); + phpdbg_clear_sigsafe_mem(); goto end; } - if (!(PHPDBG_G(flags) & PHPDBG_IS_INTERACTIVE)) { - PHPDBG_G(flags) |= PHPDBG_IS_SIGNALED; + if (!(*swd->flags & PHPDBG_IS_INTERACTIVE)) { + *swd->flags |= PHPDBG_IS_SIGNALED; } end: /* XXX set signaled flag to the caller thread, question is - whether it's needed */ @@ -72,11 +69,10 @@ session. */ void sigio_watcher_start(void) { - TSRMLS_FETCH(); PHPDBG_G(swd).fd = PHPDBG_G(io)[PHPDBG_STDIN].fd; #ifdef ZTS - PHPDBG_G(swd).tsrm_ls = tsrm_ls; + PHPDBG_G(swd).flags = &PHPDBG_G(flags); #endif PHPDBG_G(sigio_watcher_thread) = CreateThread( @@ -92,7 +88,6 @@ void sigio_watcher_stop(void) { DWORD waited; - TSRMLS_FETCH(); if (INVALID_HANDLE_VALUE == PHPDBG_G(sigio_watcher_thread)) { /* it probably did bail out already */ |