Notification iterator: transform precondition checks to BT_ASSERT_PRE()

[babeltrace.git] / plugins / ctf / fs-sink / writer.c

diff --git a/plugins/ctf/fs-sink/writer.c b/plugins/ctf/fs-sink/writer.c
index 8f383a519de7cef9e5e4407ce3b8390d7c1d3840..ccfa6f26fc03bd0552b067956212d5cf9567f1c9 100644 (file)
--- a/plugins/ctf/fs-sink/writer.c
+++ b/plugins/ctf/fs-sink/writer.c
@@ -26,26 +26,16 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/private-component-sink.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/notification-stream.h>
+#define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-WRITER"
+#include "logging.h"
+
+#include <babeltrace/babeltrace.h>
 #include <plugins-common.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <glib.h>
 #include "writer.h"
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
 
 static
 gboolean empty_trace_map(gpointer key, gpointer value, gpointer user_data)
@@ -133,7 +123,7 @@ enum bt_component_status handle_notification(
        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);
 
                if (!packet) {
@@ -147,7 +137,7 @@ enum bt_component_status handle_notification(
        }
        case BT_NOTIFICATION_TYPE_PACKET_END:
        {
-               struct bt_ctf_packet *packet =
+               struct bt_packet *packet =
                        bt_notification_packet_end_get_packet(notification);
 
                if (!packet) {
@@ -160,7 +150,7 @@ enum bt_component_status handle_notification(
        }
        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);
 
                if (!event) {
@@ -176,7 +166,7 @@ enum bt_component_status handle_notification(
        }
        case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
        {
-               struct bt_ctf_stream *stream =
+               struct bt_stream *stream =
                        bt_notification_stream_begin_get_stream(notification);
 
                if (!stream) {
@@ -189,7 +179,7 @@ enum bt_component_status handle_notification(
        }
        case BT_NOTIFICATION_TYPE_STREAM_END:
        {
-               struct bt_ctf_stream *stream =
+               struct bt_stream *stream =
                        bt_notification_stream_end_get_stream(notification);
 
                if (!stream) {
@@ -201,7 +191,7 @@ enum bt_component_status handle_notification(
                break;
        }
        default:
-               puts("Unhandled notification type");
+               break;
        }
 end:
        return ret;
@@ -216,22 +206,14 @@ void writer_component_port_connected(
        struct bt_private_connection *connection;
        struct writer_component *writer;
        enum bt_connection_status conn_status;
-       static const enum bt_notification_type notif_types[] = {
-               BT_NOTIFICATION_TYPE_EVENT,
-               BT_NOTIFICATION_TYPE_PACKET_BEGIN,
-               BT_NOTIFICATION_TYPE_PACKET_END,
-               BT_NOTIFICATION_TYPE_STREAM_BEGIN,
-               BT_NOTIFICATION_TYPE_STREAM_END,
-               BT_NOTIFICATION_TYPE_SENTINEL,
-       };
 
        writer = bt_private_component_get_user_data(component);
-       assert(writer);
-       assert(!writer->input_iterator);
+       BT_ASSERT(writer);
+       BT_ASSERT(!writer->input_iterator);
        connection = bt_private_port_get_private_connection(self_port);
-       assert(connection);
+       BT_ASSERT(connection);
        conn_status = bt_private_connection_create_notification_iterator(
-               connection, notif_types, &writer->input_iterator);
+               connection, &writer->input_iterator);
        if (conn_status != BT_CONNECTION_STATUS_OK) {
                writer->error = true;
        }
@@ -255,7 +237,7 @@ enum bt_component_status writer_run(struct bt_private_component *component)
        }
 
        it = writer_component->input_iterator;
-       assert(it);
+       BT_ASSERT(it);
        it_ret = bt_notification_iterator_next(it);
 
        switch (it_ret) {
@@ -274,7 +256,7 @@ enum bt_component_status writer_run(struct bt_private_component *component)
        }
 
        notification = bt_notification_iterator_get_notification(it);
-       assert(notification);
+       BT_ASSERT(notification);
        ret = handle_notification(writer_component, notification);
 end:
        bt_put(notification);
@@ -335,8 +317,7 @@ enum bt_component_status writer_component_init(
 
        value = bt_value_map_get(params, "path");
        if (!value || bt_value_is_null(value) || !bt_value_is_string(value)) {
-               fprintf(writer_component->err,
-                               "[error] output path parameter required\n");
+               BT_LOGE_STR("Missing mandatory \"path\" parameter.");
                ret = BT_COMPONENT_STATUS_INVALID;
                goto error;
        }
@@ -349,7 +330,7 @@ enum bt_component_status writer_component_init(
        bt_put(value);
 
        writer_component->base_path = g_string_new(path);
-       if (!writer_component) {
+       if (!writer_component->base_path) {
                ret = BT_COMPONENT_STATUS_ERROR;
                goto error;
        }