Improve the way we cleanup temporary classes

Author: arnaud-lb

ext/module_class.c

@@ -228,18 +228,6 @@ static void phpgo_add_method(zend_function_entry *fe, php_export *export)
 	fe->flags = ZEND_ACC_PUBLIC;
 }
 
-void phpgo_module_destroy_class(zend_class_entry *ce)
-{
-	zend_function *f;
-	for (zend_hash_internal_pointer_reset(&ce->function_table);
-			zend_hash_get_current_data(&ce->function_table, (void**)&f) == SUCCESS;
-			zend_hash_move_forward(&ce->function_table)) {
-		efree((void*)(f->common.arg_info-1));
-		f->common.arg_info = NULL;
-		f->common.num_args = 0;
-	}
-}
-
 void phpgo_module_new_instance(zval *ret, phpgo_module *module TSRMLS_DC)
 {
 	zend_class_entry tmpce;
@@ -272,6 +260,7 @@ void phpgo_module_new_instance(zval *ret, phpgo_module *module TSRMLS_DC)
 	ce = zend_register_internal_class(&tmpce TSRMLS_CC);
 	ce->create_object = module_new;
 	ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+	zend_llist_add_element(&PHPGO_G(classes), &ce);
 
 	object_init_ex(ret, ce);
 
@@ -289,3 +278,24 @@ void phpgo_module_class_init()
 	memcpy(&module_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	module_object_handlers.clone_obj = NULL;
 }
+
+void destroy_module_class(zend_class_entry *ce)
+{
+	zend_function *f;
+	for (zend_hash_internal_pointer_reset(&ce->function_table);
+			zend_hash_get_current_data(&ce->function_table, (void**)&f) == SUCCESS;
+			zend_hash_move_forward(&ce->function_table)) {
+		efree((void*)(f->common.arg_info-1));
+		f->common.arg_info = NULL;
+		f->common.num_args = 0;
+	}
+}
+
+void phpgo_module_class_list_dtor(void *data TSRMLS_DC) /* {{{ */
+{
+	zend_class_entry *ce = *(zend_class_entry**)data;
+	if (ce->refcount == 1) {
+		destroy_module_class(ce);
+	}
+}
+/* }}} */

ext/module_class.h

@@ -18,5 +18,5 @@
 
 void phpgo_module_new_instance(zval *ret, phpgo_module *module TSRMLS_DC);
 void phpgo_module_class_init();
-void phpgo_module_destroy_class(zend_class_entry *ce);
+void phpgo_module_class_list_dtor(void *);
 

ext/php_phpgo.h

@@ -47,7 +47,8 @@ PHP_MINFO_FUNCTION(phpgo);
 PHP_FUNCTION(phpgo_load);
 
 ZEND_BEGIN_MODULE_GLOBALS(phpgo)
-	int  load_counter;
+	zend_llist classes;
+	int        load_counter;
 ZEND_END_MODULE_GLOBALS(phpgo)
 
 ZEND_EXTERN_MODULE_GLOBALS(phpgo);

ext/phpgo.c

@@ -65,7 +65,7 @@ ZEND_GET_MODULE(phpgo)
 
 /* {{{ php_phpgo_init_globals
  */
-static void php_phpgo_init_globals(zend_phpgo_globals *phpgo_globals)
+static void php_phpgo_init_globals(zend_phpgo_globals *phpgo_globals TSRMLS_DC)
 {
 	phpgo_globals->load_counter = 0;
 }
@@ -93,27 +93,16 @@ PHP_MSHUTDOWN_FUNCTION(phpgo)
  */
 PHP_RINIT_FUNCTION(phpgo)
 {
+	zend_llist_init(&PHPGO_G(classes), sizeof(zend_class_entry*), phpgo_module_class_list_dtor, 0);
 	return SUCCESS;
 }
 /* }}} */
 
-static int clean_module_class(void *pDest TSRMLS_DC) /* {{{ */
-{
-	zend_class_entry *ce = *(zend_class_entry**)pDest;
-	if (ce->type == ZEND_INTERNAL_CLASS && ce->info.internal.module->module_number == phpgo_module_entry.module_number) {
-		phpgo_module_destroy_class(ce);
-		return ZEND_HASH_APPLY_REMOVE;
-	} else {
-		return ZEND_HASH_APPLY_KEEP;
-	}
-}
-/* }}} */
-
 /* {{{ PHP_RSHUTDOWN_FUNCTION
  */
 PHP_RSHUTDOWN_FUNCTION(phpgo)
 {
-	zend_hash_apply(EG(class_table), clean_module_class TSRMLS_CC);
+	zend_llist_destroy(&PHPGO_G(classes));
 	return SUCCESS;
 }
 /* }}} */