X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fmuxer%2Fmuxer.c;h=b0cdfe5922a1e53d0265b370e55dd29be6ab4f4e;hb=64cadc660bbd0400df65da3534d28dbe59395ec7;hp=04171d75525f58f41b14716eb1c2bd42db8e9635;hpb=d3e4dcd8e7a601e0aa063455147f29fbe051582b;p=babeltrace.git

diff --git a/plugins/muxer/muxer.c b/plugins/muxer/muxer.c
index 04171d75..b0cdfe59 100644
--- a/plugins/muxer/muxer.c
+++ b/plugins/muxer/muxer.c
@@ -28,10 +28,11 @@
 
 #include <babeltrace/plugin/plugin-dev.h>
 #include <babeltrace/component/component.h>
-#include <babeltrace/component/filter.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
@@ -54,15 +55,16 @@ 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;
 	struct muxer *muxer = create_muxer();
@@ -72,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;
 	}
@@ -83,11 +85,18 @@ error:
 	return ret;
 }
 
-enum bt_component_status muxer_init_iterator(
-		struct bt_component *component,
-		struct bt_notification_iterator *iter)
+static
+struct bt_notification *muxer_iterator_get(
+		struct bt_private_notification_iterator *iterator)
+{
+	return NULL;
+}
+
+static
+enum bt_notification_iterator_status muxer_iterator_next(
+		struct bt_private_notification_iterator *iterator)
 {
-	return BT_COMPONENT_STATUS_OK;
+	return BT_NOTIFICATION_ITERATOR_STATUS_OK;
 }
 
 /* Initialize plug-in entry points. */
@@ -95,8 +104,9 @@ 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_init_iterator);
+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);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD(muxer, finalize_muxer);