X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fstream-class.c;h=72b07b84c14cb26b98d983e908f4e88c18635dd3;hb=2607921689d4f7978382dfcac5bc7b4e766a42f1;hp=116befab0b6e3444bdfe925415ece33e4fe54296;hpb=3ea3311568f0b3703e71194a0bd2e899c876a26e;p=babeltrace.git diff --git a/formats/ctf/ir/stream-class.c b/formats/ctf/ir/stream-class.c index 116befab..72b07b84 100644 --- a/formats/ctf/ir/stream-class.c +++ b/formats/ctf/ir/stream-class.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -87,6 +88,23 @@ error: return stream_class; } +struct bt_ctf_trace *bt_ctf_stream_class_get_trace( + struct bt_ctf_stream_class *stream_class) +{ + struct bt_ctf_trace *trace = NULL; + + if (!stream_class) { + goto end; + } + + trace = stream_class->trace; + if (trace) { + bt_ctf_trace_get(trace); + } +end: + return trace; +} + const char *bt_ctf_stream_class_get_name( struct bt_ctf_stream_class *stream_class) { @@ -193,6 +211,56 @@ end: return ret; } +BT_HIDDEN +int _bt_ctf_stream_class_set_id( + struct bt_ctf_stream_class *stream_class, uint32_t id) +{ + stream_class->id = id; + stream_class->id_set = 1; + return 0; +} + +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 }; + + /* + * 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; + } + + ret = _bt_ctf_stream_class_set_id(stream_class, id); + if (ret) { + goto end; + } +end: + return ret; +} + int bt_ctf_stream_class_set_id(struct bt_ctf_stream_class *stream_class, uint32_t id) { @@ -203,12 +271,55 @@ int bt_ctf_stream_class_set_id(struct bt_ctf_stream_class *stream_class, goto end; } - stream_class->id = id; - stream_class->id_set = 1; + ret = bt_ctf_stream_class_set_id_no_check(stream_class, id); end: return ret; } +static +void event_class_exists(gpointer element, gpointer query) +{ + struct bt_ctf_event_class *event_class_a = element; + struct search_query *search_query = query; + struct bt_ctf_event_class *event_class_b = search_query->value; + int64_t id_a, id_b; + + if (search_query->value == element) { + search_query->found = 1; + goto end; + } + + /* + * Two event classes cannot share the same name in a given + * stream class. + */ + if (!strcmp(bt_ctf_event_class_get_name(event_class_a), + bt_ctf_event_class_get_name(event_class_b))) { + search_query->found = 1; + goto end; + } + + /* + * Two event classes cannot share the same ID in a given + * stream class. + */ + id_a = bt_ctf_event_class_get_id(event_class_a); + id_b = bt_ctf_event_class_get_id(event_class_b); + + if (id_a < 0 || id_b < 0) { + /* at least one ID is not set: will be automatically set later */ + goto end; + } + + if (id_a == id_b) { + search_query->found = 1; + goto end; + } + +end: + return; +} + int bt_ctf_stream_class_add_event_class( struct bt_ctf_stream_class *stream_class, struct bt_ctf_event_class *event_class) @@ -223,12 +334,27 @@ int bt_ctf_stream_class_add_event_class( /* Check for duplicate event classes */ struct search_query query = { .value = event_class, .found = 0 }; - g_ptr_array_foreach(stream_class->event_classes, value_exists, &query); + g_ptr_array_foreach(stream_class->event_classes, event_class_exists, + &query); if (query.found) { ret = -1; 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) { @@ -244,8 +370,26 @@ int bt_ctf_stream_class_add_event_class( goto end; } + ret = bt_ctf_event_class_set_stream_id(event_class, stream_class->id); + if (ret) { + goto end; + } + bt_ctf_event_class_get(event_class); g_ptr_array_add(stream_class->event_classes, event_class); + bt_ctf_event_class_freeze(event_class); + + if (stream_class->byte_order) { + /* + * Only set native byte order if it has been initialized + * when the stream class was added to a trace. + * + * If not set here, this will be set when the stream + * classe will be added to a trace. + */ + bt_ctf_event_class_set_native_byte_order(event_class, + stream_class->byte_order); + } end: return ret; } @@ -285,15 +429,35 @@ struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_name( struct bt_ctf_stream_class *stream_class, const char *name) { size_t i; - GQuark name_quark; struct bt_ctf_event_class *event_class = NULL; if (!stream_class || !name) { goto end; } - name_quark = g_quark_try_string(name); - if (!name_quark) { + for (i = 0; i < stream_class->event_classes->len; i++) { + struct bt_ctf_event_class *cur_event_class = + g_ptr_array_index(stream_class->event_classes, i); + const char *cur_event_class_name = + bt_ctf_event_class_get_name(cur_event_class); + + if (!strcmp(name, cur_event_class_name)) { + event_class = cur_event_class; + bt_ctf_event_class_get(event_class); + goto end; + } + } +end: + return event_class; +} + +struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_id( + struct bt_ctf_stream_class *stream_class, uint32_t id) +{ + size_t i; + struct bt_ctf_event_class *event_class = NULL; + + if (!stream_class) { goto end; } @@ -301,7 +465,7 @@ struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class_by_name( struct bt_ctf_event_class *current_event_class = g_ptr_array_index(stream_class->event_classes, i); - if (name_quark == current_event_class->name) { + if (bt_ctf_event_class_get_id(current_event_class) == id) { event_class = current_event_class; bt_ctf_event_class_get(event_class); goto end; @@ -463,8 +627,6 @@ void bt_ctf_stream_class_put(struct bt_ctf_stream_class *stream_class) BT_HIDDEN void bt_ctf_stream_class_freeze(struct bt_ctf_stream_class *stream_class) { - size_t i; - if (!stream_class) { return; } @@ -474,33 +636,18 @@ void bt_ctf_stream_class_freeze(struct bt_ctf_stream_class *stream_class) bt_ctf_field_type_freeze(stream_class->packet_context_type); bt_ctf_field_type_freeze(stream_class->event_context_type); bt_ctf_clock_freeze(stream_class->clock); - - bt_ctf_field_type_set_native_byte_order( - stream_class->event_header_type, stream_class->byte_order); - bt_ctf_field_type_set_native_byte_order( - stream_class->packet_context_type, stream_class->byte_order); - bt_ctf_field_type_set_native_byte_order( - stream_class->event_context_type, stream_class->byte_order); - for (i = 0; i < stream_class->event_classes->len; i++) { - bt_ctf_event_class_set_native_byte_order( - g_ptr_array_index(stream_class->event_classes, i), - stream_class->byte_order); - bt_ctf_event_class_freeze( - g_ptr_array_index(stream_class->event_classes, i)); - } } BT_HIDDEN int bt_ctf_stream_class_set_byte_order(struct bt_ctf_stream_class *stream_class, enum bt_ctf_byte_order byte_order) { - int ret = 0; + int i, ret = 0; int internal_byte_order; /* Note that "NATIVE" means the trace's endianness, not the host's. */ if (!stream_class || byte_order <= BT_CTF_BYTE_ORDER_UNKNOWN || - byte_order > BT_CTF_BYTE_ORDER_NETWORK || - stream_class->frozen) { + byte_order > BT_CTF_BYTE_ORDER_NETWORK) { ret = -1; goto end; } @@ -519,6 +666,23 @@ int bt_ctf_stream_class_set_byte_order(struct bt_ctf_stream_class *stream_class, } stream_class->byte_order = internal_byte_order; + + /* Set native byte order to little or big endian */ + bt_ctf_field_type_set_native_byte_order( + stream_class->event_header_type, stream_class->byte_order); + bt_ctf_field_type_set_native_byte_order( + stream_class->packet_context_type, stream_class->byte_order); + bt_ctf_field_type_set_native_byte_order( + stream_class->event_context_type, stream_class->byte_order); + + /* Set all events' native byte order */ + for (i = 0; i < stream_class->event_classes->len; i++) { + bt_ctf_event_class_set_native_byte_order( + g_ptr_array_index(stream_class->event_classes, i), + stream_class->byte_order); + bt_ctf_event_class_freeze( + g_ptr_array_index(stream_class->event_classes, i)); + } end: return ret; } @@ -577,6 +741,28 @@ end: return ret; } +BT_HIDDEN +int bt_ctf_stream_class_set_trace(struct bt_ctf_stream_class *stream_class, + struct bt_ctf_trace *trace) +{ + int ret = 0; + + if (!stream_class) { + ret = -1; + goto end; + } + + if (stream_class->trace && trace) { + /* Already attached to a trace */ + ret = -1; + goto end; + } + + stream_class->trace = trace; +end: + return ret; +} + static void bt_ctf_stream_class_destroy(struct bt_ctf_ref *ref) {