summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zend/zend.c12
-rw-r--r--Zend/zend_API.c24
-rw-r--r--Zend/zend_compile.c2
-rw-r--r--Zend/zend_execute_API.c2
-rw-r--r--Zend/zend_list.c156
-rw-r--r--Zend/zend_list.h45
6 files changed, 173 insertions, 68 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index b8f145c4d5..38e0a5839b 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -275,14 +275,14 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals)
zend_startup_constants(ELS_C);
zend_copy_constants(executor_globals->zend_constants, global_constants_table);
}
- init_resource_plist(ELS_C);
+ zend_init_rsrc_plist(ELS_C);
}
static void executor_globals_dtor(zend_executor_globals *executor_globals)
{
zend_shutdown_constants(ELS_C);
- destroy_resource_plist(ELS_C);
+ zend_destroy_rsrc_plist(ELS_C);
}
@@ -334,7 +334,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
zend_hash_init(GLOBAL_CLASS_TABLE, 10, NULL, ZEND_CLASS_DTOR, 1);
register_standard_class();
zend_hash_init(&module_registry, 50, NULL, ZEND_MODULE_DTOR, 1);
- zend_hash_init(&list_destructors, 50, NULL, NULL, 1);
+ zend_init_rsrc_list_dtors();
/* This zval can be used to initialize allocate zval's to an uninit'ed value */
zval_used_for_init.is_ref = 0;
@@ -358,7 +358,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
zend_register_standard_constants(ELS_C);
#ifndef ZTS
- init_resource_plist(ELS_C);
+ zend_init_rsrc_plist(ELS_C);
#endif
if (start_builtin_functions) {
@@ -372,9 +372,9 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
void zend_shutdown()
{
#ifndef ZTS
- destroy_resource_plist();
+ destroy_rsrc_plist();
#endif
- zend_hash_destroy(&list_destructors);
+ zend_destroy_rsrc_list_dtors();
zend_hash_destroy(&module_registry);
zend_hash_destroy(GLOBAL_FUNCTION_TABLE);
free(GLOBAL_FUNCTION_TABLE);
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 017c891554..aace9a6d21 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -30,7 +30,7 @@
/* these variables are true statics/globals, and have to be mutex'ed on every access */
static int module_count=0;
-HashTable list_destructors, module_registry;
+HashTable module_registry;
/* this function doesn't check for too many parameters */
ZEND_API int zend_get_parameters(int ht, int param_count, ...)
@@ -707,26 +707,6 @@ ZEND_API int zend_startup_module(zend_module_entry *module)
}
-ZEND_API int _register_list_destructors(void (*list_destructor)(void *), void (*plist_destructor)(void *), int module_number)
-{
- list_destructors_entry ld;
-
-#if 0
- printf("Registering destructors %d for module %d\n", list_destructors.nNextFreeElement, module_number);
-#endif
-
- ld.list_destructor=(void (*)(void *)) list_destructor;
- ld.plist_destructor=(void (*)(void *)) plist_destructor;
- ld.module_number = module_number;
- ld.resource_id = list_destructors.nNextFreeElement;
-
- if (zend_hash_next_index_insert(&list_destructors,(void *) &ld,sizeof(list_destructors_entry),NULL)==FAILURE) {
- return FAILURE;
- }
- return list_destructors.nNextFreeElement-1;
-}
-
-
/* registers all functions in *library_functions in the function hash */
int zend_register_functions(zend_function_entry *functions, HashTable *function_table)
{
@@ -815,7 +795,7 @@ ZEND_API int zend_register_module(zend_module_entry *module)
void module_destructor(zend_module_entry *module)
{
if (module->type == MODULE_TEMPORARY) {
- zend_hash_apply_with_argument(&list_destructors, (int (*)(void *,void *)) clean_module_resource_destructors, (void *) &(module->module_number));
+ zend_clean_module_rsrc_dtors(module->module_number);
clean_module_constants(module->module_number);
}
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 375ac0bd3c..f8bdb641b0 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -107,7 +107,7 @@ void init_compiler(CLS_D ELS_DC)
CG(allow_call_time_pass_reference) = ZEND_UV(allow_call_time_pass_reference);
CG(handle_op_arrays) = 1;
CG(in_compilation) = 0;
- init_resource_list(ELS_C);
+ zend_init_rsrc_list(ELS_C);
CG(unclean_shutdown) = 0;
zend_llist_init(&CG(open_files), sizeof(zend_file_handle), (void (*)(void *)) zend_open_file_dtor, 0);
zend_hash_init(&CG(used_files), 5, NULL, (void (*)(void *)) zend_open_file_dtor_wrapper, 0);
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index f2daec1083..cbdc121832 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -142,7 +142,7 @@ void shutdown_executor(ELS_D)
}
}
- destroy_resource_list(ELS_C); /* must be destroyed after the main symbol table is destroyed */
+ zend_destroy_rsrc_list(ELS_C); /* must be destroyed after the main symbol table is destroyed */
zend_ptr_stack_destroy(&EG(argument_stack));
if (EG(main_op_array)) {
diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index 1f9ecacef9..c8ec2b4555 100644
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -27,10 +27,14 @@
ZEND_API int le_index_ptr;
-static inline int zend_list_do_insert(HashTable *list,void *ptr, int type)
+/* true global */
+static HashTable list_destructors;
+
+
+static inline int zend_list_do_insert(HashTable *list, void *ptr, int type, zend_bool valid)
{
int index;
- list_entry le;
+ zend_rsrc_list_entry le;
index = zend_hash_next_free_element(list);
@@ -39,13 +43,14 @@ static inline int zend_list_do_insert(HashTable *list,void *ptr, int type)
le.ptr=ptr;
le.type=type;
le.refcount=1;
- zend_hash_index_update(list, index, (void *) &le, sizeof(list_entry), NULL);
+ le.valid = valid;
+ zend_hash_index_update(list, index, (void *) &le, sizeof(zend_rsrc_list_entry), NULL);
return index;
}
static inline int zend_list_do_delete(HashTable *list,int id)
{
- list_entry *le;
+ zend_rsrc_list_entry *le;
ELS_FETCH();
if (zend_hash_index_find(&EG(regular_list), id, (void **) &le)==SUCCESS) {
@@ -63,7 +68,7 @@ static inline int zend_list_do_delete(HashTable *list,int id)
static inline void *zend_list_do_find(HashTable *list,int id, int *type)
{
- list_entry *le;
+ zend_rsrc_list_entry *le;
if (zend_hash_index_find(list, id, (void **) &le)==SUCCESS) {
*type = le->type;
@@ -79,7 +84,7 @@ ZEND_API int zend_list_insert(void *ptr, int type)
{
ELS_FETCH();
- return zend_list_do_insert(&EG(regular_list), ptr, type);
+ return zend_list_do_insert(&EG(regular_list), ptr, type, 1);
}
@@ -87,13 +92,13 @@ ZEND_API int zend_plist_insert(void *ptr, int type)
{
ELS_FETCH();
- return zend_list_do_insert(&EG(persistent_list), ptr, type);
+ return zend_list_do_insert(&EG(persistent_list), ptr, type, 1);
}
ZEND_API int zend_list_addref(int id)
{
- list_entry *le;
+ zend_rsrc_list_entry *le;
ELS_FETCH();
if (zend_hash_index_find(&EG(regular_list), id, (void **) &le)==SUCCESS) {
@@ -122,6 +127,20 @@ ZEND_API int zend_plist_delete(int id)
}
+ZEND_API int zend_list_convert_to_number(int id)
+{
+ zend_rsrc_list_entry *le;
+ ELS_FETCH();
+
+ if (zend_hash_index_find(&EG(regular_list), id, (void **) &le)==SUCCESS
+ && le->valid) {
+ return id;
+ }
+ return 0;
+}
+
+
+
ZEND_API void *zend_list_find(int id, int *type)
{
ELS_FETCH();
@@ -153,6 +172,22 @@ ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int r
}
+ZEND_API int zend_register_false_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type)
+{
+ int rsrc_id;
+ ELS_FETCH();
+
+ rsrc_id = zend_list_do_insert(&EG(regular_list), rsrc_pointer, rsrc_type, 0);
+
+ if (rsrc_result) {
+ rsrc_result->value.lval = rsrc_id;
+ rsrc_result->type = IS_RESOURCE;
+ }
+
+ return rsrc_id;
+}
+
+
ZEND_API void *zend_fetch_resource(zval **passed_id, int default_id, char *resource_type_name, int *found_resource_type, int num_resource_types, ...)
{
int id;
@@ -206,12 +241,22 @@ ZEND_API void *zend_fetch_resource(zval **passed_id, int default_id, char *resou
void list_entry_destructor(void *ptr)
{
- list_entry *le = (list_entry *) ptr;
- list_destructors_entry *ld;
+ zend_rsrc_list_entry *le = (zend_rsrc_list_entry *) ptr;
+ zend_rsrc_list_dtors_entry *ld;
- if (zend_hash_index_find(&list_destructors,le->type,(void **) &ld)==SUCCESS) {
- if (ld->list_destructor) {
- (ld->list_destructor)(le->ptr);
+ if (zend_hash_index_find(&list_destructors, le->type,(void **) &ld)==SUCCESS) {
+ switch (ld->type) {
+ case ZEND_RESOURCE_LIST_TYPE_STD:
+ if (ld->list_dtor) {
+ (ld->list_dtor)(le->ptr);
+ }
+ break;
+ case ZEND_RESOURCE_LIST_TYPE_EX:
+ if (ld->list_dtor_ex) {
+ ld->list_dtor_ex(le);
+ }
+ break;
+ EMPTY_SWITCH_DEFAULT_CASE()
}
} else {
zend_error(E_WARNING,"Unknown list entry type in request shutdown (%d)",le->type);
@@ -221,12 +266,12 @@ void list_entry_destructor(void *ptr)
void plist_entry_destructor(void *ptr)
{
- list_entry *le = (list_entry *) ptr;
- list_destructors_entry *ld;
+ zend_rsrc_list_entry *le = (zend_rsrc_list_entry *) ptr;
+ zend_rsrc_list_dtors_entry *ld;
- if (zend_hash_index_find(&list_destructors,le->type,(void **) &ld)==SUCCESS) {
- if (ld->plist_destructor) {
- (ld->plist_destructor)(le->ptr);
+ if (zend_hash_index_find(&list_destructors, le->type,(void **) &ld)==SUCCESS) {
+ if (ld->plist_dtor) {
+ (ld->plist_dtor)(le->ptr);
}
} else {
zend_error(E_WARNING,"Unknown persistent list entry type in module shutdown (%d)",le->type);
@@ -234,31 +279,31 @@ void plist_entry_destructor(void *ptr)
}
-int init_resource_list(ELS_D)
+int zend_init_rsrc_list(ELS_D)
{
return zend_hash_init(&EG(regular_list), 0, NULL, list_entry_destructor, 0);
}
-int init_resource_plist(ELS_D)
+int zend_init_rsrc_plist(ELS_D)
{
return zend_hash_init(&EG(persistent_list), 0, NULL, plist_entry_destructor, 1);
}
-void destroy_resource_list(ELS_D)
+void zend_destroy_rsrc_list(ELS_D)
{
zend_hash_graceful_destroy(&EG(regular_list));
}
-void destroy_resource_plist(ELS_D)
+void zend_destroy_rsrc_plist(ELS_D)
{
zend_hash_graceful_destroy(&EG(persistent_list));
}
-static int clean_module_resource(list_entry *le, int *resource_id)
+static int clean_module_resource(zend_rsrc_list_entry *le, int *resource_id)
{
if (le->type == *resource_id) {
return 1;
@@ -268,7 +313,7 @@ static int clean_module_resource(list_entry *le, int *resource_id)
}
-int clean_module_resource_destructors(list_destructors_entry *ld, int *module_number)
+static int zend_clean_module_rsrc_dtors_cb(zend_rsrc_list_dtors_entry *ld, int *module_number)
{
if (ld->module_number == *module_number) {
ELS_FETCH();
@@ -282,6 +327,69 @@ int clean_module_resource_destructors(list_destructors_entry *ld, int *module_nu
}
+void zend_clean_module_rsrc_dtors(int module_number)
+{
+ zend_hash_apply_with_argument(&list_destructors, (int (*)(void *,void *)) zend_clean_module_rsrc_dtors_cb, (void *) &module_number);
+}
+
+
+ZEND_API int zend_register_list_destructors(void (*ld)(void *), void (*pld)(void *), int module_number)
+{
+ zend_rsrc_list_dtors_entry lde;
+
+#if 0
+ printf("Registering destructors %d for module %d\n", list_destructors.nNextFreeElement, module_number);
+#endif
+
+ lde.list_dtor=(void (*)(void *)) ld;
+ lde.plist_dtor=(void (*)(void *)) pld;
+ lde.list_dtor_ex = lde.plist_dtor_ex = NULL;
+ lde.module_number = module_number;
+ lde.resource_id = list_destructors.nNextFreeElement;
+ lde.type = ZEND_RESOURCE_LIST_TYPE_STD;
+
+ if (zend_hash_next_index_insert(&list_destructors, (void *) &lde, sizeof(zend_rsrc_list_dtors_entry), NULL)==FAILURE) {
+ return FAILURE;
+ }
+ return list_destructors.nNextFreeElement-1;
+}
+
+
+ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_func_t pld, int module_number)
+{
+ zend_rsrc_list_dtors_entry lde;
+
+#if 0
+ printf("Registering destructors %d for module %d\n", list_destructors.nNextFreeElement, module_number);
+#endif
+
+ lde.list_dtor = NULL;
+ lde.plist_dtor = NULL;
+ lde.list_dtor_ex = ld;
+ lde.plist_dtor_ex = pld;
+ lde.module_number = module_number;
+ lde.resource_id = list_destructors.nNextFreeElement;
+ lde.type = ZEND_RESOURCE_LIST_TYPE_EX;
+
+ if (zend_hash_next_index_insert(&list_destructors,(void *) &lde, sizeof(zend_rsrc_list_dtors_entry),NULL)==FAILURE) {
+ return FAILURE;
+ }
+ return list_destructors.nNextFreeElement-1;
+}
+
+
+int zend_init_rsrc_list_dtors()
+{
+ return zend_hash_init(&list_destructors, 50, NULL, NULL, 1);
+}
+
+
+void zend_destroy_rsrc_list_dtors()
+{
+ zend_hash_destroy(&list_destructors);
+}
+
+
/*
* Local variables:
* tab-width: 4
diff --git a/Zend/zend_list.h b/Zend/zend_list.h
index 1a8e411448..5ba126cb61 100644
--- a/Zend/zend_list.h
+++ b/Zend/zend_list.h
@@ -24,23 +24,37 @@
#include "zend_hash.h"
#include "zend_globals.h"
-extern HashTable list_destructors;
-typedef struct _list_entry {
+#define ZEND_RESOURCE_LIST_TYPE_STD 1
+#define ZEND_RESOURCE_LIST_TYPE_EX 2
+
+typedef struct _zend_rsrc_list_entry {
void *ptr;
int type;
int refcount;
-} list_entry;
+ zend_bool valid;
+} zend_rsrc_list_entry;
+
+typedef void (*rsrc_dtor_func_t)(zend_rsrc_list_entry *le);
+
+typedef struct _zend_rsrc_list_dtors_entry {
+ /* old style destructors */
+ void (*list_dtor)(void *);
+ void (*plist_dtor)(void *);
+
+ /* new style destructors */
+ rsrc_dtor_func_t list_dtor_ex;
+ rsrc_dtor_func_t plist_dtor_ex;
-typedef struct _list_destructors_entry {
- void (*list_destructor)(void *);
- void (*plist_destructor)(void *);
int module_number;
int resource_id;
-} list_destructors_entry;
+ unsigned char type;
+} zend_rsrc_list_dtors_entry;
+
-#define register_list_destructors(ld,pld) _register_list_destructors((void (*)(void *))ld, (void (*)(void *))pld, module_number);
-ZEND_API int _register_list_destructors(void (*ld)(void *), void (*pld)(void *), int module_number);
+#define register_list_destructors(ld, pld) zend_register_list_destructors((void (*)(void *))ld, (void (*)(void *))pld, module_number);
+ZEND_API int zend_register_list_destructors(void (*ld)(void *), void (*pld)(void *), int module_number);
+ZEND_API int zend_register_list_destructors_ex(rsrc_dtor_func_t ld, rsrc_dtor_func_t pld, int module_number);
enum list_entry_type {
LE_DB=1000
@@ -49,17 +63,20 @@ enum list_entry_type {
void list_entry_destructor(void *ptr);
void plist_entry_destructor(void *ptr);
-int clean_module_resource_destructors(list_destructors_entry *ld, int *module_number);
-int init_resource_list(ELS_D);
-int init_resource_plist(ELS_D);
-void destroy_resource_list(ELS_D);
-void destroy_resource_plist(ELS_D);
+void zend_clean_module_rsrc_dtors(int module_number);
+int zend_init_rsrc_list(ELS_D);
+int zend_init_rsrc_plist(ELS_D);
+void zend_destroy_rsrc_list(ELS_D);
+void zend_destroy_rsrc_plist(ELS_D);
+int zend_init_rsrc_list_dtors();
+void zend_destroy_rsrc_list_dtors();
ZEND_API int zend_list_insert(void *ptr, int type);
ZEND_API int zend_plist_insert(void *ptr, int type);
ZEND_API int zend_list_addref(int id);
ZEND_API int zend_list_delete(int id);
ZEND_API int zend_plist_delete(int id);
+ZEND_API int zend_list_convert_to_number(int id);
ZEND_API void *zend_list_find(int id, int *type);
ZEND_API void *zend_plist_find(int id, int *type);
View Lorry Controller Status