X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fwriter%2Fwrite.c;h=84fe77d4aea526dd0b2c27156908588ccc39d0e2;hb=01972692e6deb0bfe140c5ebbf60740f544b27ae;hp=442c0c48d2531f355b1e3fd7902188ba2b339dd1;hpb=bc506aa5ed05112f88f00cb451cba8fdf3abcb01;p=babeltrace.git diff --git a/plugins/writer/write.c b/plugins/writer/write.c index 442c0c48..84fe77d4 100644 --- a/plugins/writer/write.c +++ b/plugins/writer/write.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -39,174 +39,156 @@ #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; } @@ -264,12 +246,6 @@ 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); if (ret < 0) { fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__, @@ -369,41 +345,45 @@ 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( @@ -412,7 +392,7 @@ 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; } type = bt_ctf_stream_class_get_event_header_type(stream_class); @@ -420,7 +400,7 @@ 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( @@ -429,24 +409,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; } 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_clock; - } - ret_int = bt_ctf_stream_class_set_event_context_type( writer_stream_class, 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 +427,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; } @@ -649,11 +622,11 @@ struct bt_ctf_writer *insert_new_writer( enum bt_component_status ret; snprintf(trace_name, PATH_MAX, "%s/%s_%03d", - writer_component->base_path, - writer_component->trace_name_base, + writer_component->base_path->str, + writer_component->trace_name_base->str, writer_component->trace_id++); printf_verbose("CTF-Writer creating trace in %s\n", trace_name); - + ctf_writer = bt_ctf_writer_create(trace_name); if (!ctf_writer) { fprintf(writer_component->err, "[error] %s in %s:%d\n", @@ -1017,51 +990,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; } @@ -1094,7 +1103,6 @@ enum bt_component_status writer_output_event( __FILE__, __LINE__); goto end_put_event_class; } -// printf("%s\n", event_name); stream = bt_ctf_event_get_stream(event); if (!stream) {