MFH: Added automatic module globals management.

3 files changed, 50 insertions, 4 deletions

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 57892f3b99..6d7ef7f82b 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1448,6 +1448,17 @@ ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC)
 		}
 	}
 
+	/* Initialize module globals */
+	if (module->globals_size) {
+#ifdef ZTS
+		ts_allocate_id(module->globals_id_ptr, module->globals_size, (ts_allocate_ctor) module->globals_ctor, (ts_allocate_dtor) module->globals_dtor);
+#else
+		if (module->globals_ctor) {
+			module->globals_ctor(module->globals_ptr TSRMLS_CC);
+		}
+#endif
+	}
+
 	if (module->module_startup_func) {
 		EG(current_module) = module;
 		if (module->module_startup_func(module->type, module->module_number TSRMLS_CC)==FAILURE) {
@@ -1881,6 +1892,18 @@ void module_destructor(zend_module_entry *module)
 #endif
 		module->module_shutdown_func(module->type, module->module_number TSRMLS_CC);
 	}
+	
+	/* Deinitilaise module globals */
+	if (module->globals_size) {
+#ifdef ZTS
+		ts_free_id(*module->globals_id_ptr);
+#else
+		if (module->globals_dtor) {
+			module->globals_dtor(module->globals_ptr TSRMLS_CC);
+		}
+#endif
+	}
+
 	module->module_started=0;
 	if (module->functions) {
 		zend_unregister_functions(module->functions, -1, NULL TSRMLS_CC);
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 89c62e6d26..c04e8b5454 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -79,6 +79,8 @@ typedef struct _zend_function_entry {
 #define ZEND_MODULE_DEACTIVATE_N(module)	zm_deactivate_##module
 #define ZEND_MODULE_POST_ZEND_DEACTIVATE_N(module)	zm_post_zend_deactivate_##module
 #define ZEND_MODULE_INFO_N(module)			zm_info_##module
+#define ZEND_MODULE_GLOBALS_CTOR_N(module)  zm_globals_ctor_##module
+#define ZEND_MODULE_GLOBALS_DTOR_N(module)  zm_globals_dtor_##module
 
 /* Declaration macros */
 #define ZEND_MODULE_STARTUP_D(module)		int ZEND_MODULE_STARTUP_N(module)(INIT_FUNC_ARGS)
@@ -87,6 +89,8 @@ typedef struct _zend_function_entry {
 #define ZEND_MODULE_DEACTIVATE_D(module)	int ZEND_MODULE_DEACTIVATE_N(module)(SHUTDOWN_FUNC_ARGS)
 #define ZEND_MODULE_POST_ZEND_DEACTIVATE_D(module)	int ZEND_MODULE_POST_ZEND_DEACTIVATE_N(module)(void)
 #define ZEND_MODULE_INFO_D(module)			void ZEND_MODULE_INFO_N(module)(ZEND_MODULE_INFO_FUNC_ARGS)
+#define ZEND_MODULE_GLOBALS_CTOR_D(module)  void ZEND_MODULE_GLOBALS_CTOR_N(module)(zend_##module##_globals *module##_globals TSRMLS_DC)
+#define ZEND_MODULE_GLOBALS_DTOR_D(module)  void ZEND_MODULE_GLOBALS_DTOR_N(module)(zend_##module##_globals *module##_globals TSRMLS_DC)
 
 #define ZEND_GET_MODULE(name) \
     BEGIN_EXTERN_C()\
@@ -611,12 +615,16 @@ END_EXTERN_C()
 #define ZEND_RINIT			ZEND_MODULE_ACTIVATE_N
 #define ZEND_RSHUTDOWN		ZEND_MODULE_DEACTIVATE_N
 #define ZEND_MINFO			ZEND_MODULE_INFO_N
+#define ZEND_GINIT(module)		((void (*)(void* TSRMLS_DC))(ZEND_MODULE_GLOBALS_CTOR_N(module)))
+#define ZEND_GSHUTDOWN(module)	((void (*)(void* TSRMLS_DC))(ZEND_MODULE_GLOBALS_DTOR_N(module)))
 
 #define ZEND_MINIT_FUNCTION			ZEND_MODULE_STARTUP_D
 #define ZEND_MSHUTDOWN_FUNCTION		ZEND_MODULE_SHUTDOWN_D
 #define ZEND_RINIT_FUNCTION			ZEND_MODULE_ACTIVATE_D
 #define ZEND_RSHUTDOWN_FUNCTION		ZEND_MODULE_DEACTIVATE_D
 #define ZEND_MINFO_FUNCTION			ZEND_MODULE_INFO_D
+#define ZEND_GINIT_FUNCTION			ZEND_MODULE_GLOBALS_CTOR_D
+#define ZEND_GSHUTDOWN_FUNCTION		ZEND_MODULE_GLOBALS_DTOR_D
 
 END_EXTERN_C()
 
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;