lib: remove clock class priority map, use default clock value

[babeltrace.git] / plugins / text / pretty / pretty.c

diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c
index 34b5254d67591c53623a23f3b7dab3caf0c3f172..1def0826b12e8a07b060c37c7ef65c8a4c1846ea 100644 (file)
--- a/plugins/text/pretty/pretty.c
+++ b/plugins/text/pretty/pretty.c
@@ -140,10 +140,6 @@ enum bt_component_status handle_notification(struct pretty_component *pretty,
        case BT_NOTIFICATION_TYPE_INACTIVITY:
                fprintf(stderr, "Inactivity notification\n");
                break;
-       case BT_NOTIFICATION_TYPE_DISCARDED_PACKETS:
-       case BT_NOTIFICATION_TYPE_DISCARDED_EVENTS:
-               ret = pretty_print_discarded_elements(pretty, notification);
-               break;
        default:
                break;
        }
@@ -152,11 +148,12 @@ enum bt_component_status handle_notification(struct pretty_component *pretty,
 }
 
 BT_HIDDEN
-void pretty_port_connected(
+enum bt_component_status pretty_port_connected(
                struct bt_private_component *component,
                struct bt_private_port *self_port,
                struct bt_port *other_port)
 {
+       enum bt_component_status status = BT_COMPONENT_STATUS_OK;
        enum bt_connection_status conn_status;
        struct bt_private_connection *connection;
        struct pretty_component *pretty;
@@ -169,29 +166,28 @@ void pretty_port_connected(
        conn_status = bt_private_connection_create_notification_iterator(
                connection, &pretty->input_iterator);
        if (conn_status != BT_CONNECTION_STATUS_OK) {
-               pretty->error = true;
+               status = BT_COMPONENT_STATUS_ERROR;
        }
 
        bt_put(connection);
+       return status;
 }
 
 BT_HIDDEN
 enum bt_component_status pretty_consume(struct bt_private_component *component)
 {
        enum bt_component_status ret;
-       struct bt_notification *notification = NULL;
+       bt_notification_array notifs;
        struct bt_notification_iterator *it;
        struct pretty_component *pretty =
                bt_private_component_get_user_data(component);
        enum bt_notification_iterator_status it_ret;
-
-       if (unlikely(pretty->error)) {
-               ret = BT_COMPONENT_STATUS_ERROR;
-               goto end;
-       }
+       uint64_t count = 0;
+       uint64_t i = 0;
 
        it = pretty->input_iterator;
-       it_ret = bt_notification_iterator_next(it);
+       it_ret = bt_private_connection_notification_iterator_next(it, &notifs,
+               &count);
 
        switch (it_ret) {
        case BT_NOTIFICATION_ITERATOR_STATUS_END:
@@ -208,11 +204,22 @@ enum bt_component_status pretty_consume(struct bt_private_component *component)
                goto end;
        }
 
-       notification = bt_notification_iterator_borrow_notification(it);
-       BT_ASSERT(notification);
-       ret = handle_notification(pretty, notification);
+       BT_ASSERT(it_ret == BT_NOTIFICATION_ITERATOR_STATUS_OK);
+
+       for (i = 0; i < count; i++) {
+               ret = handle_notification(pretty, notifs[i]);
+               if (ret) {
+                       goto end;
+               }
+
+               bt_put(notifs[i]);
+       }
 
 end:
+       for (; i < count; i++) {
+               bt_put(notifs[i]);
+       }
+
        return ret;
 }