Revert "metacall-plugin-local-test working properly"

This reverts commit 512f0d3.

Author: viferga

source/extensions/plugin_extension/source/plugin_extension.cpp

@@ -67,9 +67,8 @@ static int plugin_extension_get_path(std::string &ext_path)
 	return 0;
 }
 
-int plugin_extension(void *loader, void *context)
+int plugin_extension(void *, void *)
 {
-	(void)loader;
 	std::string ext_path;
 
 	if (plugin_extension_get_path(ext_path) != 0)
@@ -103,7 +102,7 @@ int plugin_extension(void *loader, void *context)
 			{
 				log_write("metacall", LOG_LEVEL_DEBUG, "Loading extension: %s", dir.path().filename().c_str());
 
-				if (metacall_load_from_configuration_ctx(dir.path().c_str(), context, config_allocator) != 0)
+				if (metacall_load_from_configuration(dir.path().c_str(), NULL, config_allocator) != 0)
 				{
 					log_write("metacall", LOG_LEVEL_ERROR, "Failed to load extension: %s", dir.path().c_str());
 					return 1;

source/loader/include/loader/loader.h

@@ -65,13 +65,11 @@ LOADER_API int loader_execution_path(const loader_tag tag, const loader_path pat
 
 LOADER_API int loader_load_from_file(const loader_tag tag, const loader_path paths[], size_t size, void **handle);
 
-LOADER_API int loader_load_from_file_ctx(const loader_tag tag, const loader_path paths[], size_t size, void *ctx);
-
 LOADER_API int loader_load_from_memory(const loader_tag tag, const char *buffer, size_t size, void **handle);
 
 LOADER_API int loader_load_from_package(const loader_tag tag, const loader_path path, void **handle);
 
-LOADER_API int loader_load_from_configuration(const loader_path path, void **handle, void *ctx, void *allocator);
+LOADER_API int loader_load_from_configuration(const loader_path path, void **handle, void *allocator);
 
 LOADER_API loader_impl loader_get_impl(const loader_tag tag);
 

source/loader/include/loader/loader_impl.h

@@ -59,8 +59,6 @@ LOADER_API int loader_impl_execution_path(plugin p, loader_impl impl, const load
 
 LOADER_API int loader_impl_load_from_file(plugin_manager manager, plugin p, loader_impl impl, const loader_path paths[], size_t size, void **handle_ptr);
 
-LOADER_API int loader_impl_load_from_file_ctx(plugin_manager manager, plugin p, loader_impl impl, const loader_path paths[], size_t size, void *ctx);
-
 LOADER_API int loader_impl_load_from_memory(plugin_manager manager, plugin p, loader_impl impl, const char *buffer, size_t size, void **handle_ptr);
 
 LOADER_API int loader_impl_load_from_package(plugin_manager manager, plugin p, loader_impl impl, const loader_path path, void **handle_ptr);

source/loader/source/loader.c

@@ -302,26 +302,6 @@ int loader_load_from_file(const loader_tag tag, const loader_path paths[], size_
 	return loader_impl_load_from_file(&loader_manager, p, plugin_impl_type(p, loader_impl), paths, size, handle);
 }
 
-int loader_load_from_file_ctx(const loader_tag tag, const loader_path paths[], size_t size, void *ctx)
-{
-	if (loader_initialize() == 1)
-	{
-		return 1;
-	}
-
-	plugin p = loader_get_impl_plugin(tag);
-
-	if (p == NULL)
-	{
-		log_write("metacall", LOG_LEVEL_ERROR, "Tried to load %" PRIuS " file(s) from non existent loader (%s): %s", size, tag, paths[0]);
-		return 1;
-	}
-
-	log_write("metacall", LOG_LEVEL_DEBUG, "Loading %" PRIuS " file(s) (%s) from path(s): %s ...", size, tag, paths[0]);
-
-	return loader_impl_load_from_file_ctx(&loader_manager, p, plugin_impl_type(p, loader_impl), paths, size, ctx);
-}
-
 int loader_load_from_memory(const loader_tag tag, const char *buffer, size_t size, void **handle)
 {
 	if (loader_initialize() == 1)
@@ -362,7 +342,7 @@ int loader_load_from_package(const loader_tag tag, const loader_path path, void
 	return loader_impl_load_from_package(&loader_manager, p, plugin_impl_type(p, loader_impl), path, handle);
 }
 
-int loader_load_from_configuration(const loader_path path, void **handle, void *ctx, void *allocator)
+int loader_load_from_configuration(const loader_path path, void **handle, void *allocator)
 {
 	loader_name config_name;
 	configuration config;
@@ -487,17 +467,7 @@ int loader_load_from_configuration(const loader_path path, void **handle, void *
 		}
 	}
 
-	int result = 0;
-	if (ctx != NULL)
-	{
-		result = loader_load_from_file_ctx((const char *)value_to_string(tag), (const loader_path *)paths, size, ctx);
-	}
-	else
-	{
-		result = loader_load_from_file((const char *)value_to_string(tag), (const loader_path *)paths, size, handle);
-	}
-
-	if (result != 0)
+	if (loader_load_from_file((const char *)value_to_string(tag), (const loader_path *)paths, size, handle) != 0)
 	{
 		log_write("metacall", LOG_LEVEL_ERROR, "Loader load from configuration invalid load from file");
 

source/loader/source/loader_impl.c

@@ -796,67 +796,6 @@ int loader_impl_load_from_file(plugin_manager manager, plugin p, loader_impl imp
 
 	return 1;
 }
-int loader_impl_load_from_file_ctx(plugin_manager manager, plugin p, loader_impl impl, const loader_path paths[], size_t size, void *ctx)
-{
-	if (ctx == NULL)
-	{
-		log_write("metacall", LOG_LEVEL_ERROR, "Load from file failed, invalid context");
-
-		return 1;
-	}
-
-	if (impl != NULL)
-	{
-		loader_impl_interface iface = loader_iface(p);
-
-		size_t iterator;
-
-		for (iterator = 0; iterator < size; ++iterator)
-		{
-			log_write("metacall", LOG_LEVEL_DEBUG, "Loading %s", paths[iterator]);
-		}
-
-		if (iface != NULL)
-		{
-			loader_handle handle;
-			loader_path path;
-
-			if (loader_impl_initialize(manager, p, impl) != 0)
-			{
-				return 1;
-			}
-
-			/* This isn't really necessary*/
-			if (loader_impl_handle_name(manager, paths[0], path) > 1 && loader_impl_get_handle(impl, path) != NULL)
-			{
-				log_write("metacall", LOG_LEVEL_ERROR, "Load from file handle failed, handle with name %s already loaded", path);
-
-				return 1;
-			}
-
-			handle = iface->load_from_file(impl, paths, size);
-
-			log_write("metacall", LOG_LEVEL_DEBUG, "Loader interface: %p - Loader handle: %p", (void *)iface, (void *)handle);
-
-			if (handle != NULL)
-			{
-				scope sp = context_scope(ctx);
-
-				if (sp != NULL)
-				{
-					/* Todo: check for duplicate symbols*/
-
-					if (iface->discover(impl, handle, ctx) == 0)
-					{
-						return 0;
-					}
-				}
-			}
-		}
-	}
-
-	return 1;
-}
 
 int loader_impl_load_from_memory_name(loader_impl impl, loader_name name, const char *buffer, size_t size)
 {

source/metacall/include/metacall/metacall.h

@@ -309,30 +309,6 @@ METACALL_API int metacall_load_from_package(const char *tag, const char *path, v
 */
 METACALL_API int metacall_load_from_configuration(const char *path, void **handle, void *allocator);
 
-/**
-*  @brief
-*    Loads a a list of scrips from configuration specified by @path into loader
-*    with the following format:
-*        {
-*            "language_id": "<tag>",
-*            "path": "<path>",
-*            "scripts": [ "<script0>", "<script1>", ..., "<scriptN>" ]
-*        }
-*
-*  @param[in] path
-*    Path of the configuration
-*
-*  @param[in] context
-*    Pointer to context
-*
-*  @param[in] allocator
-*    Pointer to allocator will allocate the configuration
-*
-*  @return
-*    Zero if success, different from zero otherwise
-*/
-METACALL_API int metacall_load_from_configuration_ctx(const char *path, void *ctx, void *allocator);
-
 /**
 *  @brief
 *    Call a function anonymously by value array @args

source/metacall/source/metacall.c

@@ -321,12 +321,7 @@ int metacall_load_from_package(const char *tag, const char *path, void **handle)
 
 int metacall_load_from_configuration(const char *path, void **handle, void *allocator)
 {
-	return loader_load_from_configuration(path, handle, NULL, allocator);
-}
-
-int metacall_load_from_configuration_ctx(const char *path, void *ctx, void *allocator)
-{
-	return loader_load_from_configuration(path, NULL, ctx, allocator);
+	return loader_load_from_configuration(path, handle, allocator);
 }
 
 void *metacallv(const char *name, void *args[])