Fix writer: missing put ref to values and types
[babeltrace.git] / plugins / writer / write.c
index 05f30dd9b017b440a9ac87cb4306a8e479dcff31..970eaea0c777a2275cbfbb6aaf792a7b8c069919 100644 (file)
@@ -31,7 +31,7 @@
 #include <babeltrace/ctf-ir/event-class.h>
 #include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/clock.h>
+#include <babeltrace/ctf-ir/clock-class.h>
 #include <babeltrace/ctf-ir/fields.h>
 #include <babeltrace/ctf-writer/stream-class.h>
 #include <babeltrace/ctf-writer/stream.h>
 #include "writer.h"
 
 static
-void tmp_clock(struct bt_ctf_writer *writer,
+enum bt_component_status copy_clock_class(FILE *err, struct bt_ctf_writer *writer,
                struct bt_ctf_stream_class *writer_stream_class,
-               struct bt_ctf_clock *writer_clock)
+               struct bt_ctf_clock_class *clock_class)
 {
-       const char *clock_description = "This is a test clock";
-       const uint64_t frequency = 1000000000ULL;
-       const uint64_t offset_s = 1351530929945824323;
-       const uint64_t precision = 10;
-       const int is_absolute = 0xFF;
-
-       bt_ctf_clock_set_description(writer_clock, clock_description);
-       bt_ctf_clock_set_frequency(writer_clock, frequency);
-       bt_ctf_clock_set_offset_s(writer_clock, offset_s);
-       bt_ctf_clock_set_precision(writer_clock, precision);
-       bt_ctf_clock_set_is_absolute(writer_clock, is_absolute);
-       bt_ctf_writer_add_clock(writer, writer_clock);
-       bt_ctf_stream_class_set_clock(writer_stream_class, writer_clock);
-}
-
-static
-enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer,
-               struct bt_ctf_stream_class *writer_stream_class,
-               struct bt_ctf_clock *clock,
-               struct bt_ctf_clock *writer_clock)
-{
-       enum bt_component_status ret;
        int64_t offset, offset_s;
        int int_ret;
        uint64_t u64_ret;
        const char *name, *description;
+       struct bt_ctf_clock_class *writer_clock_class = NULL;
+       struct bt_ctf_trace *trace = NULL;
+       enum bt_component_status ret;
 
-       name = bt_ctf_clock_get_name(clock);
+       name = bt_ctf_clock_class_get_name(clock_class);
        if (!name) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end;
        }
 
