Notification iterator: transform precondition checks to BT_ASSERT_PRE()

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

diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c
index f7f42f430bca7f7bbdbf3b8848b39aa4900f69ea..0646f49ab248fe232eef889f6583cf50a143defd 100644 (file)
--- a/plugins/lttng-utils/plugin.c
+++ b/plugins/lttng-utils/plugin.c
@@ -29,21 +29,9 @@
 #define BT_LOG_TAG "PLUGIN-CTF-LTTNG-UTILS-DEBUG-INFO-FLT"
 #include "logging.h"
 
-#include <babeltrace/graph/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>
-#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 <babeltrace/assert-internal.h>
 #include "debug-info.h"
 #include "copy.h"
 
@@ -100,7 +88,7 @@ void debug_info_iterator_destroy(struct bt_private_connection_private_notificati
        struct debug_info_iterator *it_data;
 
        it_data = bt_private_connection_private_notification_iterator_get_user_data(it);
-       assert(it_data);
+       BT_ASSERT(it_data);
 
        if (it_data->input_iterator_group) {
                g_ptr_array_free(it_data->input_iterator_group, TRUE);
@@ -126,47 +114,47 @@ 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;
                }
 
                writer_packet = debug_info_new_packet(debug_it, packet);
-               assert(writer_packet);
+               BT_ASSERT(writer_packet);
                new_notification = bt_notification_packet_begin_create(
                                writer_packet);
-               assert(new_notification);
+               BT_ASSERT(new_notification);
                bt_put(packet);
                bt_put(writer_packet);
                break;
        }
        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;
                }
 
                writer_packet = debug_info_close_packet(debug_it, packet);
-               assert(writer_packet);
+               BT_ASSERT(writer_packet);
                new_notification = bt_notification_packet_end_create(
                                writer_packet);
-               assert(new_notification);
+               BT_ASSERT(new_notification);
                bt_put(packet);
                bt_put(writer_packet);
                break;
        }
        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);
@@ -175,49 +163,49 @@ struct bt_notification *handle_notification(FILE *err,
                        goto end;
                }
                writer_event = debug_info_output_event(debug_it, event);
-               assert(writer_event);
+               BT_ASSERT(writer_event);
                new_notification = bt_notification_event_create(writer_event,
                                cc_prio_map);
                bt_put(cc_prio_map);
-               assert(new_notification);
+               BT_ASSERT(new_notification);
                bt_put(event);
                bt_put(writer_event);
                break;
        }
        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;
                }
 
                writer_stream = debug_info_stream_begin(debug_it, stream);
-               assert(writer_stream);
+               BT_ASSERT(writer_stream);
                new_notification = bt_notification_stream_begin_create(
                                writer_stream);
-               assert(new_notification);
+               BT_ASSERT(new_notification);
                bt_put(stream);
                bt_put(writer_stream);
                break;
        }
        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;
                }
 
                writer_stream = debug_info_stream_end(debug_it, stream);
-               assert(writer_stream);
+               BT_ASSERT(writer_stream);
                new_notification = bt_notification_stream_end_create(
                                writer_stream);
-               assert(new_notification);
+               BT_ASSERT(new_notification);
                bt_put(stream);
                bt_put(writer_stream);
                break;
@@ -246,12 +234,12 @@ struct bt_notification_iterator_next_method_return debug_info_iterator_next(
        };
 
        debug_it = bt_private_connection_private_notification_iterator_get_user_data(iterator);
-       assert(debug_it);
+       BT_ASSERT(debug_it);
 
        component = bt_private_connection_private_notification_iterator_get_private_component(iterator);
-       assert(component);
+       BT_ASSERT(component);
        debug_info = bt_private_component_get_user_data(component);
-       assert(debug_info);
+       BT_ASSERT(debug_info);
 
        source_it = debug_it->input_iterator;
 
@@ -269,7 +257,7 @@ struct bt_notification_iterator_next_method_return debug_info_iterator_next(
 
        ret.notification = handle_notification(debug_info->err, debug_it,
                        notification);
-       assert(ret.notification);
+       BT_ASSERT(ret.notification);
        bt_put(notification);
 
 end:
@@ -312,7 +300,7 @@ enum bt_notification_iterator_status debug_info_iterator_init(
        }
 
        conn_status = bt_private_connection_create_notification_iterator(
-                       connection, NULL, &it_data->input_iterator);
+                       connection, &it_data->input_iterator);
        if (conn_status != BT_CONNECTION_STATUS_OK) {
                ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
                goto end;
@@ -343,7 +331,7 @@ enum bt_component_status init_from_params(
        struct bt_value *value = NULL;
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 
-       assert(params);
+       BT_ASSERT(params);
 
         value = bt_value_map_get(params, "debug-info-field-name");
        if (value) {
@@ -373,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;
 
@@ -381,7 +369,7 @@ 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. "
+                       BT_LOGE_STR("Failed to retrieve debug-info-dir value. "
                                        "Expecting a string.");
                }
        }