Implement loading of core plugins.

Author: viferga

source/extensions/plugin_extension/source/plugin_extension.cpp

@@ -85,13 +85,13 @@ void *plugin_load_from_path(size_t argc, void *args[], void *data)
 				(config.substr(0, m_begins.size()) == m_begins &&
 					config.substr(config.size() - m_ends.size()) == m_ends))
 			{
-				log_write("metacall", LOG_LEVEL_DEBUG, "Loading extension: %s", config.c_str());
-
 				std::string dir_path = dir.path().string();
 
+				log_write("metacall", LOG_LEVEL_DEBUG, "Loading plugin: %s", dir_path.c_str());
+
 				if (metacall_load_from_configuration(dir_path.c_str(), handle_ptr, config_allocator) != 0)
 				{
-					log_write("metacall", LOG_LEVEL_ERROR, "Failed to load extension: %s", dir_path.c_str());
+					log_write("metacall", LOG_LEVEL_ERROR, "Failed to load plugin: %s", dir_path.c_str());
 					return metacall_value_create_int(4);
 				}
 

source/loader/include/loader/loader.h

@@ -61,6 +61,8 @@ LOADER_API int loader_register(const char *name, loader_register_invoke invoke,
 
 LOADER_API int loader_register_impl(void *impl, void *ctx, const char *name, loader_register_invoke invoke, type_id return_type, size_t arg_size, type_id args_type_id[]);
 
+LOADER_API const char *loader_library_path(void);
+
 LOADER_API int loader_execution_path(const loader_tag tag, const loader_path path);
 
 LOADER_API int loader_load_from_file(const loader_tag tag, const loader_path paths[], size_t size, void **handle);

source/loader/source/loader.c

@@ -262,6 +262,11 @@ loader_impl loader_get_impl(const loader_tag tag)
 	return plugin_impl_type(p, loader_impl);
 }
 
+const char *loader_library_path(void)
+{
+	return plugin_manager_library_path(&loader_manager);
+}
+
 int loader_execution_path(const loader_tag tag, const loader_path path)
 {
 	if (loader_initialize() == 1)

source/metacall/source/metacall.c

@@ -64,6 +64,7 @@ static void *plugin_extension_handle = NULL;
 
 /* -- Private Methods -- */
 
+static int metacall_plugin_extension_load(void);
 static void *metacallv_method(void *target, const char *name, method_invoke_ptr call, vector v, void *args[], size_t size);
 static type_id *metacall_type_ids(void *args[], size_t size);
 
@@ -86,12 +87,57 @@ void metacall_flags(int flags)
 	metacall_config_flags = flags;
 }
 
-int metacall_initialize(void)
+int metacall_plugin_extension_load(void)
 {
 	static const char *ext_scripts[] = {
 		"plugin_extension"
 	};
+	static const char plugin_suffix[] = "plugins";
+	const char *library_path = loader_library_path();
+	loader_path plugin_path;
+	size_t plugin_path_size;
+	void *args[2];
+	void *ret;
+	int result = 1;
+
+	/* Load the plugin extension */
+	if (metacall_load_from_file("ext", ext_scripts, sizeof(ext_scripts) / sizeof(ext_scripts[0]), &plugin_extension_handle) != 0)
+	{
+		goto plugin_extension_error;
+	}
+
+	/* Get the plugin path */
+	plugin_path_size = portability_path_join(library_path, strnlen(library_path, PORTABILITY_PATH_SIZE) + 1, plugin_suffix, sizeof(plugin_suffix), plugin_path, PORTABILITY_PATH_SIZE);
+
+	/* Load core plugins into plugin extension handle */
+	args[0] = metacall_value_create_string(plugin_path, plugin_path_size - 1);
+	args[1] = metacall_value_create_ptr(&plugin_extension_handle);
+	ret = metacallhv_s(plugin_extension_handle, "plugin_load_from_path", args, sizeof(args) / sizeof(args[0]));
 
+	if (ret == NULL)
+	{
+		goto plugin_load_from_path_error;
+	}
+
+	if (metacall_value_id(ret) != METACALL_INT)
+	{
+		goto plugin_load_from_path_type_error;
+	}
+
+	/* Retrieve the result value */
+	result = metacall_value_to_int(ret);
+
+plugin_load_from_path_type_error:
+	metacall_value_destroy(ret);
+plugin_load_from_path_error:
+	metacall_value_destroy(args[0]);
+	metacall_value_destroy(args[1]);
+plugin_extension_error:
+	return result;
+}
+
+int metacall_initialize(void)
+{
 	memory_allocator allocator;
 
 	/* Initialize logs by default to stdout if none has been defined */
@@ -193,16 +239,11 @@ int metacall_initialize(void)
 		return 1;
 	}
 
-	/* Load plugin extension */
-	if (metacall_load_from_file("ext", ext_scripts, sizeof(ext_scripts) / sizeof(ext_scripts[0]), &plugin_extension_handle) != 0)
+	/* Load core plugins */
+	if (metacall_plugin_extension_load() != 0)
 	{
 		log_write("metacall", LOG_LEVEL_WARNING, "MetaCall Plugin Extension could not be loaded");
 	}
-	else
-	{
-		/* TODO: Load core extensions */
-		/* ... */
-	}
 
 	metacall_initialize_flag = 0;