1999-09-06 03:37:24 +08:00
|
|
|
/*
|
|
|
|
|
+----------------------------------------------------------------------+
|
|
|
|
|
| Zend Engine |
|
|
|
|
|
+----------------------------------------------------------------------+
|
2019-01-30 17:23:29 +08:00
|
|
|
| Copyright (c) Zend Technologies Ltd. (http://www.zend.com) |
|
1999-09-06 03:37:24 +08:00
|
|
|
+----------------------------------------------------------------------+
|
2001-12-11 23:16:21 +08:00
|
|
|
| This source file is subject to version 2.00 of the Zend license, |
|
2006-05-10 07:53:23 +08:00
|
|
|
| that is bundled with this package in the file LICENSE, and is |
|
2003-06-11 04:04:29 +08:00
|
|
|
| available through the world-wide-web at the following url: |
|
2001-12-11 23:16:21 +08:00
|
|
|
| http://www.zend.com/license/2_00.txt. |
|
1999-09-06 03:37:24 +08:00
|
|
|
| If you did not receive a copy of the Zend license and are unable to |
|
|
|
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
|
|
|
| license@zend.com so we can mail you a copy immediately. |
|
|
|
|
|
+----------------------------------------------------------------------+
|
2018-11-01 23:20:07 +08:00
|
|
|
| Authors: Andi Gutmans <andi@php.net> |
|
|
|
|
|
| Zeev Suraski <zeev@php.net> |
|
1999-09-06 03:37:24 +08:00
|
|
|
+----------------------------------------------------------------------+
|
|
|
|
|
*/
|
|
|
|
|
|
2000-07-03 07:54:19 +08:00
|
|
|
#ifndef ZEND_GLOBALS_MACROS_H
|
|
|
|
|
#define ZEND_GLOBALS_MACROS_H
|
1999-09-06 03:37:24 +08:00
|
|
|
|
|
|
|
|
typedef struct _zend_compiler_globals zend_compiler_globals;
|
|
|
|
|
typedef struct _zend_executor_globals zend_executor_globals;
|
2008-03-17 05:06:55 +08:00
|
|
|
typedef struct _zend_php_scanner_globals zend_php_scanner_globals;
|
|
|
|
|
typedef struct _zend_ini_scanner_globals zend_ini_scanner_globals;
|
1999-09-06 03:37:24 +08:00
|
|
|
|
2007-02-16 16:54:17 +08:00
|
|
|
BEGIN_EXTERN_C()
|
|
|
|
|
|
1999-09-06 03:37:24 +08:00
|
|
|
/* Compiler */
|
|
|
|
|
#ifdef ZTS
|
2019-03-14 08:01:01 +08:00
|
|
|
# define CG(v) ZEND_TSRMG_FAST(compiler_globals_offset, zend_compiler_globals *, v)
|
1999-09-06 03:37:24 +08:00
|
|
|
#else
|
|
|
|
|
# define CG(v) (compiler_globals.v)
|
|
|
|
|
extern ZEND_API struct _zend_compiler_globals compiler_globals;
|
|
|
|
|
#endif
|
2015-01-23 06:04:49 +08:00
|
|
|
ZEND_API int zendparse(void);
|
1999-09-06 03:37:24 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Executor */
|
|
|
|
|
#ifdef ZTS
|
2019-03-14 08:01:01 +08:00
|
|
|
# define EG(v) ZEND_TSRMG_FAST(executor_globals_offset, zend_executor_globals *, v)
|
1999-09-06 03:37:24 +08:00
|
|
|
#else
|
|
|
|
|
# define EG(v) (executor_globals.v)
|
|
|
|
|
extern ZEND_API zend_executor_globals executor_globals;
|
|
|
|
|
#endif
|
|
|
|
|
|
2001-08-06 21:48:51 +08:00
|
|
|
/* Language Scanner */
|
|
|
|
|
#ifdef ZTS
|
2019-03-14 08:01:01 +08:00
|
|
|
# define LANG_SCNG(v) ZEND_TSRMG_FAST(language_scanner_globals_offset, zend_php_scanner_globals *, v)
|
reworked the patch, less new stuff but worky
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.
2014-09-26 00:48:27 +08:00
|
|
|
extern ZEND_API ts_rsrc_id language_scanner_globals_id;
|
2019-03-14 08:01:01 +08:00
|
|
|
extern ZEND_API size_t language_scanner_globals_offset;
|
2001-08-06 21:48:51 +08:00
|
|
|
#else
|
|
|
|
|
# define LANG_SCNG(v) (language_scanner_globals.v)
|
2008-03-17 05:06:55 +08:00
|
|
|
extern ZEND_API zend_php_scanner_globals language_scanner_globals;
|
2001-08-06 21:48:51 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* INI Scanner */
|
|
|
|
|
#ifdef ZTS
|
2019-03-14 08:01:01 +08:00
|
|
|
# define INI_SCNG(v) ZEND_TSRMG_FAST(ini_scanner_globals_offset, zend_ini_scanner_globals *, v)
|
reworked the patch, less new stuff but worky
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.
2014-09-26 00:48:27 +08:00
|
|
|
extern ZEND_API ts_rsrc_id ini_scanner_globals_id;
|
2019-03-14 08:01:01 +08:00
|
|
|
extern ZEND_API size_t ini_scanner_globals_offset;
|
2001-08-06 21:48:51 +08:00
|
|
|
#else
|
|
|
|
|
# define INI_SCNG(v) (ini_scanner_globals.v)
|
2008-03-17 05:06:55 +08:00
|
|
|
extern ZEND_API zend_ini_scanner_globals ini_scanner_globals;
|
2001-08-06 21:48:51 +08:00
|
|
|
#endif
|
|
|
|
|
|
2007-02-16 16:54:17 +08:00
|
|
|
END_EXTERN_C()
|
2001-08-06 21:48:51 +08:00
|
|
|
|
2000-07-03 07:54:19 +08:00
|
|
|
#endif /* ZEND_GLOBALS_MACROS_H */
|
