X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=formats%2Fctf%2Fir%2Fstream-class.c;h=573fb421ebfe6c26e37df2f8b0bf36b8a4fc384d;hb=83509119a945fc77faff869daaf48627e1c4b3fa;hp=572d7424e658a0c6532f7734a69982b36b0dd9ab;hpb=142c561085c255bfe1466d298e77f84338ebc874;p=babeltrace.git diff --git a/formats/ctf/ir/stream-class.c b/formats/ctf/ir/stream-class.c index 572d7424..573fb421 100644 --- a/formats/ctf/ir/stream-class.c +++ b/formats/ctf/ir/stream-class.c @@ -34,13 +34,15 @@ #include #include #include +#include #include #include +#include #include #include static -void bt_ctf_stream_class_destroy(struct bt_ctf_ref *ref); +void bt_ctf_stream_class_destroy(struct bt_object *obj); static int init_event_header(struct bt_ctf_stream_class *stream_class); static @@ -62,28 +64,26 @@ struct bt_ctf_stream_class *bt_ctf_stream_class_create(const char *name) stream_class->name = g_string_new(name); stream_class->event_classes = g_ptr_array_new_with_free_func( - (GDestroyNotify)bt_ctf_event_class_put); + (GDestroyNotify) bt_put); if (!stream_class->event_classes) { - goto error_destroy; + goto error; } ret = init_event_header(stream_class); if (ret) { - goto error_destroy; + goto error; } ret = init_packet_context(stream_class); if (ret) { - goto error_destroy; + goto error; } - bt_ctf_ref_init(&stream_class->ref_count); + bt_object_init(stream_class, bt_ctf_stream_class_destroy); return stream_class; -error_destroy: - bt_ctf_stream_class_destroy(&stream_class->ref_count); - stream_class = NULL; error: + BT_PUT(stream_class); return stream_class; } @@ -98,7 +98,7 @@ struct bt_ctf_trace *bt_ctf_stream_class_get_trace( trace = stream_class->trace; if (trace) { - bt_ctf_trace_get(trace); + bt_get(trace); } end: return trace; @@ -143,7 +143,7 @@ struct bt_ctf_clock *bt_ctf_stream_class_get_clock( } clock = stream_class->clock; - bt_ctf_clock_get(clock); + bt_get(clock); end: return clock; } @@ -172,7 +172,7 @@ int bt_ctf_stream_class_set_clock(struct bt_ctf_stream_class *stream_class, mapped_clock = bt_ctf_field_type_integer_get_mapped_clock( timestamp_field); if (mapped_clock) { - bt_ctf_clock_put(mapped_clock); + bt_put(mapped_clock); goto end; } @@ -184,14 +184,14 @@ int bt_ctf_stream_class_set_clock(struct bt_ctf_stream_class *stream_class, } if (stream_class->clock) { - bt_ctf_clock_put(stream_class->clock); + bt_put(stream_class->clock); } stream_class->clock = clock; - bt_ctf_clock_get(clock); + bt_get(clock); end: if (timestamp_field) { - bt_ctf_field_type_put(timestamp_field); + bt_put(timestamp_field); } return ret; } @@ -219,13 +219,36 @@ int _bt_ctf_stream_class_set_id( return 0; } -int bt_ctf_stream_class_set_id(struct bt_ctf_stream_class *stream_class, - uint32_t id) +struct event_class_set_stream_id_data { + uint32_t stream_id; + int ret; +}; + +static +void event_class_set_stream_id(gpointer event_class, gpointer data) +{ + struct event_class_set_stream_id_data *typed_data = data; + + typed_data->ret |= bt_ctf_event_class_set_stream_id(event_class, + typed_data->stream_id); +} + +BT_HIDDEN +int bt_ctf_stream_class_set_id_no_check( + struct bt_ctf_stream_class *stream_class, uint32_t id) { int ret = 0; + struct event_class_set_stream_id_data data = + { .stream_id = id, .ret = 0 }; - if (!stream_class || stream_class->frozen) { - ret = -1; + /* + * Make sure all event classes have their "stream_id" attribute + * set to this value. + */ + g_ptr_array_foreach(stream_class->event_classes, + event_class_set_stream_id, &data); + ret = data.ret; + if (ret) { goto end; } @@ -237,6 +260,21 @@ end: return ret; } +int bt_ctf_stream_class_set_id(struct bt_ctf_stream_class *stream_class, + uint32_t id) +{ + int ret = 0; + + if (!stream_class || stream_class->frozen) { + ret = -1; + goto end; + } + + ret = bt_ctf_stream_class_set_id_no_check(stream_class, id); +end: + return ret; +} + static void event_class_exists(gpointer element, gpointer query) { @@ -302,6 +340,20 @@ int bt_ctf_stream_class_add_event_class( goto end; } + /* + * Resolve the event's sequence length and variant tags if the + * stream is already associated with a trace. Otherwise, this + * validation will be performed once the stream is registered + * to a trace. + */ + if (stream_class->trace) { + ret = bt_ctf_event_class_resolve_types(event_class, + stream_class->trace, stream_class); + if (ret) { + goto end; + } + } + /* Only set an event id if none was explicitly set before */ event_id = bt_ctf_event_class_get_id(event_class); if (event_id < 0) { @@ -317,7 +369,12 @@ int bt_ctf_stream_class_add_event_class( goto end; } - bt_ctf_event_class_get(event_class); + ret = bt_ctf_event_class_set_stream_id(event_class, stream_class->id); + if (ret) { + goto end; + } + + bt_get(event_class); g_ptr_array_add(stream_class->event_classes, event_class); bt_ctf_event_class_freeze(event_class); @@ -362,7 +419,7 @@ struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class( } event_class = g_ptr_array_index(stream_class->event_classes, index); - bt_ctf_event_class_get(event_class); + bt_get(event_class); end: return event_class; } @@ -385,7 +442,7 @@ struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_name( if (!strcmp(name, cur_event_class_name)) { event_class = cur_event_class; - bt_ctf_event_class_get(event_class); + bt_get(event_class); goto end; } } @@ -409,7 +466,7 @@ struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_id( if (bt_ctf_event_class_get_id(current_event_class) == id) { event_class = current_event_class; - bt_ctf_event_class_get(event_class); + bt_get(event_class); goto end; } } @@ -427,7 +484,7 @@ struct bt_ctf_field_type *bt_ctf_stream_class_get_packet_context_type( } assert(stream_class->packet_context_type); - bt_ctf_field_type_get(stream_class->packet_context_type); + bt_get(stream_class->packet_context_type); ret = stream_class->packet_context_type; end: return ret; @@ -455,8 +512,8 @@ int bt_ctf_stream_class_set_packet_context_type( goto end; } - bt_ctf_field_type_put(stream_class->packet_context_type); - bt_ctf_field_type_get(packet_context_type); + bt_put(stream_class->packet_context_type); + bt_get(packet_context_type); stream_class->packet_context_type = packet_context_type; end: return ret; @@ -472,7 +529,7 @@ struct bt_ctf_field_type *bt_ctf_stream_class_get_event_header_type( } assert(stream_class->event_header_type); - bt_ctf_field_type_get(stream_class->event_header_type); + bt_get(stream_class->event_header_type); ret = stream_class->event_header_type; end: return ret; @@ -500,8 +557,8 @@ int bt_ctf_stream_class_set_event_header_type( goto end; } - bt_ctf_field_type_put(stream_class->event_header_type); - bt_ctf_field_type_get(event_header_type); + bt_put(stream_class->event_header_type); + bt_get(event_header_type); stream_class->event_header_type = event_header_type; end: return ret; @@ -517,7 +574,7 @@ struct bt_ctf_field_type *bt_ctf_stream_class_get_event_context_type( } assert(stream_class->event_context_type); - bt_ctf_field_type_get(stream_class->event_context_type); + bt_get(stream_class->event_context_type); ret = stream_class->event_context_type; end: return ret; @@ -541,8 +598,8 @@ int bt_ctf_stream_class_set_event_context_type( goto end; } - bt_ctf_field_type_put(stream_class->event_context_type); - bt_ctf_field_type_get(event_context_type); + bt_put(stream_class->event_context_type); + bt_get(event_context_type); stream_class->event_context_type = event_context_type; end: return ret; @@ -550,20 +607,12 @@ end: void bt_ctf_stream_class_get(struct bt_ctf_stream_class *stream_class) { - if (!stream_class) { - return; - } - - bt_ctf_ref_get(&stream_class->ref_count); + bt_get(stream_class); } void bt_ctf_stream_class_put(struct bt_ctf_stream_class *stream_class) { - if (!stream_class) { - return; - } - - bt_ctf_ref_put(&stream_class->ref_count, bt_ctf_stream_class_destroy); + bt_put(stream_class); } BT_HIDDEN @@ -706,16 +755,12 @@ end: } static -void bt_ctf_stream_class_destroy(struct bt_ctf_ref *ref) +void bt_ctf_stream_class_destroy(struct bt_object *obj) { struct bt_ctf_stream_class *stream_class; - if (!ref) { - return; - } - - stream_class = container_of(ref, struct bt_ctf_stream_class, ref_count); - bt_ctf_clock_put(stream_class->clock); + stream_class = container_of(obj, struct bt_ctf_stream_class, base); + bt_put(stream_class->clock); if (stream_class->event_classes) { size_t i; @@ -736,11 +781,9 @@ void bt_ctf_stream_class_destroy(struct bt_ctf_ref *ref) g_string_free(stream_class->name, TRUE); } - bt_ctf_field_type_put(stream_class->event_header_type); - bt_ctf_field_type_put(stream_class->packet_context_type); - if (stream_class->event_context_type) { - bt_ctf_field_type_put(stream_class->event_context_type); - } + bt_put(stream_class->event_header_type); + bt_put(stream_class->packet_context_type); + bt_put(stream_class->event_context_type); g_free(stream_class); } @@ -773,16 +816,16 @@ int init_event_header(struct bt_ctf_stream_class *stream_class) } if (stream_class->event_header_type) { - bt_ctf_field_type_put(stream_class->event_header_type); + bt_put(stream_class->event_header_type); } stream_class->event_header_type = event_header_type; end: if (ret) { - bt_ctf_field_type_put(event_header_type); + bt_put(event_header_type); } - bt_ctf_field_type_put(_uint32_t); - bt_ctf_field_type_put(_uint64_t); + bt_put(_uint32_t); + bt_put(_uint64_t); return ret; } @@ -834,16 +877,14 @@ int init_packet_context(struct bt_ctf_stream_class *stream_class) goto end; } - if (stream_class->packet_context_type) { - bt_ctf_field_type_put(stream_class->packet_context_type); - } + bt_put(stream_class->packet_context_type); stream_class->packet_context_type = packet_context_type; end: if (ret) { - bt_ctf_field_type_put(packet_context_type); + bt_put(packet_context_type); goto end; } - bt_ctf_field_type_put(_uint64_t); + bt_put(_uint64_t); return ret; }