debug_info fix: useless reference

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

diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c
index e7cffbd1c57ff0e019a976fef99ee4ef7f4c7fa9..d55755992222d15bdd24364033af9f831f795443 100644 (file)
--- a/plugins/lttng-utils/plugin.c
+++ b/plugins/lttng-utils/plugin.c
@@ -165,7 +165,6 @@ struct bt_notification *handle_notification(FILE *err,
                                writer_packet);
                assert(new_notification);
                bt_put(packet);
-               bt_put(writer_packet);
                break;
        }
        case BT_NOTIFICATION_TYPE_EVENT:
@@ -209,6 +208,11 @@ struct bt_notification *handle_notification(FILE *err,
                bt_put(writer_stream);
                break;
        }
+       case BT_NOTIFICATION_TYPE_INACTIVITY:
+       {
+               new_notification = bt_get(notification);
+               break;
+       }
        default:
                puts("Unhandled notification type");
        }
@@ -263,30 +267,6 @@ end:
        return ret;
 }
 
-/*
-static
-struct bt_notification *debug_info_iterator_get(
-               struct bt_private_notification_iterator *iterator)
-{
-       struct debug_info_iterator *debug_it;
-
-       debug_it = bt_private_notification_iterator_get_user_data(iterator);
-       assert(debug_it);
-
-       if (!debug_it->current_notification) {
-               enum bt_notification_iterator_status it_ret;
-
-               it_ret = debug_info_iterator_next(iterator);
-               if (it_ret) {
-                       goto end;
-               }
-       }
-
-end:
-       return bt_get(debug_it->current_notification);
-}
-*/
-
 static
 enum bt_notification_iterator_status debug_info_iterator_init(
                struct bt_private_notification_iterator *iterator,
@@ -295,33 +275,47 @@ enum bt_notification_iterator_status debug_info_iterator_init(
        enum bt_notification_iterator_status ret =
                BT_NOTIFICATION_ITERATOR_STATUS_OK;
        enum bt_notification_iterator_status it_ret;
-       struct bt_private_port *input_port = NULL;
        struct bt_private_connection *connection = NULL;
        struct bt_private_component *component =
                bt_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_END,
+               BT_NOTIFICATION_TYPE_PACKET_BEGIN,
+               BT_NOTIFICATION_TYPE_PACKET_END,
+               BT_NOTIFICATION_TYPE_SENTINEL,
+       };
 
        if (!it_data) {
                ret = BT_NOTIFICATION_ITERATOR_STATUS_NOMEM;
                goto end;
        }
 
-       /* Create a new iterator on the upstream component. */
        input_port = bt_private_component_filter_get_input_private_port_by_name(
-               component, "in");
-       assert(input_port);
+                       component, "in");
+       if (!input_port) {
+               ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
+               goto end;
+       }
+
        connection = bt_private_port_get_private_connection(input_port);
-       assert(connection);
+       bt_put(input_port);
+       if (!connection) {
+               ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
+               goto end;
+       }
 
        it_data->input_iterator = bt_private_connection_create_notification_iterator(
-                       connection, NULL);
+                       connection, notif_types);
        if (!it_data->input_iterator) {
                ret = BT_NOTIFICATION_ITERATOR_STATUS_NOMEM;
                goto end;
        }
+
        it_data->debug_info_component = (struct debug_info_component *)
                bt_private_component_get_user_data(component);
-
        it_data->err = it_data->debug_info_component->err;
        it_data->trace_map = g_hash_table_new_full(g_direct_hash,
                        g_direct_equal, NULL, (GDestroyNotify) unref_trace);
@@ -341,7 +335,7 @@ enum bt_notification_iterator_status debug_info_iterator_init(
 
 end:
        bt_put(connection);
-       bt_put(input_port);
+       bt_put(component);
        return ret;
 }
 
@@ -419,14 +413,17 @@ enum bt_component_status init_from_params(
         value = bt_value_map_get(params, "full-path");
        if (value) {
                enum bt_value_status value_ret;
+               bt_bool bool_val;
 
                value_ret = bt_value_bool_get(value,
-                               &debug_info_component->arg_full_path);
+                               &bool_val);
                if (value_ret) {
                        ret = BT_COMPONENT_STATUS_INVALID;
                        printf_error("Failed to retrieve full-path value. "
                                        "Expecting a boolean");
                }
+
+               debug_info_component->arg_full_path = bool_val;
        }
        bt_put(value);
        if (ret != BT_COMPONENT_STATUS_OK) {
@@ -443,6 +440,7 @@ enum bt_component_status debug_info_component_init(
 {
        enum bt_component_status ret;
        struct debug_info_component *debug_info = create_debug_info_component_data();
+       struct bt_private_port *priv_port = NULL;
 
        if (!debug_info) {
                ret = BT_COMPONENT_STATUS_NOMEM;
@@ -454,6 +452,22 @@ enum bt_component_status debug_info_component_init(
                goto error;
        }
 
+       priv_port = bt_private_component_filter_add_input_private_port(
+               component, "in", NULL);
+       if (!priv_port) {
+               ret = BT_COMPONENT_STATUS_ERROR;
+               goto end;
+       }
+       BT_PUT(priv_port);
+
+       priv_port = bt_private_component_filter_add_output_private_port(
+               component, "out", NULL);
+       if (!priv_port) {
+               ret = BT_COMPONENT_STATUS_ERROR;
+               goto end;
+       }
+       BT_PUT(priv_port);
+
        ret = init_from_params(debug_info, params);
 end:
        return ret;