X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fstream-class.c;h=6ad2cfa1583aaae18374b3276d866de8eaae660f;hb=247249335e46bf943fbbcb994ce10fcf82b89e3a;hp=48c3d4c5c10970a37b8219a862c555185d45115b;hpb=d2dc44b6775655cf77a13a3901898c3f1ca26baa;p=babeltrace.git diff --git a/formats/ctf/ir/stream-class.c b/formats/ctf/ir/stream-class.c index 48c3d4c5..6ad2cfa1 100644 --- a/formats/ctf/ir/stream-class.c +++ b/formats/ctf/ir/stream-class.c @@ -35,24 +35,23 @@ #include #include #include +#include #include #include static void bt_ctf_stream_class_destroy(struct bt_ctf_ref *ref); static -int init_event_header(struct bt_ctf_stream_class *stream_class, - enum bt_ctf_byte_order byte_order); +int init_event_header(struct bt_ctf_stream_class *stream_class); static -int init_packet_context(struct bt_ctf_stream_class *stream_class, - enum bt_ctf_byte_order byte_order); +int init_packet_context(struct bt_ctf_stream_class *stream_class); struct bt_ctf_stream_class *bt_ctf_stream_class_create(const char *name) { int ret; struct bt_ctf_stream_class *stream_class = NULL; - if (!name || !strlen(name)) { + if (name && bt_ctf_validate_identifier(name)) { goto error; } @@ -68,7 +67,12 @@ struct bt_ctf_stream_class *bt_ctf_stream_class_create(const char *name) goto error_destroy; } - ret = init_packet_context(stream_class, BT_CTF_BYTE_ORDER_NATIVE); + ret = init_event_header(stream_class); + if (ret) { + goto error_destroy; + } + + ret = init_packet_context(stream_class); if (ret) { goto error_destroy; } @@ -97,6 +101,21 @@ end: return name; } +int bt_ctf_stream_class_set_name(struct bt_ctf_stream_class *stream_class, + const char *name) +{ + int ret = 0; + + if (!stream_class || stream_class->frozen) { + ret = -1; + goto end; + } + + g_string_assign(stream_class->name, name); +end: + return ret; +} + struct bt_ctf_clock *bt_ctf_stream_class_get_clock( struct bt_ctf_stream_class *stream_class) { @@ -116,12 +135,37 @@ int bt_ctf_stream_class_set_clock(struct bt_ctf_stream_class *stream_class, struct bt_ctf_clock *clock) { int ret = 0; + struct bt_ctf_field_type *timestamp_field = NULL; if (!stream_class || !clock || stream_class->frozen) { ret = -1; goto end; } + /* + * Look for a "timestamp" field in the stream class' event header type + * and map the stream's clock to that field if no current mapping is + * currently set. + */ + timestamp_field = bt_ctf_field_type_structure_get_field_type_by_name( + stream_class->event_header_type, "timestamp"); + if (timestamp_field) { + struct bt_ctf_clock *mapped_clock; + + mapped_clock = bt_ctf_field_type_integer_get_mapped_clock( + timestamp_field); + if (mapped_clock) { + bt_ctf_clock_put(mapped_clock); + goto end; + } + + ret = bt_ctf_field_type_integer_set_mapped_clock( + timestamp_field, clock); + if (ret) { + goto end; + } + } + if (stream_class->clock) { bt_ctf_clock_put(stream_class->clock); } @@ -129,6 +173,9 @@ int bt_ctf_stream_class_set_clock(struct bt_ctf_stream_class *stream_class, stream_class->clock = clock; bt_ctf_clock_get(clock); end: + if (timestamp_field) { + bt_ctf_field_type_put(timestamp_field); + } return ret; } @@ -146,18 +193,29 @@ 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; +} + int bt_ctf_stream_class_set_id(struct bt_ctf_stream_class *stream_class, uint32_t id) { int ret = 0; - if (!stream_class) { + if (!stream_class || stream_class->frozen) { ret = -1; goto end; } - stream_class->id = id; - stream_class->id_set = 1; + ret = _bt_ctf_stream_class_set_id(stream_class, id); + if (ret) { + goto end; + } end: return ret; } @@ -199,31 +257,45 @@ int bt_ctf_stream_class_add_event_class( 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; } -int64_t bt_ctf_stream_class_get_event_class_count( +int bt_ctf_stream_class_get_event_class_count( struct bt_ctf_stream_class *stream_class) { - int64_t ret; + int ret; if (!stream_class) { ret = -1; goto end; } - ret = (int64_t) stream_class->event_classes->len; + ret = (int) stream_class->event_classes->len; end: return ret; } struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class( - struct bt_ctf_stream_class *stream_class, size_t index) + struct bt_ctf_stream_class *stream_class, int index) { struct bt_ctf_event_class *event_class = NULL; - if (!stream_class || index >= stream_class->event_classes->len) { + if (!stream_class || index < 0 || + index >= stream_class->event_classes->len) { goto end; } @@ -285,13 +357,16 @@ int bt_ctf_stream_class_set_packet_context_type( { int ret = 0; - if (!stream_class || !packet_context_type) { + if (!stream_class || !packet_context_type || stream_class->frozen) { ret = -1; goto end; } assert(stream_class->packet_context_type); - if (bt_ctf_field_type_get_type_id(stream_class->packet_context_type) != + if (stream_class->packet_context_type == packet_context_type) { + goto end; + } + if (bt_ctf_field_type_get_type_id(packet_context_type) != CTF_TYPE_STRUCT) { /* A packet context must be a structure */ ret = -1; @@ -305,6 +380,92 @@ end: return ret; } +struct bt_ctf_field_type *bt_ctf_stream_class_get_event_header_type( + struct bt_ctf_stream_class *stream_class) +{ + struct bt_ctf_field_type *ret = NULL; + + if (!stream_class || !stream_class->event_header_type) { + goto end; + } + + assert(stream_class->event_header_type); + bt_ctf_field_type_get(stream_class->event_header_type); + ret = stream_class->event_header_type; +end: + return ret; +} + +int bt_ctf_stream_class_set_event_header_type( + struct bt_ctf_stream_class *stream_class, + struct bt_ctf_field_type *event_header_type) +{ + int ret = 0; + + if (!stream_class || !event_header_type || stream_class->frozen) { + ret = -1; + goto end; + } + + assert(stream_class->event_header_type); + if (stream_class->event_header_type == event_header_type) { + goto end; + } + if (bt_ctf_field_type_get_type_id(event_header_type) != + CTF_TYPE_STRUCT) { + /* An event header must be a structure */ + ret = -1; + goto end; + } + + bt_ctf_field_type_put(stream_class->event_header_type); + bt_ctf_field_type_get(event_header_type); + stream_class->event_header_type = event_header_type; +end: + return ret; +} + +struct bt_ctf_field_type *bt_ctf_stream_class_get_event_context_type( + struct bt_ctf_stream_class *stream_class) +{ + struct bt_ctf_field_type *ret = NULL; + + if (!stream_class || !stream_class->event_context_type) { + goto end; + } + + assert(stream_class->event_context_type); + bt_ctf_field_type_get(stream_class->event_context_type); + ret = stream_class->event_context_type; +end: + return ret; +} + +int bt_ctf_stream_class_set_event_context_type( + struct bt_ctf_stream_class *stream_class, + struct bt_ctf_field_type *event_context_type) +{ + int ret = 0; + + if (!stream_class || !event_context_type || stream_class->frozen) { + ret = -1; + goto end; + } + + if (bt_ctf_field_type_get_type_id(event_context_type) != + CTF_TYPE_STRUCT) { + /* A packet context must be a structure */ + ret = -1; + goto end; + } + + bt_ctf_field_type_put(stream_class->event_context_type); + bt_ctf_field_type_get(event_context_type); + stream_class->event_context_type = event_context_type; +end: + return ret; +} + void bt_ctf_stream_class_get(struct bt_ctf_stream_class *stream_class) { if (!stream_class) { @@ -331,22 +492,57 @@ void bt_ctf_stream_class_freeze(struct bt_ctf_stream_class *stream_class) } stream_class->frozen = 1; + bt_ctf_field_type_freeze(stream_class->event_header_type); 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); - g_ptr_array_foreach(stream_class->event_classes, - (GFunc)bt_ctf_event_class_freeze, NULL); } 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; - ret = init_event_header(stream_class, byte_order); - if (ret) { + /* 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) { + ret = -1; goto end; } + + switch (byte_order) { + case BT_CTF_BYTE_ORDER_NETWORK: + case BT_CTF_BYTE_ORDER_BIG_ENDIAN: + internal_byte_order = BIG_ENDIAN; + break; + case BT_CTF_BYTE_ORDER_LITTLE_ENDIAN: + internal_byte_order = LITTLE_ENDIAN; + break; + default: + ret = -1; + goto end; + } + + 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; } @@ -437,16 +633,15 @@ void bt_ctf_stream_class_destroy(struct bt_ctf_ref *ref) } bt_ctf_field_type_put(stream_class->event_header_type); - bt_ctf_field_put(stream_class->event_header); bt_ctf_field_type_put(stream_class->packet_context_type); - bt_ctf_field_type_put(stream_class->event_context_type); - bt_ctf_field_put(stream_class->event_context); + if (stream_class->event_context_type) { + bt_ctf_field_type_put(stream_class->event_context_type); + } g_free(stream_class); } static -int init_event_header(struct bt_ctf_stream_class *stream_class, - enum bt_ctf_byte_order byte_order) +int init_event_header(struct bt_ctf_stream_class *stream_class) { int ret = 0; struct bt_ctf_field_type *event_header_type = @@ -461,16 +656,6 @@ int init_event_header(struct bt_ctf_stream_class *stream_class, goto end; } - ret = bt_ctf_field_type_set_byte_order(_uint32_t, byte_order); - if (ret) { - goto end; - } - - ret = bt_ctf_field_type_set_byte_order(_uint64_t, byte_order); - if (ret) { - goto end; - } - ret = bt_ctf_field_type_structure_add_field(event_header_type, _uint32_t, "id"); if (ret) { @@ -483,12 +668,10 @@ int init_event_header(struct bt_ctf_stream_class *stream_class, goto end; } - stream_class->event_header_type = event_header_type; - stream_class->event_header = bt_ctf_field_create( - stream_class->event_header_type); - if (!stream_class->event_header) { - ret = -1; + if (stream_class->event_header_type) { + bt_ctf_field_type_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); @@ -500,8 +683,7 @@ end: } static -int init_packet_context(struct bt_ctf_stream_class *stream_class, - enum bt_ctf_byte_order byte_order) +int init_packet_context(struct bt_ctf_stream_class *stream_class) { int ret = 0; struct bt_ctf_field_type *packet_context_type = @@ -518,11 +700,6 @@ int init_packet_context(struct bt_ctf_stream_class *stream_class, * We create a stream packet context as proposed in the CTF * specification. */ - ret = bt_ctf_field_type_set_byte_order(_uint64_t, byte_order); - if (ret) { - goto end; - } - ret = bt_ctf_field_type_structure_add_field(packet_context_type, _uint64_t, "timestamp_begin"); if (ret) { @@ -553,6 +730,9 @@ 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); + } stream_class->packet_context_type = packet_context_type; end: if (ret) {