X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Ftrace.c;h=2cbfdb4e0e878ef1938fb3729a081d49918ba55e;hb=8bf65fbd5d6164488f1912f88ef632a58598ed2f;hp=660a2ed5c6abf438687345aa0083b3dbb6667f71;hpb=738537a613441515daf93e778beb7148014b1493;p=babeltrace.git diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c index 660a2ed5..2cbfdb4e 100644 --- a/formats/ctf/ir/trace.c +++ b/formats/ctf/ir/trace.c @@ -37,7 +37,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -46,6 +48,11 @@ #define DEFAULT_IDENTIFIER_SIZE 128 #define DEFAULT_METADATA_STRING_SIZE 4096 +struct notification_handler { + bt_ctf_notification_cb func; + void *data; +}; + static void bt_ctf_trace_destroy(struct bt_object *obj); static @@ -136,43 +143,6 @@ void bt_ctf_trace_destroy(struct bt_object *obj) g_free(trace); } -struct bt_ctf_stream *bt_ctf_trace_create_stream(struct bt_ctf_trace *trace, - struct bt_ctf_stream_class *stream_class) -{ - int ret; - int stream_class_found = 0; - size_t i; - struct bt_ctf_stream *stream = NULL; - - if (!trace || !stream_class) { - goto error; - } - - for (i = 0; i < trace->stream_classes->len; i++) { - if (trace->stream_classes->pdata[i] == stream_class) { - stream_class_found = 1; - } - } - - if (!stream_class_found) { - ret = bt_ctf_trace_add_stream_class(trace, stream_class); - if (ret) { - goto error; - } - } - - stream = bt_ctf_stream_create(stream_class, trace); - if (!stream) { - goto error; - } - - g_ptr_array_add(trace->streams, stream); - return stream; -error: - BT_PUT(stream); - return stream; -} - int bt_ctf_trace_set_environment_field(struct bt_ctf_trace *trace, const char *name, struct bt_value *value) { @@ -388,6 +358,15 @@ int bt_ctf_trace_add_clock(struct bt_ctf_trace *trace, bt_get(clock); g_ptr_array_add(trace->clocks, clock); + if (!trace->is_created_by_writer) { + /* + * Non-writer mode trace: disable clock value functions + * because clock values are per-stream in that + * situation. + */ + clock->has_value = 0; + } + if (trace->frozen) { bt_ctf_clock_freeze(clock); } @@ -440,6 +419,7 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace, struct bt_ctf_field_type *event_header_type = NULL; struct bt_ctf_field_type *stream_event_ctx_type = NULL; int event_class_count; + struct bt_ctf_clock *clock_to_add_to_trace = NULL; if (!trace || !stream_class) { ret = -1; @@ -459,6 +439,32 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace, } } + /* + * If the stream class has a clock, register this clock to this + * trace if not already done. + */ + if (stream_class->clock) { + const char *clock_name = + bt_ctf_clock_get_name(stream_class->clock); + struct bt_ctf_clock *trace_clock; + + assert(clock_name); + trace_clock = bt_ctf_trace_get_clock_by_name(trace, clock_name); + bt_put(trace_clock); + if (trace_clock) { + if (trace_clock != stream_class->clock) { + /* + * Error: two different clocks in the + * trace would share the same name. + */ + ret = -1; + goto end; + } + } else { + clock_to_add_to_trace = bt_get(stream_class->clock); + } + } + /* * We're about to freeze both the trace and the stream class. * Also, each event class contained in this stream class are @@ -621,6 +627,13 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace, trace->byte_order); bt_ctf_stream_class_set_byte_order(stream_class, trace->byte_order); + /* Add stream class's clock if it exists */ + if (clock_to_add_to_trace) { + int add_clock_ret = + bt_ctf_trace_add_clock(trace, clock_to_add_to_trace); + assert(add_clock_ret == 0); + } + /* * Freeze the trace and the stream class. */ @@ -641,6 +654,7 @@ end: g_free(ec_validation_outputs); bt_ctf_validation_output_put_types(&trace_sc_validation_output); + BT_PUT(clock_to_add_to_trace); assert(!packet_header_type); assert(!packet_context_type); assert(!event_header_type); @@ -1020,9 +1034,103 @@ end: return ret; } +static +int get_stream_class_count(void *element) +{ + return bt_ctf_trace_get_stream_class_count( + (struct bt_ctf_trace *) element); +} + +static +void *get_stream_class(void *element, int i) +{ + return bt_ctf_trace_get_stream_class( + (struct bt_ctf_trace *) element, i); +} + +static +int visit_stream_class(void *element, bt_ctf_ir_visitor visitor,void *data) +{ + return bt_ctf_stream_class_visit(element, visitor, data); +} + +int bt_ctf_trace_visit(struct bt_ctf_trace *trace, + bt_ctf_ir_visitor visitor, void *data) +{ + int ret; + struct bt_ctf_ir_element element = + { .element = trace, .type = BT_CTF_IR_TYPE_TRACE }; + + if (!trace || !visitor) { + ret = -1; + goto end; + } + + ret = visitor_helper(&element, get_stream_class_count, + get_stream_class, visit_stream_class, visitor, data); +end: + return ret; +} + +static +int ir_visitor(struct bt_ctf_ir_element *element, void *data) +{ + int ret = 0; + + switch (element->type) { + case BT_CTF_IR_TYPE_TRACE: + { + break; + } + case BT_CTF_IR_TYPE_STREAM_CLASS: + { + break; + } + case BT_CTF_IR_TYPE_EVENT_CLASS: + { + break; + } + default: + assert(0); + ret = -1; + goto end; + } +end: + return ret; +} + +int bt_ctf_trace_add_notification_handler_cb(struct bt_ctf_trace *trace, + bt_ctf_notification_cb handler, void *handler_data) +{ + int ret = 0; + struct notification_handler *handler_wrapper = + g_new0(struct notification_handler, 1); + + if (!trace || !handler || !handler_wrapper) { + ret = -1; + goto error; + } + + handler_wrapper->func = handler; + handler_wrapper->data = handler_data; + + /* Emit notifications describing the current schema. */ + ret = bt_ctf_trace_visit(trace, ir_visitor, handler_wrapper); + if (ret) { + goto error; + } + + g_ptr_array_add(trace->notification_handlers, handler_wrapper); + return ret; +error: + g_free(handler_wrapper); + return ret; +} + BT_HIDDEN struct bt_ctf_field_type *get_field_type(enum field_type_alias alias) { + int ret; unsigned int alignment, size; struct bt_ctf_field_type *field_type = NULL; @@ -1033,7 +1141,10 @@ struct bt_ctf_field_type *get_field_type(enum field_type_alias alias) alignment = field_type_aliases_alignments[alias]; size = field_type_aliases_sizes[alias]; field_type = bt_ctf_field_type_integer_create(size); - bt_ctf_field_type_set_alignment(field_type, alignment); + ret = bt_ctf_field_type_set_alignment(field_type, alignment); + if (ret) { + BT_PUT(field_type); + } end: return field_type; }