X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Fplugin.c;h=e87f83fe06135c1555e919b8dff7a81e63557d12;hb=d6e69534ef08a2dd8bff9eb5af1eab63736b3d31;hp=f84f9ce04ce30e8bcba67a593a5775a2be92420f;hpb=56a1ccedd4a58b6c87d1bbd94e22094ad5ac1a98;p=babeltrace.git

diff --git a/plugins/ctf/plugin.c b/plugins/ctf/plugin.c
index f84f9ce0..e87f83fe 100644
--- 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,55 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-macros.h>
-#include "fs/fs.h"
-#include "lttng-live/lttng-live-internal.h"
+#include <babeltrace/babeltrace.h>
+#include "fs-src/fs.h"
+
+#ifndef BT_BUILT_IN_PLUGINS
+BT_PLUGIN_MODULE();
+#endif
 
 /* Initialize plug-in description. */
-BT_PLUGIN_NAME("ctf");
-BT_PLUGIN_DESCRIPTION("Built-in Babeltrace plug-in providing CTF read support.");
-BT_PLUGIN_AUTHOR("Jérémie Galarneau");
+BT_PLUGIN(ctf);
+BT_PLUGIN_DESCRIPTION("CTF source and sink support");
+BT_PLUGIN_AUTHOR("Julien Desfossez, Mathieu Desnoyers, Jérémie Galarneau, Philippe Proulx");
 BT_PLUGIN_LICENSE("MIT");
 
-/* Declare component classes implemented by this plug-in. */
-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
+/* ctf.fs source */
+BT_PLUGIN_SOURCE_COMPONENT_CLASS(fs, ctf_fs_iterator_next);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_DESCRIPTION(fs,
+	"Read CTF traces from the file system.");
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_INIT_METHOD(fs, ctf_fs_init);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_QUERY_METHOD(fs, ctf_fs_query);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_FINALIZE_METHOD(fs, ctf_fs_finalize);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD(fs,
+	ctf_fs_iterator_init);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_FINALIZE_METHOD(fs,
+	ctf_fs_iterator_finalize);
+
+#if 0
+/* ctf.fs sink */
+BT_PLUGIN_SINK_COMPONENT_CLASS(fs, writer_run);
+BT_PLUGIN_SINK_COMPONENT_CLASS_INIT_METHOD(fs, writer_component_init);
+BT_PLUGIN_SINK_COMPONENT_CLASS_PORT_CONNECTED_METHOD(fs,
+		writer_component_port_connected);
+BT_PLUGIN_SINK_COMPONENT_CLASS_FINALIZE_METHOD(fs, writer_component_finalize);
+BT_PLUGIN_SINK_COMPONENT_CLASS_DESCRIPTION(fs, "Write CTF traces to the file system.");
+
+/* ctf.lttng-live source */
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_WITH_ID(auto, lttng_live, "lttng-live",
+	lttng_live_iterator_next);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_DESCRIPTION_WITH_ID(auto, lttng_live,
+        "Connect to an LTTng relay daemon and receive CTF streams.");
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_INIT_METHOD_WITH_ID(auto, lttng_live,
+	lttng_live_component_init);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_QUERY_METHOD_WITH_ID(auto, lttng_live,
+	lttng_live_query);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_FINALIZE_METHOD_WITH_ID(auto, lttng_live,
+	lttng_live_component_finalize);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_ACCEPT_PORT_CONNECTION_METHOD_WITH_ID(auto,
+	lttng_live, lttng_live_accept_port_connection);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_WITH_ID(
+	auto, lttng_live, lttng_live_iterator_init);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_MESSAGE_ITERATOR_FINALIZE_METHOD_WITH_ID(
+	auto, lttng_live, lttng_live_iterator_finalize);
+#endif