Update notification iterator's "init" function signature

[babeltrace.git] / lib / component / iterator.c

diff --git a/lib/component/iterator.c b/lib/component/iterator.c
index cffa0d91a2570aa2fa768d575ffdb27aefd65cfd..d72f86499cba9c70e14ec2ff24b8262c7a7f18fb 100644 (file)
--- a/lib/component/iterator.c
+++ b/lib/component/iterator.c
@@ -54,8 +54,9 @@ void bt_notification_iterator_destroy(struct bt_object *obj)
 
                source_class = container_of(comp_class, struct bt_component_class_source, parent);
 
-               if (source_class->methods.iterator.destroy) {
-                       source_class->methods.iterator.destroy(iterator);
+               if (source_class->methods.iterator.finalize) {
+                       source_class->methods.iterator.finalize(
+                               bt_private_notification_iterator_from_notification_iterator(iterator));
                }
                break;
        }
@@ -65,8 +66,9 @@ void bt_notification_iterator_destroy(struct bt_object *obj)
 
                filter_class = container_of(comp_class, struct bt_component_class_filter, parent);
 
-               if (filter_class->methods.iterator.destroy) {
-                       filter_class->methods.iterator.destroy(iterator);
+               if (filter_class->methods.iterator.finalize) {
+                       filter_class->methods.iterator.finalize(
+                               bt_private_notification_iterator_from_notification_iterator(iterator));
                }
                break;
        }
@@ -75,6 +77,7 @@ void bt_notification_iterator_destroy(struct bt_object *obj)
                assert(0);
        }
 
+       BT_PUT(iterator->current_notification);
        BT_PUT(iterator->component);
        g_free(iterator);
 }
@@ -125,18 +128,24 @@ end:
        return ret;
 }
 
-void *bt_notification_iterator_get_private_data(
-               struct bt_notification_iterator *iterator)
+void *bt_private_notification_iterator_get_user_data(
+               struct bt_private_notification_iterator *private_iterator)
 {
+       struct bt_notification_iterator *iterator =
+               bt_notification_iterator_from_private(private_iterator);
+
        return iterator ? iterator->user_data : NULL;
 }
 
 enum bt_notification_iterator_status
-bt_notification_iterator_set_private_data(
-               struct bt_notification_iterator *iterator, void *data)
+bt_private_notification_iterator_set_user_data(
+               struct bt_private_notification_iterator *private_iterator,
+               void *data)
 {
        enum bt_notification_iterator_status ret =
                        BT_NOTIFICATION_ITERATOR_STATUS_OK;
+       struct bt_notification_iterator *iterator =
+               bt_notification_iterator_from_private(private_iterator);
 
        if (!iterator) {
                ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
@@ -151,48 +160,33 @@ end:
 struct bt_notification *bt_notification_iterator_get_notification(
                struct bt_notification_iterator *iterator)
 {
-       bt_component_class_notification_iterator_get_method get_method = NULL;
-
-       assert(iterator);
-       assert(iterator->component);
-       assert(iterator->component->class);
-
-       switch (iterator->component->class->type) {
-       case BT_COMPONENT_CLASS_TYPE_SOURCE:
-       {
-               struct bt_component_class_source *source_class =
-                       container_of(iterator->component->class,
-                               struct bt_component_class_source, parent);
+       struct bt_notification *notification = NULL;
 
-               assert(source_class->methods.iterator.get);
-               get_method = source_class->methods.iterator.get;
-               break;
+       if (!iterator) {
+               goto end;
        }
-       case BT_COMPONENT_CLASS_TYPE_FILTER:
-       {
-               struct bt_component_class_filter *filter_class =
-                       container_of(iterator->component->class,
-                               struct bt_component_class_filter, parent);
 
-               assert(filter_class->methods.iterator.get);
-               get_method = filter_class->methods.iterator.get;
-               break;
-       }
-       default:
-               assert(false);
-               break;
-       }
+       notification = bt_get(iterator->current_notification);
 
-       assert(get_method);
-       return get_method(iterator);
+end:
+       return notification;
 }
 
 enum bt_notification_iterator_status
 bt_notification_iterator_next(struct bt_notification_iterator *iterator)
 {
+       struct bt_private_notification_iterator *priv_iterator =
+               bt_private_notification_iterator_from_notification_iterator(iterator);
        bt_component_class_notification_iterator_next_method next_method = NULL;
+       struct bt_notification_iterator_next_return next_return;
+       enum bt_notification_iterator_status status =
+               BT_NOTIFICATION_ITERATOR_STATUS_OK;
+
+       if (!iterator) {
+               status = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
+               goto end;
+       }
 
-       assert(iterator);
        assert(iterator->component);
        assert(iterator->component->class);
 
@@ -223,7 +217,19 @@ bt_notification_iterator_next(struct bt_notification_iterator *iterator)
        }
 
        assert(next_method);
-       return next_method(iterator);
+       next_return = next_method(priv_iterator);
+       if (next_return.status == BT_NOTIFICATION_ITERATOR_STATUS_OK) {
+               if (!next_return.notification) {
+                       status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
+                       goto end;
+               }
+
+               BT_MOVE(iterator->current_notification,
+                       next_return.notification);
+       }
+
+end:
+       return next_return.status;
 }
 
 struct bt_component *bt_notification_iterator_get_component(
@@ -232,6 +238,15 @@ struct bt_component *bt_notification_iterator_get_component(
        return bt_get(iterator->component);
 }
 
+struct bt_private_component *
+bt_private_notification_iterator_get_private_component(
+               struct bt_private_notification_iterator *private_iterator)
+{
+       return bt_private_component_from_component(
+               bt_notification_iterator_get_component(
+                       bt_notification_iterator_from_private(private_iterator)));
+}
+
 enum bt_notification_iterator_status bt_notification_iterator_seek_time(
                struct bt_notification_iterator *iterator,
                enum bt_notification_iterator_seek_origin seek_origin,