Error stream is now an attribute of the base plugin class

[babeltrace.git] / include / babeltrace / plugin / plugin-system.h

diff --git a/include/babeltrace/plugin/plugin-system.h b/include/babeltrace/plugin/plugin-system.h
index 02c1f6f384410908fd7d22bfb2d1f32033852f7e..7b955f4dac5494760f95ca9a230263b65b08494e 100644 (file)
--- a/include/babeltrace/plugin/plugin-system.h
+++ b/include/babeltrace/plugin/plugin-system.h
@@ -43,16 +43,6 @@ extern "C" {
  */
 typedef void (*bt_plugin_destroy_cb)(struct bt_plugin *plugin);
 
-/**
- * Plug-in error stream registration function type.
- *
- * @param plugin       Plug-in instance
- * @param error_stream Error stream, ownership is not transferred
- * @returns            One of #bt_plugin_status values
- */
-typedef enum bt_plugin_status (*bt_plugin_set_error_stream_cb)(
-               struct bt_plugin *plugin, FILE *error_stream);
-
 /**
  * Get a plug-in's private (implementation) data.
  *
@@ -61,15 +51,7 @@ typedef enum bt_plugin_status (*bt_plugin_set_error_stream_cb)(
  */
 extern void *bt_plugin_get_private_data(struct bt_plugin *plugin);
 
-/**
- * Set a callback permiting the registration of an error stream.
- *
- * @param plugin       Plug-in to which the callback should be registered
- * @param cb           Error stream registration callback
- */
-extern int bt_plugin_set_error_stream_cb(struct bt_plugin *plugin,
-               bt_plugin_set_error_stream_cb cb);
-
+       
 /* Plug-in initialization functions */
 /**
  * Allocate a source plug-in.
@@ -97,8 +79,10 @@ extern struct bt_plugin *bt_plugin_sink_create(const char *name,
                void *private_data, bt_plugin_destroy_func destroy_func,
                bt_plugin_sink_handle_notification_cb notification_cb);
 
+
+/* Notification iterator functions */
 /**
- * Allocate an notification iterator.
+ * Allocate a notification iterator.
  *
  * @param plugin               Plug-in instance
  * @param next_cb              Callback advancing to the next notification
@@ -110,6 +94,16 @@ extern struct bt_notification_iterator *bt_notification_iterator_create(
                bt_notification_iterator_next_cb next_cb,
                bt_notification_iterator_get_notification_cb notification_cb);
 
+/**
+ * Set an iterator's private data.
+ *
+ * @param plugin               Plug-in instance on which to iterate
+ * @param data                 Iterator private data
+ * @returns                    One of #bt_notification_iterator_status values
+ */
+extern enum bt_notification_iterator_status *bt_notification_iterator_create(
+               struct bt_plugin *plugin, void *data);
+
 #ifdef __cplusplus
 }
 #endif