- Clean up resource lists namespace

- Prepare extended resource list destructor APIs (currently unused)

1 files changed, 132 insertions, 24 deletions

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