Solve bug introduced by 0a8e426 ; this forced to executed the destroy events of the functions, classes and objects after the runtime is destroyed and this is very problematic. The destruction has been moved after the destroy children. Apparently this should not be a problem, but maybe this should be separated into two different functions if there is some special case of a loader. For now it works on node (which is the problematic one) and for the rest of loaders, which is exactly the same behavior as before.

Author: viferga

source/loader/include/loader/loader.h

@@ -93,7 +93,7 @@ LOADER_API value loader_metadata(void);
 
 LOADER_API int loader_clear(void *handle);
 
-LOADER_API void loader_unload_children(void);
+LOADER_API void loader_unload_children(loader_impl impl);
 
 LOADER_API int loader_unload(void);
 

source/loader/include/loader/loader_impl.h

@@ -76,6 +76,8 @@ LOADER_API value loader_impl_metadata(loader_impl impl);
 
 LOADER_API int loader_impl_clear(void *handle);
 
+LOADER_API void loader_impl_destroy_objects(loader_impl impl);
+
 LOADER_API void loader_impl_destroy(loader_impl impl);
 
 LOADER_API loader_impl loader_impl_create_proxy(void);

source/loader/source/loader.c

@@ -806,7 +806,7 @@ int loader_clear(void *handle)
 	return loader_impl_clear(handle);
 }
 
-void loader_unload_children()
+void loader_unload_children(loader_impl impl)
 {
 	loader l = loader_singleton();
 	uint64_t current = thread_id_get_current();
@@ -847,6 +847,12 @@ void loader_unload_children()
 	}
 
 	vector_destroy(stack);
+
+	/* Clear all objects and types related to the loader once all childs have been destroyed */
+	if (impl != NULL)
+	{
+		loader_impl_destroy_objects(impl);
+	}
 }
 
 int loader_unload()
@@ -870,7 +876,7 @@ int loader_unload()
 			/* TODO: How to deal with this? */
 		}
 
-		loader_unload_children();
+		loader_unload_children(NULL);
 	}
 
 	/* Clear the implementation tag map */

source/loader/source/loader_impl.c

@@ -1107,6 +1107,27 @@ int loader_impl_destroy_exec_path_map_cb_iterate(set s, set_key key, set_value v
 	return 0;
 }
 
+void loader_impl_destroy_objects(loader_impl impl)
+{
+	/* This iterates through all functions, classes objects and types,
+	* it is necessary to be executed on demand because those can have
+	* implementations in the loader implementation which need to be GCed
+	* or freed properly before the runtime goes down but after the
+	* destroy has been issued, so while it is destroying, we can still
+	* retrieve the data for introspection or for whatever we need
+	*/
+	if (impl != NULL)
+	{
+		set_iterate(impl->handle_impl_map, &loader_impl_destroy_handle_map_cb_iterate, NULL);
+
+		set_destroy(impl->handle_impl_map);
+
+		set_iterate(impl->type_info_map, &loader_impl_destroy_type_map_cb_iterate, NULL);
+
+		set_destroy(impl->type_info_map);
+	}
+}
+
 void loader_impl_destroy(loader_impl impl)
 {
 	if (impl != NULL)
@@ -1125,14 +1146,6 @@ void loader_impl_destroy(loader_impl impl)
 			impl->init = 1;
 		}
 
-		set_iterate(impl->handle_impl_map, &loader_impl_destroy_handle_map_cb_iterate, NULL);
-
-		set_destroy(impl->handle_impl_map);
-
-		set_iterate(impl->type_info_map, &loader_impl_destroy_type_map_cb_iterate, NULL);
-
-		set_destroy(impl->type_info_map);
-
 		set_iterate(impl->exec_path_map, &loader_impl_destroy_exec_path_map_cb_iterate, NULL);
 
 		set_destroy(impl->exec_path_map);

source/loaders/c_loader/source/c_loader_impl.cpp

@@ -289,7 +289,7 @@ int c_loader_impl_destroy(loader_impl impl)
 	if (c_impl != NULL)
 	{
 		/* Destroy children loaders */
-		loader_unload_children();
+		loader_unload_children(impl);
 
 		delete c_impl;
 

source/loaders/cob_loader/source/cob_loader_impl.cpp

@@ -259,7 +259,7 @@ int cob_loader_impl_destroy(loader_impl impl)
 	(void)impl;
 
 	// Destroy children loaders
-	loader_unload_children();
+	loader_unload_children(impl);
 
 	return cobtidy();
 }

source/loaders/cs_loader/source/cs_loader_impl.c

@@ -396,7 +396,7 @@ int cs_loader_impl_destroy(loader_impl impl)
 	netcore_handle nhandle = (netcore_handle)loader_impl_get(impl);
 
 	/* Destroy children loaders */
-	loader_unload_children();
+	loader_unload_children(impl);
 
 	simple_netcore_destroy(nhandle);
 

source/loaders/dart_loader/source/dart_loader_impl.cc

@@ -571,7 +571,7 @@ int dart_loader_impl_destroy(loader_impl impl)
 	if (dart_impl != nullptr)
 	{
 		/* Destroy children loaders */
-		loader_unload_children();
+		loader_unload_children(impl);
 
 		delete dart_impl;
 

source/loaders/file_loader/source/file_loader_impl.c

@@ -439,7 +439,7 @@ int file_loader_impl_destroy(loader_impl impl)
 	if (file_impl != NULL)
 	{
 		/* Destroy children loaders */
-		loader_unload_children();
+		loader_unload_children(impl);
 
 		free(file_impl);
 

source/loaders/java_loader/source/java_loader_impl.cpp

@@ -307,7 +307,7 @@ int java_loader_impl_destroy(loader_impl impl)
 		std::cout << "1ffffffffffffffffffffffffffff" << std::endl;
 
 		/* Destroy children loaders */
-		loader_unload_children();
+		loader_unload_children(impl);
 		std::cout << "2ffffffffffffffffffffffffffff" << std::endl;
 
 		java_impl->jvm->DestroyJavaVM();