diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-06-15 14:03:21 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-06-15 14:03:21 +0000 |
| commit | ada4e506a7b04bf6e89d5266a12d7e251fe68f20 (patch) | |
| tree | 713e0610d6b9dbd1967dcff981301498a3f53d07 /Zend/zend_modules.h | |
| parent | d3c3a54b4e4aeb1fdad0cb8da6ef1a9ea0ad71ee (diff) | |
| download | php-git-ada4e506a7b04bf6e89d5266a12d7e251fe68f20.tar.gz | |
MFH: Added automatic module globals management.
Diffstat (limited to 'Zend/zend_modules.h')
| -rw-r--r-- | Zend/zend_modules.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h index 12f61d9441..26dcfe9ded 100644 --- a/Zend/zend_modules.h +++ b/Zend/zend_modules.h @@ -39,7 +39,7 @@ extern struct _zend_arg_info fourth_arg_force_ref[5]; extern struct _zend_arg_info fifth_arg_force_ref[6]; extern struct _zend_arg_info all_args_by_ref[1]; -#define ZEND_MODULE_API_NO 20050922 +#define ZEND_MODULE_API_NO 20060613 #ifdef ZTS #define USING_ZTS 1 #else @@ -52,10 +52,18 @@ extern struct _zend_arg_info all_args_by_ref[1]; #define ZE2_STANDARD_MODULE_HEADER \ STANDARD_MODULE_HEADER_EX, ini_entries, NULL -#define STANDARD_MODULE_PROPERTIES_EX 0, 0, 0, NULL, 0 +#define STANDARD_MODULE_PROPERTIES_EX 0, 0, NULL, 0 + +#define NO_MODULE_GLOBASLS 0, NULL, NULL, NULL + +#ifdef ZTS +# define ZEND_MODULE_GLOBALS(module_name) sizeof(zend_##module_name##_globals), &module_name##_globals_id +#else +# define ZEND_MODULE_GLOBALS(module_name) sizeof(zend_##module_name##_globals), &module_name##_globals +#endif #define STANDARD_MODULE_PROPERTIES \ - NULL, STANDARD_MODULE_PROPERTIES_EX + NO_MODULE_GLOBASLS, NULL, STANDARD_MODULE_PROPERTIES_EX #define NO_VERSION_YET NULL @@ -81,8 +89,15 @@ struct _zend_module_entry { int (*request_shutdown_func)(SHUTDOWN_FUNC_ARGS); void (*info_func)(ZEND_MODULE_INFO_FUNC_ARGS); char *version; + size_t globals_size; +#ifdef ZTS + ts_rsrc_id* globals_id_ptr; +#else + void* globals_ptr; +#endif + void (*globals_ctor)(void *global TSRMLS_DC); + void (*globals_dtor)(void *global TSRMLS_DC); int (*post_deactivate_func)(void); - int globals_id; int module_started; unsigned char type; void *handle; |