Merge streams in ctf fs component

[babeltrace.git] / include / babeltrace / plugin / notification / iterator.h

diff --git a/include/babeltrace/plugin/notification/iterator.h b/include/babeltrace/plugin/notification/iterator.h
index 18ee4f625a0d818013affa723d0fc0b5cf5f6757..06f1c8a59b40e55d3526dcc4f2f9dfd931af81a5 100644 (file)
--- a/include/babeltrace/plugin/notification/iterator.h
+++ b/include/babeltrace/plugin/notification/iterator.h
@@ -40,21 +40,19 @@ struct bt_notification_iterator;
  * Status code. Errors are always negative.
  */
 enum bt_notification_iterator_status {
+       /** No more notifications to be delivered. */
+       BT_NOTIFICATION_ITERATOR_STATUS_END = 1,
+       /** No error, okay. */
+       BT_NOTIFICATION_ITERATOR_STATUS_OK = 0,
        /** Invalid arguments. */
-       /* -22 for compatibility with -EINVAL */
-       BT_NOTIFICATION_ITERATOR_STATUS_EINVAL = -22,
-
-       /** End of trace. */
-       BT_NOTIFICATION_ITERATOR_STATUS_EOT = -3,
-
+       BT_NOTIFICATION_ITERATOR_STATUS_INVAL = -1,
        /** General error. */
        BT_NOTIFICATION_ITERATOR_STATUS_ERROR = -2,
-
+       /** Out of memory. */
+       BT_NOTIFICATION_ITERATOR_STATUS_NOMEM = -3,
        /** Unsupported iterator feature. */
-       BT_NOTIFICATION_ITERATOR_STATUS_UNSUPPORTED = -1,
+       BT_NOTIFICATION_ITERATOR_STATUS_UNSUPPORTED = -4,
 
-       /** No error, okay. */
-       BT_NOTIFICATION_ITERATOR_STATUS_OK = 0,
 };
 
 /**
@@ -80,7 +78,7 @@ enum bt_notification_iterator_seek_type {
  * @param iterator     Iterator instance
  * @returns            Returns a bt_notification instance
  *
- * @see bt_notification_put()
+ * @see bt_put()
  */
 extern struct bt_notification *bt_notification_iterator_get_notification(
                struct bt_notification_iterator *iterator);
@@ -116,29 +114,10 @@ bt_notification_iterator_next(struct bt_notification_iterator *iterator);
  * @see bt_notification_iterator_get_notification()
  */
 extern enum bt_notification_iterator_status *bt_notification_iterator_seek(
-               struct bt_notification_iterator *iterator,
-               int whence,
+               struct bt_notification_iterator *iterator, int whence,
                int64_t time);
 
-/**
- * Increments the reference count of \p iterator.
- *
- * @param iterator     Iterator of which to increment the reference count
- *
- * @see bt_notification_iterator_put()
- */
-extern void bt_notification_iterator_get(
-               struct bt_notification_iterator *iterator);
-
-/**
- * Decrements the reference count of \p iterator, destroying it when this
- * count reaches 0.
- *
- * @param iterator     Iterator of which to decrement the reference count
- *
- * @see bt_notification_iterator_get()
- */
-extern void bt_notification_iterator_put(
+extern struct bt_component *bt_notification_iterator_get_component(
                struct bt_notification_iterator *iterator);
 
 #ifdef __cplusplus