Add internal BT_ASSERT() and BT_ASSERT_PRE() helpers

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

diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c
index 9f2d9c5e6cb8b323e71f12d7093c84f5c6fa7dde..266b4471d2ac1eb2e57e1fabf61ba88d3eb5aa7d 100644 (file)
--- a/plugins/lttng-utils/plugin.c
+++ b/plugins/lttng-utils/plugin.c
@@ -29,19 +29,7 @@
 #define BT_LOG_TAG "PLUGIN-CTF-LTTNG-UTILS-DEBUG-INFO-FLT"
 #include "logging.h"
 
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/private-notification-iterator.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-stream.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/private-component-filter.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/babeltrace.h>
 #include <plugins-common.h>
 #include <assert.h>
 #include "debug-info.h"
@@ -95,11 +83,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) {
@@ -126,9 +114,9 @@ struct bt_notification *handle_notification(FILE *err,
        switch (bt_notification_get_type(notification)) {
        case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
        {
-               struct bt_ctf_packet *packet =
+               struct bt_packet *packet =
                        bt_notification_packet_begin_get_packet(notification);
-               struct bt_ctf_packet *writer_packet;
+               struct bt_packet *writer_packet;
 
                if (!packet) {
                        goto end;
@@ -145,9 +133,9 @@ struct bt_notification *handle_notification(FILE *err,
        }
        case BT_NOTIFICATION_TYPE_PACKET_END:
        {
-               struct bt_ctf_packet *packet =
+               struct bt_packet *packet =
                        bt_notification_packet_end_get_packet(notification);
-               struct bt_ctf_packet *writer_packet;
+               struct bt_packet *writer_packet;
 
                if (!packet) {
                        goto end;
@@ -164,9 +152,9 @@ struct bt_notification *handle_notification(FILE *err,
        }
        case BT_NOTIFICATION_TYPE_EVENT:
        {
-               struct bt_ctf_event *event = bt_notification_event_get_event(
+               struct bt_event *event = bt_notification_event_get_event(
                                notification);
-               struct bt_ctf_event *writer_event;
+               struct bt_event *writer_event;
                struct bt_clock_class_priority_map *cc_prio_map =
                        bt_notification_event_get_clock_class_priority_map(
                                        notification);
@@ -186,9 +174,9 @@ struct bt_notification *handle_notification(FILE *err,
        }
        case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
        {
-               struct bt_ctf_stream *stream =
+               struct bt_stream *stream =
                        bt_notification_stream_begin_get_stream(notification);
-               struct bt_ctf_stream *writer_stream;
+               struct bt_stream *writer_stream;
 
                if (!stream) {
                        goto end;
@@ -205,9 +193,9 @@ struct bt_notification *handle_notification(FILE *err,
        }
        case BT_NOTIFICATION_TYPE_STREAM_END:
        {
-               struct bt_ctf_stream *stream =
+               struct bt_stream *stream =
                        bt_notification_stream_end_get_stream(notification);
-               struct bt_ctf_stream *writer_stream;
+               struct bt_stream *writer_stream;
 
                if (!stream) {
                        goto end;
@@ -232,23 +220,23 @@ end:
 }
 
 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);
@@ -279,7 +267,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 =
@@ -288,7 +276,7 @@ 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;
 
@@ -324,7 +312,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;
        }
@@ -354,7 +342,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);
@@ -364,6 +352,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");
@@ -372,7 +361,7 @@ enum bt_component_status init_from_params(
                goto end;
        }
 
-        value = bt_value_map_get(params, "debug-dir");
+        value = bt_value_map_get(params, "debug-info-dir");
        if (value) {
                enum bt_value_status value_ret;
 
@@ -380,8 +369,8 @@ enum bt_component_status init_from_params(
                                &debug_info_component->arg_debug_dir);
                if (value_ret) {
                        ret = BT_COMPONENT_STATUS_INVALID;
-                       BT_LOGE_STR("Failed to retrieve debug-dir value. "
-                                       "Expecting a string");
+                       BT_LOGE_STR("Failed to retrieve debug-info-dir value. "
+                                       "Expecting a string.");
                }
        }
        bt_put(value);
@@ -398,7 +387,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);
@@ -416,7 +405,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;