-       writer_clock = bt_ctf_clock_create(name);
-       if (!writer_clock) {
-               ret = BT_COMPONENT_STATUS_ERROR;
+       writer_clock_class = bt_ctf_clock_class_create(name);
+       if (!writer_clock_class) {
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end;
        }
 
-       description = bt_ctf_clock_get_description(clock);
+       description = bt_ctf_clock_class_get_description(clock_class);
        if (!description) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
 
-       int_ret = bt_ctf_clock_set_description(writer_clock,
+       int_ret = bt_ctf_clock_class_set_description(writer_clock_class,
                        description);
        if (int_ret != 0) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
 
-       u64_ret = bt_ctf_clock_get_frequency(clock);
+       u64_ret = bt_ctf_clock_class_get_frequency(clock_class);
        if (u64_ret == -1ULL) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
-       int_ret = bt_ctf_clock_set_frequency(writer_clock, u64_ret);
+       int_ret = bt_ctf_clock_class_set_frequency(writer_clock_class, u64_ret);
        if (int_ret != 0) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
 
-       u64_ret = bt_ctf_clock_get_precision(clock);
+       u64_ret = bt_ctf_clock_class_get_precision(clock_class);
        if (u64_ret == -1ULL) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
-       int_ret = bt_ctf_clock_set_precision(writer_clock, u64_ret);
+       int_ret = bt_ctf_clock_class_set_precision(writer_clock_class,
+               u64_ret);
        if (int_ret != 0) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
 
-       int_ret = bt_ctf_clock_get_offset_s(clock, &offset_s);
+       int_ret = bt_ctf_clock_class_get_offset_s(clock_class, &offset_s);
        if (int_ret != 0) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
 
-       int_ret = bt_ctf_clock_set_offset_s(writer_clock, offset_s);
+       int_ret = bt_ctf_clock_class_set_offset_s(writer_clock_class, offset_s);
        if (int_ret != 0) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
 
-       int_ret = bt_ctf_clock_get_offset(clock, &offset);
+       int_ret = bt_ctf_clock_class_get_offset_cycles(clock_class, &offset);
        if (int_ret != 0) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
 
-       int_ret = bt_ctf_clock_set_offset(writer_clock, offset);
+       int_ret = bt_ctf_clock_class_set_offset_cycles(writer_clock_class, offset);
        if (int_ret != 0) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
 
-       int_ret = bt_ctf_clock_get_is_absolute(clock);
+       int_ret = bt_ctf_clock_class_get_is_absolute(clock_class);
        if (int_ret == -1) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
-       int_ret = bt_ctf_clock_set_is_absolute(writer_clock, int_ret);
+
+       int_ret = bt_ctf_clock_class_set_is_absolute(writer_clock_class, int_ret);
        if (int_ret != 0) {
-               ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
 
-       ret = bt_ctf_writer_add_clock(writer, writer_clock);
-       if (ret != 0) {
+       trace = bt_ctf_writer_get_trace(writer);
+       if (!trace) {
                ret = BT_COMPONENT_STATUS_ERROR;
-               fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-                               __LINE__);
                goto end_destroy;
        }
 
-       ret = bt_ctf_stream_class_set_clock(writer_stream_class,
-                       writer_clock);
-       if (ret != 0) {
-               ret = BT_COMPONENT_STATUS_ERROR;
+       int_ret = bt_ctf_trace_add_clock_class(trace, writer_clock_class);
+       if (int_ret != 0) {
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end_destroy;
        }
+
        /*
         * Ownership transferred to the writer and the stream_class.
         */
-       bt_put(writer_clock);
-
+       bt_put(writer_clock_class);
        ret = BT_COMPONENT_STATUS_OK;
+
        goto end;
 
 end_destroy:
-       bt_put(writer_clock);
+       BT_PUT(writer_clock_class);
 end:
+       BT_PUT(trace);
        return ret;
 }
 
@@ -255,6 +237,7 @@ struct bt_ctf_event_class *copy_event_class(FILE *err, struct bt_ctf_event_class
 
                ret = bt_ctf_event_class_set_attribute(writer_event_class,
                                attr_name, attr_value);
+               bt_put(attr_value);
                if (ret < 0) {
                        fprintf(err, "[error] %s in %s:%d\n", __func__,
                                        __FILE__, __LINE__);
@@ -264,13 +247,8 @@ struct bt_ctf_event_class *copy_event_class(FILE *err, struct bt_ctf_event_class
        }
 
        context = bt_ctf_event_class_get_context_type(event_class);
-       if (!context) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-                               __LINE__);
-               goto end;
-       }
-
        ret = bt_ctf_event_class_set_context_type(writer_event_class, context);
+       bt_put(context);
        if (ret < 0) {
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
@@ -369,50 +347,55 @@ enum bt_component_status copy_stream_class(FILE *err,
 {
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
        struct bt_ctf_field_type *type;
-       int ret_int;
-       struct bt_ctf_clock *writer_clock;
+       int ret_int, clock_class_count, i;
+       struct bt_ctf_trace *trace;
 
-       writer_clock = bt_ctf_clock_create("monotonic");
-       if (!writer_clock) {
-               ret = BT_COMPONENT_STATUS_ERROR;
-               fprintf(err, "[error] Failed to create clock\n");
+       trace = bt_ctf_stream_class_get_trace(stream_class);
+       if (!trace) {
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
+               ret = BT_COMPONENT_STATUS_ERROR;
                goto end;
        }
 
-       tmp_clock(writer, writer_stream_class, writer_clock);
+       clock_class_count = bt_ctf_trace_get_clock_class_count(trace);
 
-       /*
-        * FIXME: waiting for the clock to work
-        *
-       struct bt_ctf_clock *clock;
-       clock = bt_ctf_stream_class_get_clock(stream_class);
-       if (!clock) {
-               ret = BT_COMPONENT_STATUS_ERROR;
-               goto end;
-       }
-       ret = copy_clock(err, writer, writer_stream_class, clock, writer_clock);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               goto end_put_clock;
+       for (i = 0; i < clock_class_count; i++) {
+               struct bt_ctf_clock_class *clock_class =
+                       bt_ctf_trace_get_clock_class(trace, i);
+
+               if (!clock_class) {
+                       fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+                                       __LINE__);
+                       ret = BT_COMPONENT_STATUS_ERROR;
+                       goto end_put_trace;
+               }
+
+               ret = copy_clock_class(err, writer, writer_stream_class, clock_class);
+               bt_put(clock_class);
+               if (ret != BT_COMPONENT_STATUS_OK) {
+                       fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+                                       __LINE__);
+                       goto end_put_trace;
+               }
        }
-       */
 
        type = bt_ctf_stream_class_get_packet_context_type(stream_class);
        if (!type) {
                ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
-               goto end_put_clock;
+               goto end_put_trace;
        }
 
        ret_int = bt_ctf_stream_class_set_packet_context_type(
                        writer_stream_class, type);
+       bt_put(type);
        if (ret_int < 0) {
                ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
-               goto end_put_clock;
+               goto end_put_trace;
        }
 
        type = bt_ctf_stream_class_get_event_header_type(stream_class);
@@ -420,16 +403,17 @@ enum bt_component_status copy_stream_class(FILE *err,
                ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
-               goto end_put_clock;
+               goto end_put_trace;
        }
 
        ret_int = bt_ctf_stream_class_set_event_header_type(
                        writer_stream_class, type);
+       bt_put(type);
        if (ret_int < 0) {
                ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
-               goto end_put_clock;
+               goto end_put_trace;
        }
 
        type = bt_ctf_stream_class_get_event_context_type(stream_class);
@@ -437,16 +421,16 @@ enum bt_component_status copy_stream_class(FILE *err,
                ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
-               goto end_put_clock;
+               goto end_put_trace;
        }
-
        ret_int = bt_ctf_stream_class_set_event_context_type(
                        writer_stream_class, type);
+       bt_put(type);
        if (ret_int < 0) {
                ret = BT_COMPONENT_STATUS_ERROR;
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
-               goto end_put_clock;
+               goto end_put_trace;
        }
 
        ret = copy_event_classes(err, writer, stream_class, writer_stream_class);
@@ -454,11 +438,11 @@ enum bt_component_status copy_stream_class(FILE *err,
                fprintf(err, "[error] Failed to copy event classes\n");
                fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                __LINE__);
-               goto end_put_clock;
+               goto end_put_trace;
        }
 
-end_put_clock:
-//     bt_put(clock);
+end_put_trace:
+       bt_put(trace);
 end:
        return ret;
 }
@@ -503,6 +487,7 @@ enum bt_component_status copy_trace(FILE *err, struct bt_ctf_writer *ctf_writer,
 
                ret_int = bt_ctf_trace_set_environment_field(writer_trace,
                                name, value);
+               bt_put(value);
                if (ret_int < 0) {
                        fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
                                        __LINE__);
@@ -1017,51 +1002,87 @@ struct bt_ctf_event *copy_event(FILE *err, struct bt_ctf_event *event,
                struct bt_ctf_event_class *writer_event_class)
 {
        struct bt_ctf_event *writer_event;
-       struct bt_ctf_field *field;
+       struct bt_ctf_field *field, *copy_field;
        int ret;
 
        writer_event = bt_ctf_event_create(writer_event_class);
        if (!writer_event) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
+               fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+                               __LINE__);
                goto end;
        }
 
        field = bt_ctf_event_get_header(event);
-       ret = bt_ctf_event_set_header(writer_event,
-                       bt_ctf_field_copy(field));
-       if (ret < 0) {
+       if (!field) {
                BT_PUT(writer_event);
-               fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
+               fprintf(err, "[error] %s in %s:%d\n", __func__,
+                               __FILE__, __LINE__);
                goto end;
        }
+       copy_field = bt_ctf_field_copy(field);
+       bt_put(field);
+       if (copy_field) {
+               ret = bt_ctf_event_set_header(writer_event, copy_field);
+               if (ret < 0) {
+                       fprintf(err, "[error] %s in %s:%d\n", __func__,
+                                       __FILE__, __LINE__);
+                       goto error;
+               }
+               bt_put(copy_field);
+       }
 
+       /* Optional field, so it can fail silently. */
        field = bt_ctf_event_get_stream_event_context(event);
-       ret = bt_ctf_event_set_stream_event_context(writer_event,
-                       bt_ctf_field_copy(field));
-       if (ret < 0) {
-               BT_PUT(writer_event);
-               fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
-               goto end;
+       copy_field = bt_ctf_field_copy(field);
+       bt_put(field);
+       if (copy_field) {
+               ret = bt_ctf_event_set_stream_event_context(writer_event,
+                               copy_field);
+               if (ret < 0) {
+                       fprintf(err, "[error] %s in %s:%d\n", __func__,
+                                       __FILE__, __LINE__);
+                       goto error;
+               }
+               bt_put(copy_field);
        }
 
+       /* Optional field, so it can fail silently. */
        field = bt_ctf_event_get_event_context(event);
-       ret = bt_ctf_event_set_event_context(writer_event,
-                       bt_ctf_field_copy(field));
-       if (ret < 0) {
-               BT_PUT(writer_event);
-               fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
-               goto end;
+       copy_field = bt_ctf_field_copy(field);
+       bt_put(field);
+       if (copy_field) {
+               ret = bt_ctf_event_set_event_context(writer_event, copy_field);
+               if (ret < 0) {
+                       fprintf(err, "[error] %s in %s:%d\n", __func__,
+                                       __FILE__, __LINE__);
+                       goto error;
+               }
+               bt_put(copy_field);
        }
 
        field = bt_ctf_event_get_payload_field(event);
-       ret = bt_ctf_event_set_payload_field(writer_event,
-                       bt_ctf_field_copy(field));
-       if (ret < 0) {
+       if (!field) {
                BT_PUT(writer_event);
-               fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__);
+               fprintf(err, "[error] %s in %s:%d\n", __func__,
+                               __FILE__, __LINE__);
                goto end;
        }
+       copy_field = bt_ctf_field_copy(field);
+       bt_put(field);
+       if (copy_field) {
+               ret = bt_ctf_event_set_payload_field(writer_event, copy_field);
+               if (ret < 0) {
+                       fprintf(err, "[error] %s in %s:%d\n", __func__,
+                                       __FILE__, __LINE__);
+                       goto error;
+               }
+               bt_put(copy_field);
+       }
+       goto end;
 
+error:
+       bt_put(copy_field);
+       BT_PUT(writer_event);
 end:
        return writer_event;
 }
This page took 0.029662 seconds and 4 git commands to generate.