mirror of
https://github.com/php/php-src.git
synced 2026-03-27 09:42:22 +01:00
d11734b4b0
TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current patch suffers from bugs which are hard to find, but prevent it to be worky with apache. What is done here is mainly uses the idea from the RFC patch, but - __thread variable is removed - offset math and declarations are removed - extra macros and definitions are removed What is done merely is - use an inline function to access the tsrm cache. The function uses the portable tsrm_tls_get macro which is cheap - all the TSRM_* macros are set to placebo. Thus this opens the way remove them later Except that, the logic is old. TSRMLS_FETCH will have to be done once per thread, then tsrm_get_ls_cache() can be used. Things seeming to be worky are cli, cli server and apache. I also tried to enable bz2 shared and it has worked out of the box. The change is yet minimal diffing to the current master bus is a worky start, IMHO. Though will have to recheck the other previously done SAPIs - embed and cgi. The offsets can be added to the tsrm_resource_type struct, then it'll not be needed to declare them in the userspace. Even the "done" member type can be changed to int16 or smaller, then adding the offset as int16 will not change the struct size. As well on the todo might be removing the hashed storage, thread_id != thread_id and linked list logic in favour of the explicit TLS operations.
74 lines
2.3 KiB
C
74 lines
2.3 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| PHP Version 7 |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 1997-2014 The PHP Group |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Author: Edin Kadribasic <edink@php.net> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
/* $Id$ */
|
|
|
|
#ifndef _PHP_EMBED_H_
|
|
#define _PHP_EMBED_H_
|
|
|
|
#include <main/php.h>
|
|
#include <main/SAPI.h>
|
|
#include <main/php_main.h>
|
|
#include <main/php_variables.h>
|
|
#include <main/php_ini.h>
|
|
#include <zend_ini.h>
|
|
|
|
#ifdef ZTS
|
|
#define PTSRMLS_D void ****ptsrm_ls
|
|
#define PTSRMLS_DC , PTSRMLS_D
|
|
#define PTSRMLS_C &tsrm_ls
|
|
#define PTSRMLS_CC , PTSRMLS_C
|
|
|
|
#define PHP_EMBED_START_BLOCK(x,y) { \
|
|
void ***tsrm_ls; \
|
|
php_embed_init(x, y PTSRMLS_CC); \
|
|
zend_first_try {
|
|
|
|
#else
|
|
#define PTSRMLS_D
|
|
#define PTSRMLS_DC
|
|
#define PTSRMLS_C
|
|
#define PTSRMLS_CC
|
|
|
|
#define PHP_EMBED_START_BLOCK(x,y) { \
|
|
php_embed_init(x, y); \
|
|
zend_first_try {
|
|
|
|
#endif
|
|
|
|
#define PHP_EMBED_END_BLOCK() \
|
|
} zend_catch { \
|
|
/* int exit_status = EG(exit_status); */ \
|
|
} zend_end_try(); \
|
|
php_embed_shutdown(TSRMLS_C); \
|
|
}
|
|
|
|
#ifndef PHP_WIN32
|
|
#define EMBED_SAPI_API SAPI_API
|
|
#else
|
|
#define EMBED_SAPI_API
|
|
#endif
|
|
|
|
BEGIN_EXTERN_C()
|
|
EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC);
|
|
EMBED_SAPI_API void php_embed_shutdown(TSRMLS_D);
|
|
extern EMBED_SAPI_API sapi_module_struct php_embed_module;
|
|
END_EXTERN_C()
|
|
|
|
|
|
#endif /* _PHP_EMBED_H_ */
|