Rename <babeltrace/component/...> -> <babeltrace/graph/...>

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

diff --git a/plugins/muxer/muxer.c b/plugins/muxer/muxer.c
index 745e0803f6b1c7cac5e1332aeaf5cdd78f9b9a5e..5ce38d894a56226e7f58bd62942234e1242a2800 100644 (file)
--- a/plugins/muxer/muxer.c
+++ b/plugins/muxer/muxer.c
@@ -27,11 +27,11 @@
  */
 
 #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 <babeltrace/graph/component.h>
+#include <babeltrace/graph/component-filter.h>
+#include <babeltrace/graph/notification.h>
+#include <babeltrace/graph/notification-iterator.h>
+#include <babeltrace/graph/notification-event.h>
 #include <plugins-common.h>
 #include "muxer.h"
 
@@ -55,15 +55,15 @@ end:
 }
 
 static
-void destroy_muxer(struct bt_component *component)
+void finalize_muxer(struct bt_private_component *component)
 {
-       void *data = bt_component_get_private_data(component);
+       void *data = bt_private_component_get_user_data(component);
 
        destroy_muxer_data(data);
 }
 
 enum bt_component_status muxer_component_init(
-       struct bt_component *component, struct bt_value *params,
+       struct bt_private_component *component, struct bt_value *params,
        UNUSED_VAR void *init_method_data)
 {
        enum bt_component_status ret;
@@ -74,7 +74,7 @@ enum bt_component_status muxer_component_init(
                goto end;
        }
 
-       ret = bt_component_set_private_data(component, muxer);
+       ret = bt_private_component_set_user_data(component, muxer);
        if (ret != BT_COMPONENT_STATUS_OK) {
                goto error;
        }
@@ -86,17 +86,14 @@ error:
 }
 
 static
-struct bt_notification *muxer_iterator_get(
-               struct bt_notification_iterator *iterator)
+struct bt_notification_iterator_next_return muxer_iterator_next(
+               struct bt_private_notification_iterator *iterator)
 {
-       return NULL;
-}
+       struct bt_notification_iterator_next_return ret = {
+               .status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR,
+       };
 
-static
-enum bt_notification_iterator_status muxer_iterator_next(
-               struct bt_notification_iterator *iterator)
-{
-       return BT_NOTIFICATION_ITERATOR_STATUS_OK;
+       return ret;
 }
 
 /* Initialize plug-in entry points. */
@@ -104,9 +101,8 @@ BT_PLUGIN(muxer);
 BT_PLUGIN_DESCRIPTION("Babeltrace Trace Muxer Plug-In.");
 BT_PLUGIN_AUTHOR("Jérémie Galarneau");
 BT_PLUGIN_LICENSE("MIT");
-BT_PLUGIN_FILTER_COMPONENT_CLASS(muxer, muxer_iterator_get,
-       muxer_iterator_next);
+BT_PLUGIN_FILTER_COMPONENT_CLASS(muxer, 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);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD(muxer, finalize_muxer);