Refactor the plugin registration and loading machinery

[babeltrace.git] / plugins / ctf / plugin.c

diff --git a/plugins/ctf/plugin.c b/plugins/ctf/plugin.c
index ef6ed2fd9c42f3fac3adb39fc463d22ee7a67ae4..ff168d691c901fbfff377dcde2e870d70f18a3bf 100644 (file)
--- a/plugins/ctf/plugin.c
+++ b/plugins/ctf/plugin.c
@@ -1,5 +1,5 @@
 /*
- * symbols.c
+ * plugin.c
  *
  * Babeltrace CTF Plug-in Registration Symbols
  *
@@ -26,20 +26,21 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-macros.h>
-#include "fs/fs-internal.h"
+#include <babeltrace/plugin/plugin-dev.h>
+#include "fs/fs.h"
 #include "lttng-live/lttng-live-internal.h"
 
-/* Initialize plug-in entry points. */
-BT_PLUGIN_NAME("ctf");
-BT_PLUGIN_DESCRIPTION("Babeltrace CTF plug-in.");
+/* Initialize plug-in description. */
+BT_PLUGIN(ctf);
+BT_PLUGIN_DESCRIPTION("Built-in Babeltrace plug-in providing CTF read support.");
 BT_PLUGIN_AUTHOR("Jérémie Galarneau");
 BT_PLUGIN_LICENSE("MIT");
 
-BT_PLUGIN_COMPONENT_CLASSES_BEGIN
-BT_PLUGIN_SOURCE_COMPONENT_CLASS_ENTRY(CTF_FS_COMPONENT_NAME,
-               CTF_FS_COMPONENT_DESCRIPTION, ctf_fs_init);
-BT_PLUGIN_SOURCE_COMPONENT_CLASS_ENTRY(LTTNG_LIVE_COMPONENT_NAME,
-               LTTNG_LIVE_COMPONENT_DESCRIPTION, lttng_live_init);
-BT_PLUGIN_COMPONENT_CLASSES_END
-
+/* Declare component classes implemented by this plug-in. */
+BT_PLUGIN_COMPONENT_CLASS(BT_COMPONENT_TYPE_SOURCE, fs, ctf_fs_init);
+BT_PLUGIN_COMPONENT_CLASS_DESCRIPTION(BT_COMPONENT_TYPE_SOURCE, fs,
+        CTF_FS_COMPONENT_DESCRIPTION);
+BT_PLUGIN_COMPONENT_CLASS_WITH_ID(auto, lttng_live,
+        BT_COMPONENT_TYPE_SOURCE, "lttng-live", lttng_live_init);
+BT_PLUGIN_COMPONENT_CLASS_DESCRIPTION_WITH_ID(auto, lttng_live,
+        BT_COMPONENT_TYPE_SOURCE, LTTNG_LIVE_COMPONENT_DESCRIPTION);