X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fplugin%2Fplugin.h;h=616987223ca9023bfea2d64dd7da70ae2cc92b21;hb=b841eced73b140d37c264befa35279e8b357c0d3;hp=edaad960f0a4738e746e07ac4ee604570268980b;hpb=7151fb67130ebbdc531424a4b87461e781da001f;p=babeltrace.git

diff --git a/src/lib/plugin/plugin.h b/src/lib/plugin/plugin.h
index edaad960..61698722 100644
--- a/src/lib/plugin/plugin.h
+++ b/src/lib/plugin/plugin.h
@@ -34,10 +34,11 @@
 #include <glib.h>
 
 #include "plugin-so.h"
+#include "lib/func-status.h"
 
 /* Protection: this file uses BT_LIB_LOG*() macros directly */
 #ifndef BT_LIB_LOG_SUPPORTED
-# error Please include "lib/lib-logging.h" before including this file.
+# error Please include "lib/logging.h" before including this file.
 #endif
 
 enum bt_plugin_type {
@@ -45,12 +46,6 @@ enum bt_plugin_type {
 	BT_PLUGIN_TYPE_PYTHON = 1,
 };
 
-enum bt_plugin_status {
-	BT_PLUGIN_STATUS_OK = 0,
-	BT_PLUGIN_STATUS_ERROR = -1,
-	BT_PLUGIN_STATUS_NOMEM = -12,
-};
-
 struct bt_plugin {
 	struct bt_object base;
 	enum bt_plugin_type type;
@@ -93,21 +88,6 @@ struct bt_plugin_set {
 	GPtrArray *plugins;
 };
 
-static inline
-const char *bt_plugin_status_string(enum bt_plugin_status status)
-{
-	switch (status) {
-	case BT_PLUGIN_STATUS_OK:
-		return "BT_PLUGIN_STATUS_OK";
-	case BT_PLUGIN_STATUS_ERROR:
-		return "BT_PLUGIN_STATUS_ERROR";
-	case BT_PLUGIN_STATUS_NOMEM:
-		return "BT_PLUGIN_STATUS_NOMEM";
-	default:
-		return "(unknown)";
-	}
-}
-
 static inline
 const char *bt_plugin_type_string(enum bt_plugin_type type)
 {
@@ -195,7 +175,7 @@ struct bt_plugin *bt_plugin_create_empty(enum bt_plugin_type type)
 
 	plugin = g_new0(struct bt_plugin, 1);
 	if (!plugin) {
-		BT_LOGE_STR("Failed to allocate one plugin.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one plugin.");
 		goto error;
 	}
 
@@ -207,7 +187,7 @@ struct bt_plugin *bt_plugin_create_empty(enum bt_plugin_type type)
 		g_ptr_array_new_with_free_func(
 			(GDestroyNotify) bt_object_put_ref);
 	if (!plugin->src_comp_classes) {
-		BT_LOGE_STR("Failed to allocate a GPtrArray.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray.");
 		goto error;
 	}
 
@@ -215,7 +195,7 @@ struct bt_plugin *bt_plugin_create_empty(enum bt_plugin_type type)
 		g_ptr_array_new_with_free_func(
 			(GDestroyNotify) bt_object_put_ref);
 	if (!plugin->flt_comp_classes) {
-		BT_LOGE_STR("Failed to allocate a GPtrArray.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray.");
 		goto error;
 	}
 
@@ -223,44 +203,44 @@ struct bt_plugin *bt_plugin_create_empty(enum bt_plugin_type type)
 		g_ptr_array_new_with_free_func(
 			(GDestroyNotify) bt_object_put_ref);
 	if (!plugin->sink_comp_classes) {
-		BT_LOGE_STR("Failed to allocate a GPtrArray.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray.");
 		goto error;
 	}
 
 	/* Create empty info */
 	plugin->info.name = g_string_new(NULL);
 	if (!plugin->info.name) {
-		BT_LOGE_STR("Failed to allocate a GString.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
 		goto error;
 	}
 
 	plugin->info.path = g_string_new(NULL);
 	if (!plugin->info.path) {
-		BT_LOGE_STR("Failed to allocate a GString.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
 		goto error;
 	}
 
 	plugin->info.description = g_string_new(NULL);
 	if (!plugin->info.description) {
-		BT_LOGE_STR("Failed to allocate a GString.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
 		goto error;
 	}
 
 	plugin->info.author = g_string_new(NULL);
 	if (!plugin->info.author) {
-		BT_LOGE_STR("Failed to allocate a GString.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
 		goto error;
 	}
 
 	plugin->info.license = g_string_new(NULL);
 	if (!plugin->info.license) {
-		BT_LOGE_STR("Failed to allocate a GString.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
 		goto error;
 	}
 
 	plugin->info.version.extra = g_string_new(NULL);
 	if (!plugin->info.version.extra) {
-		BT_LOGE_STR("Failed to allocate a GString.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
 		goto error;
 	}
 
@@ -349,7 +329,7 @@ void bt_plugin_set_version(struct bt_plugin *plugin, unsigned int major,
 }
 
 static inline
-enum bt_plugin_status bt_plugin_add_component_class(
+int bt_plugin_add_component_class(
 	struct bt_plugin *plugin, struct bt_component_class *comp_class)
 {
 	GPtrArray *comp_classes;
@@ -371,6 +351,11 @@ enum bt_plugin_status bt_plugin_add_component_class(
 		abort();
 	}
 
+	/* Set component class's original plugin name */
+	BT_ASSERT(comp_class->plugin_name);
+	BT_ASSERT(plugin->info.name);
+	g_string_assign(comp_class->plugin_name, plugin->info.name->str);
+
 	/* Add new component class */
 	bt_object_get_ref(comp_class);
 	g_ptr_array_add(comp_classes, comp_class);
@@ -382,7 +367,7 @@ enum bt_plugin_status bt_plugin_add_component_class(
 
 	BT_LIB_LOGD("Added component class to plugin: "
 		"%![plugin-]+l, %![cc-]+C", plugin, comp_class);
-	return BT_PLUGIN_STATUS_OK;
+	return BT_FUNC_STATUS_OK;
 }
 
 static
@@ -420,7 +405,7 @@ struct bt_plugin_set *bt_plugin_set_create(void)
 	plugin_set->plugins = g_ptr_array_new_with_free_func(
 		(GDestroyNotify) bt_object_put_ref);
 	if (!plugin_set->plugins) {
-		BT_LOGE_STR("Failed to allocate a GPtrArray.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray.");
 		BT_OBJECT_PUT_REF_AND_RESET(plugin_set);
 		goto end;
 	}