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 ae6dae865a0591aa1ecf0153f71e22aecea44ad7..3bb7c0440e45dcdc39f25c759211670cc55e42fa 100644 (file)
--- a/include/babeltrace/plugin/plugin.h
+++ b/include/babeltrace/plugin/plugin.h
@@ -29,32 +29,37 @@
  */
 
 #include <babeltrace/plugin/component-factory.h>
+#include <babeltrace/plugin/component.h>
 
-#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)     void *__bt_plugin_init = (_x)
-#define BT_PLUGIN_EXIT(_x)     void *__bt_plugin_exit = (_x)
+typedef enum bt_component_status (*bt_plugin_init_func)(
+               struct bt_component_factory *factory);
+typedef void (*bt_plugin_exit_func)(void);
+
+/* 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)
 
 #define BT_PLUGIN_COMPONENT_CLASSES_BEGIN                      \
-       enum bt_status __bt_plugin_register_component_classes(\
+       enum bt_component_status __bt_plugin_register_component_classes(\
                struct bt_component_factory *factory)\
        {
 
-#define BT_PLUGIN_SOURCE_COMPONENT_CLASS_ENTRY(_name, _init, _fini, _it_cr) \
+#define BT_PLUGIN_SOURCE_COMPONENT_CLASS_ENTRY(_name, _init) \
        bt_component_factory_register_source_component_class(factory, \
-               _name, _init, _fini, _it_cr);
+               _name, _init);
 
-#define BT_PLUGIN_SINK_COMPONENT_CLASS_ENTRY(_name, _init, _fini, _hd_notif) \
+#define BT_PLUGIN_SINK_COMPONENT_CLASS_ENTRY(_name, _init) \
        bt_component_factory_register_sink_component_class(factory, \
-               _name, _init, _fini, _hd_notif);
+               _name, _init);
 
 #define BT_PLUGIN_COMPONENT_CLASSES_END\
        \
-       return BT_STATUS_OK;\
+       return BT_COMPONENT_STATUS_OK;\
 }\
        \
        BT_PLUGIN_INIT(__bt_plugin_register_component_classes);\
-       BT_PLUGIN_EXIT(NULL);
 
 #endif /* BABELTRACE_PLUGIN_H */