X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fwriter%2Fwrite.c;h=970eaea0c777a2275cbfbb6aaf792a7b8c069919;hb=d00b90bff69bfea0b81e73c166f68ca9231636d4;hp=d2c07fecef8b9b23df9879c5e7dd014c28c6ee85;hpb=8c1a02212d7b1f7d2f75c4ef479fdd76949fe04a;p=babeltrace.git diff --git a/plugins/writer/write.c b/plugins/writer/write.c index d2c07fec..970eaea0 100644 --- a/plugins/writer/write.c +++ b/plugins/writer/write.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -39,18 +39,19 @@ #include "writer.h" static -enum bt_component_status copy_clock(FILE *err, 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 *clock) + struct bt_ctf_clock_class *clock_class) { int64_t offset, offset_s; int int_ret; uint64_t u64_ret; const char *name, *description; - struct bt_ctf_clock *writer_clock = NULL; + 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) { fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); @@ -58,15 +59,15 @@ enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer, goto end; } - writer_clock = bt_ctf_clock_create(name); - if (!writer_clock) { + 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) { fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); @@ -74,7 +75,7 @@ enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer, 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) { fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, @@ -83,14 +84,14 @@ enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer, 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) { 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) { fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); @@ -98,14 +99,15 @@ enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer, 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) { 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) { fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); @@ -113,7 +115,7 @@ enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer, 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) { fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); @@ -121,7 +123,7 @@ enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer, 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) { fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); @@ -129,7 +131,7 @@ enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer, 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) { fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); @@ -137,7 +139,7 @@ enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer, 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) { fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); @@ -145,7 +147,7 @@ enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer, 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) { fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); @@ -153,7 +155,7 @@ enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer, 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) { fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, __LINE__); @@ -161,7 +163,13 @@ enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer, goto end_destroy; } - int_ret = bt_ctf_writer_add_clock(writer, writer_clock); + trace = bt_ctf_writer_get_trace(writer); + if (!trace) { + ret = BT_COMPONENT_STATUS_ERROR; + goto end_destroy; + } + + 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__); @@ -172,14 +180,15 @@ enum bt_component_status copy_clock(FILE *err, struct bt_ctf_writer *writer, /* * 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; } @@ -228,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__); @@ -238,6 +248,7 @@ 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); 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__); @@ -336,7 +347,7 @@ 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, clock_count, i; + int ret_int, clock_class_count, i; struct bt_ctf_trace *trace; trace = bt_ctf_stream_class_get_trace(stream_class); @@ -347,20 +358,21 @@ enum bt_component_status copy_stream_class(FILE *err, goto end; } - clock_count = bt_ctf_trace_get_clock_count(trace); + clock_class_count = bt_ctf_trace_get_clock_class_count(trace); - for (i = 0; i < clock_count; i++) { - struct bt_ctf_clock *clock = bt_ctf_trace_get_clock(trace, i); + 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) { + 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(err, writer, writer_stream_class, clock); - bt_put(clock); + 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__); @@ -378,6 +390,7 @@ enum bt_component_status copy_stream_class(FILE *err, 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__, @@ -395,6 +408,7 @@ enum bt_component_status copy_stream_class(FILE *err, 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__, @@ -403,8 +417,15 @@ enum bt_component_status copy_stream_class(FILE *err, } type = bt_ctf_stream_class_get_event_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_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__, @@ -466,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__); @@ -980,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; }