Set notification iterator methods to the component class

[babeltrace.git] / plugins / muxer / muxer.c

diff --git a/plugins/muxer/muxer.c b/plugins/muxer/muxer.c
index ba78cfb0dde15f8860c10f22f7cd9b308a303131..745e0803f6b1c7cac5e1332aeaf5cdd78f9b9a5e 100644 (file)
--- a/plugins/muxer/muxer.c
+++ b/plugins/muxer/muxer.c
@@ -26,12 +26,13 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-macros.h>
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/filter.h>
-#include <babeltrace/plugin/notification/notification.h>
-#include <babeltrace/plugin/notification/iterator.h>
-#include <babeltrace/plugin/notification/event.h>
+#include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/component/component.h>
+#include <babeltrace/component/component-filter.h>
+#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/component/notification/event.h>
+#include <plugins-common.h>
 #include "muxer.h"
 
 static
@@ -62,7 +63,8 @@ void destroy_muxer(struct bt_component *component)
 }
 
 enum bt_component_status muxer_component_init(
-       struct bt_component *component, struct bt_value *params)
+       struct bt_component *component, struct bt_value *params,
+       UNUSED_VAR void *init_method_data)
 {
        enum bt_component_status ret;
        struct muxer *muxer = create_muxer();
@@ -72,12 +74,6 @@ enum bt_component_status muxer_component_init(
                goto end;
        }
 
-       ret = bt_component_set_destroy_cb(component,
-                       destroy_muxer);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               goto error;
-       }
-
        ret = bt_component_set_private_data(component, muxer);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto error;
@@ -89,14 +85,28 @@ error:
        return ret;
 }
 
+static
+struct bt_notification *muxer_iterator_get(
+               struct bt_notification_iterator *iterator)
+{
+       return NULL;
+}
+
+static
+enum bt_notification_iterator_status muxer_iterator_next(
+               struct bt_notification_iterator *iterator)
+{
+       return BT_NOTIFICATION_ITERATOR_STATUS_OK;
+}
+
 /* Initialize plug-in entry points. */
-BT_PLUGIN_NAME("muxer");
+BT_PLUGIN(muxer);
 BT_PLUGIN_DESCRIPTION("Babeltrace Trace Muxer Plug-In.");
 BT_PLUGIN_AUTHOR("Jérémie Galarneau");
 BT_PLUGIN_LICENSE("MIT");
-
-BT_PLUGIN_COMPONENT_CLASSES_BEGIN
-BT_PLUGIN_FILTER_COMPONENT_CLASS_ENTRY("muxer",
-               "Time-correlate multiple traces.",
-               muxer_component_init)
-BT_PLUGIN_COMPONENT_CLASSES_END
+BT_PLUGIN_FILTER_COMPONENT_CLASS(muxer, muxer_iterator_get,
+       muxer_iterator_next);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_DESCRIPTION(muxer,
+       "Time-correlate multiple traces.");
+BT_PLUGIN_FILTER_COMPONENT_CLASS_INIT_METHOD(muxer, muxer_component_init);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_DESTROY_METHOD(muxer, destroy_muxer);