Split notification iterator API into base and specialized functions

[babeltrace.git] / plugins / lttng-utils / plugin.c

diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c
index d27f6728385f444468ea4e6780cb172e50c7c1a6..f7f42f430bca7f7bbdbf3b8848b39aa4900f69ea 100644 (file)
--- a/plugins/lttng-utils/plugin.c
+++ b/plugins/lttng-utils/plugin.c
@@ -30,7 +30,7 @@
 #include "logging.h"
 
 #include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/private-notification-iterator.h>
+#include <babeltrace/graph/private-connection-private-notification-iterator.h>
 #include <babeltrace/graph/connection.h>
 #include <babeltrace/graph/notification.h>
 #include <babeltrace/graph/notification-event.h>
@@ -95,11 +95,11 @@ void unref_trace(struct debug_info_trace *di_trace)
 }
 
 static
-void debug_info_iterator_destroy(struct bt_private_notification_iterator *it)
+void debug_info_iterator_destroy(struct bt_private_connection_private_notification_iterator *it)
 {
        struct debug_info_iterator *it_data;
 
-       it_data = bt_private_notification_iterator_get_user_data(it);
+       it_data = bt_private_connection_private_notification_iterator_get_user_data(it);
        assert(it_data);
 
        if (it_data->input_iterator_group) {
@@ -222,37 +222,33 @@ struct bt_notification *handle_notification(FILE *err,
                bt_put(writer_stream);
                break;
        }
-       case BT_NOTIFICATION_TYPE_INACTIVITY:
-       {
+       default:
                new_notification = bt_get(notification);
                break;
        }
-       default:
-               puts("Unhandled notification type");
-       }
 
 end:
        return new_notification;
 }
 
 static
-struct bt_notification_iterator_next_return debug_info_iterator_next(
-               struct bt_private_notification_iterator *iterator)
+struct bt_notification_iterator_next_method_return debug_info_iterator_next(
+               struct bt_private_connection_private_notification_iterator *iterator)
 {
        struct debug_info_iterator *debug_it = NULL;
        struct bt_private_component *component = NULL;
        struct debug_info_component *debug_info = NULL;
        struct bt_notification_iterator *source_it = NULL;
        struct bt_notification *notification;
-       struct bt_notification_iterator_next_return ret = {
+       struct bt_notification_iterator_next_method_return ret = {
                .status = BT_NOTIFICATION_ITERATOR_STATUS_OK,
                .notification = NULL,
        };
 
-       debug_it = bt_private_notification_iterator_get_user_data(iterator);
+       debug_it = bt_private_connection_private_notification_iterator_get_user_data(iterator);
        assert(debug_it);
 
-       component = bt_private_notification_iterator_get_private_component(iterator);
+       component = bt_private_connection_private_notification_iterator_get_private_component(iterator);
        assert(component);
        debug_info = bt_private_component_get_user_data(component);
        assert(debug_info);
@@ -283,7 +279,7 @@ end:
 
 static
 enum bt_notification_iterator_status debug_info_iterator_init(
-               struct bt_private_notification_iterator *iterator,
+               struct bt_private_connection_private_notification_iterator *iterator,
                struct bt_private_port *port)
 {
        enum bt_notification_iterator_status ret =
@@ -292,17 +288,9 @@ enum bt_notification_iterator_status debug_info_iterator_init(
        enum bt_connection_status conn_status;
        struct bt_private_connection *connection = NULL;
        struct bt_private_component *component =
-               bt_private_notification_iterator_get_private_component(iterator);
+               bt_private_connection_private_notification_iterator_get_private_component(iterator);
        struct debug_info_iterator *it_data = g_new0(struct debug_info_iterator, 1);
        struct bt_private_port *input_port;
-       static const enum bt_notification_type notif_types[] = {
-               BT_NOTIFICATION_TYPE_EVENT,
-               BT_NOTIFICATION_TYPE_STREAM_BEGIN,
-               BT_NOTIFICATION_TYPE_STREAM_END,
-               BT_NOTIFICATION_TYPE_PACKET_BEGIN,
-               BT_NOTIFICATION_TYPE_PACKET_END,
-               BT_NOTIFICATION_TYPE_SENTINEL,
-       };
 
        if (!it_data) {
                ret = BT_NOTIFICATION_ITERATOR_STATUS_NOMEM;
@@ -324,7 +312,7 @@ enum bt_notification_iterator_status debug_info_iterator_init(
        }
 
        conn_status = bt_private_connection_create_notification_iterator(
-                       connection, notif_types, &it_data->input_iterator);
+                       connection, NULL, &it_data->input_iterator);
        if (conn_status != BT_CONNECTION_STATUS_OK) {
                ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
                goto end;
@@ -336,7 +324,7 @@ enum bt_notification_iterator_status debug_info_iterator_init(
        it_data->trace_map = g_hash_table_new_full(g_direct_hash,
                        g_direct_equal, NULL, (GDestroyNotify) unref_trace);
 
-       it_ret = bt_private_notification_iterator_set_user_data(iterator, it_data);
+       it_ret = bt_private_connection_private_notification_iterator_set_user_data(iterator, it_data);
        if (it_ret) {
                goto end;
        }
@@ -366,7 +354,7 @@ enum bt_component_status init_from_params(
                if (value_ret) {
                        ret = BT_COMPONENT_STATUS_INVALID;
                        BT_LOGE_STR("Failed to retrieve debug-info-field-name value. "
-                                       "Expecting a string");
+                                       "Expecting a string.");
                }
                strcpy(debug_info_component->arg_debug_info_field_name, tmp);
                bt_put(value);
@@ -376,6 +364,7 @@ enum bt_component_status init_from_params(
                if (!debug_info_component->arg_debug_info_field_name) {
                        ret = BT_COMPONENT_STATUS_NOMEM;
                        BT_LOGE_STR("Missing field name.");
+                       goto end;
                }
                sprintf(debug_info_component->arg_debug_info_field_name,
                                "debug_info");
@@ -393,7 +382,7 @@ enum bt_component_status init_from_params(
                if (value_ret) {
                        ret = BT_COMPONENT_STATUS_INVALID;
                        BT_LOGE_STR("Failed to retrieve debug-dir value. "
-                                       "Expecting a string");
+                                       "Expecting a string.");
                }
        }
        bt_put(value);
@@ -410,7 +399,7 @@ enum bt_component_status init_from_params(
                if (value_ret) {
                        ret = BT_COMPONENT_STATUS_INVALID;
                        BT_LOGE_STR("Failed to retrieve target-prefix value. "
-                                       "Expecting a string");
+                                       "Expecting a string.");
                }
        }
        bt_put(value);
@@ -428,7 +417,7 @@ enum bt_component_status init_from_params(
                if (value_ret) {
                        ret = BT_COMPONENT_STATUS_INVALID;
                        BT_LOGE_STR("Failed to retrieve full-path value. "
-                                       "Expecting a boolean");
+                                       "Expecting a boolean.");
                }
 
                debug_info_component->arg_full_path = bool_val;