Plugin symbol resolving fix

[babeltrace.git] / include / babeltrace / plugin / plugin.h

diff --git a/include/babeltrace/plugin/plugin.h b/include/babeltrace/plugin/plugin.h
index 1c3c36d0ac734b5644735b16ccd90b9074a4fed6..3bb7c0440e45dcdc39f25c759211670cc55e42fa 100644 (file)
--- a/include/babeltrace/plugin/plugin.h
+++ b/include/babeltrace/plugin/plugin.h
@@ -5,6 +5,7 @@
  * BabelTrace - Babeltrace Plug-in Interface
  *
  * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright 2015 Philippe Proulx <pproulx@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -27,19 +28,38 @@
  * SOFTWARE.
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <babeltrace/plugin/component-factory.h>
+#include <babeltrace/plugin/component.h>
 
+typedef enum bt_component_status (*bt_plugin_init_func)(
+               struct bt_component_factory *factory);
+typedef void (*bt_plugin_exit_func)(void);
 
-int bt_plugin_set_error_stream(struct bt_plugin *plugin, FILE *error_stream);
+/* A plugin must define the __bt_plugin_init symbol */
+#define BT_PLUGIN_NAME(_x)     const char __bt_plugin_name[] = (_x)
+#define BT_PLUGIN_AUTHOR(_x)   const char __bt_plugin_author[] = (_x)
+#define BT_PLUGIN_LICENSE(_x)  const char __bt_plugin_license[] = (_x)
+#define BT_PLUGIN_INIT(_x)      bt_plugin_init_func __bt_plugin_init = (_x)
+#define BT_PLUGIN_EXIT(_x)      bt_plugin_exit_func __bt_plugin_exit = (_x)
 
-/* Refcounting */
-void bt_plugin_get(struct bt_plugin *plugin);
-void bt_plugin_put(struct bt_plugin *plugin);
+#define BT_PLUGIN_COMPONENT_CLASSES_BEGIN                      \
+       enum bt_component_status __bt_plugin_register_component_classes(\
+               struct bt_component_factory *factory)\
+       {
 
-#ifdef __cplusplus
-}
-#endif
+#define BT_PLUGIN_SOURCE_COMPONENT_CLASS_ENTRY(_name, _init) \
+       bt_component_factory_register_source_component_class(factory, \
+               _name, _init);
 
-#endif /* BABELTRACE_PLUGIN_SYSTEM_H */
+#define BT_PLUGIN_SINK_COMPONENT_CLASS_ENTRY(_name, _init) \
+       bt_component_factory_register_sink_component_class(factory, \
+               _name, _init);
+
+#define BT_PLUGIN_COMPONENT_CLASSES_END\
+       \
+       return BT_COMPONENT_STATUS_OK;\
+}\
+       \
+       BT_PLUGIN_INIT(__bt_plugin_register_component_classes);\
+
+#endif /* BABELTRACE_PLUGIN_H */