X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent.c;h=2c1dad47500b1480569369ab581d776bb9933ee1;hb=c5a9aa19ea52f76f02747d9688d5d044b4a1b545;hp=ee019ff65f0e2b89531bfab18866eceb57c00855;hpb=9f476966aa40bd0de2cd0654623ea03f8a3254eb;p=babeltrace.git diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c index ee019ff6..2c1dad47 100644 --- a/formats/ctf/ir/event.c +++ b/formats/ctf/ir/event.c @@ -35,6 +35,7 @@ #include #include #include +#include #include static @@ -48,7 +49,7 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name) { struct bt_ctf_event_class *event_class = NULL; - if (validate_identifier(name)) { + if (bt_ctf_validate_identifier(name)) { goto end; } @@ -58,6 +59,13 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name) } bt_ctf_ref_init(&event_class->ref_count); + event_class->fields = bt_ctf_field_type_structure_create(); + if (!event_class->fields) { + bt_ctf_event_class_put(event_class); + event_class = NULL; + goto end; + } + event_class->name = g_quark_from_string(name); end: return event_class; @@ -130,24 +138,54 @@ end: return stream_class; } +struct bt_ctf_field_type *bt_ctf_event_class_get_payload_type( + struct bt_ctf_event_class *event_class) +{ + struct bt_ctf_field_type *payload = NULL; + + if (!event_class) { + goto end; + } + + bt_ctf_field_type_get(event_class->fields); + payload = event_class->fields; +end: + return payload; +} + +int bt_ctf_event_class_set_payload_type(struct bt_ctf_event_class *event_class, + struct bt_ctf_field_type *payload) +{ + int ret = 0; + + if (!event_class || !payload) { + ret = -1; + goto end; + } + + bt_ctf_field_type_get(payload); + bt_ctf_field_type_put(event_class->fields); + event_class->fields = payload; +end: + return ret; +} + int bt_ctf_event_class_add_field(struct bt_ctf_event_class *event_class, struct bt_ctf_field_type *type, const char *name) { int ret = 0; - if (!event_class || !type || validate_identifier(name) || + if (!event_class || !type || bt_ctf_validate_identifier(name) || event_class->frozen) { ret = -1; goto end; } - if (!event_class->fields) { - event_class->fields = bt_ctf_field_type_structure_create(); - if (!event_class->fields) { - ret = -1; - goto end; - } + if (bt_ctf_field_type_get_type_id(event_class->fields) != + CTF_TYPE_STRUCT) { + ret = -1; + goto end; } ret = bt_ctf_field_type_structure_add_field(event_class->fields, @@ -166,6 +204,12 @@ int bt_ctf_event_class_get_field_count( goto end; } + if (bt_ctf_field_type_get_type_id(event_class->fields) != + CTF_TYPE_STRUCT) { + ret = -1; + goto end; + } + ret = bt_ctf_field_type_structure_get_field_count(event_class->fields); end: return ret; @@ -182,6 +226,12 @@ int bt_ctf_event_class_get_field(struct bt_ctf_event_class *event_class, goto end; } + if (bt_ctf_field_type_get_type_id(event_class->fields) != + CTF_TYPE_STRUCT) { + ret = -1; + goto end; + } + ret = bt_ctf_field_type_structure_get_field(event_class->fields, field_name, field_type, index); end: @@ -198,6 +248,11 @@ struct bt_ctf_field_type *bt_ctf_event_class_get_field_by_name( goto end; } + if (bt_ctf_field_type_get_type_id(event_class->fields) != + CTF_TYPE_STRUCT) { + goto end; + } + name_quark = g_quark_try_string(name); if (!name_quark) { goto end; @@ -288,7 +343,15 @@ struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class) bt_ctf_event_class_freeze(event_class); event->event_class = event_class; - assert(event_class->stream_class); + /* + * The event class does not keep ownership of the stream class to + * which it as been added. Therefore, it can't assume it has been + * set. However, we disallow the creation of an event if its + * associated stream class has been reclaimed. + */ + if (!event_class->stream_class) { + goto error_destroy; + } assert(event_class->stream_class->event_header_type); event->event_header = bt_ctf_field_create( @@ -307,12 +370,13 @@ struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class) if (!event->fields_payload) { goto error_destroy; } -end: + /* * Freeze the stream class since the event header must not be changed * anymore. */ bt_ctf_stream_class_freeze(event_class->stream_class); +end: return event; error_destroy: bt_ctf_event_destroy(&event->ref_count); @@ -368,17 +432,32 @@ end: int bt_ctf_event_set_payload(struct bt_ctf_event *event, const char *name, - struct bt_ctf_field *value) + struct bt_ctf_field *payload) { int ret = 0; - if (!event || !value || validate_identifier(name)) { + if (!event || !payload) { ret = -1; goto end; } - ret = bt_ctf_field_structure_set_field(event->fields_payload, - name, value); + if (name) { + ret = bt_ctf_field_structure_set_field(event->fields_payload, + name, payload); + } else { + struct bt_ctf_field_type *payload_type; + + payload_type = bt_ctf_field_get_type(payload); + if (payload_type == event->event_class->fields) { + bt_ctf_field_put(event->fields_payload); + bt_ctf_field_get(payload); + event->fields_payload = payload; + } else { + ret = -1; + } + + bt_ctf_field_type_put(payload_type); + } end: return ret; } @@ -389,11 +468,17 @@ struct bt_ctf_field *bt_ctf_event_get_payload(struct bt_ctf_event *event, { struct bt_ctf_field *field = NULL; - if (!event || !name) { + if (!event) { goto end; } - field = bt_ctf_field_structure_get_field(event->fields_payload, name); + if (name) { + field = bt_ctf_field_structure_get_field(event->fields_payload, + name); + } else { + field = event->fields_payload; + bt_ctf_field_get(field); + } end: return field; } @@ -704,6 +789,20 @@ end: return ret; } +void bt_ctf_event_class_set_native_byte_order( + struct bt_ctf_event_class *event_class, + int byte_order) +{ + if (!event_class) { + return; + } + + bt_ctf_field_type_set_native_byte_order(event_class->context, + byte_order); + bt_ctf_field_type_set_native_byte_order(event_class->fields, + byte_order); +} + BT_HIDDEN int bt_ctf_event_validate(struct bt_ctf_event *event) { @@ -753,30 +852,6 @@ end: return ret; } -BT_HIDDEN -int bt_ctf_event_set_timestamp(struct bt_ctf_event *event, - uint64_t timestamp) -{ - int ret = 0; - - assert(event); - if (event->timestamp) { - ret = -1; - goto end; - } - - event->timestamp = timestamp; -end: - return ret; -} - -BT_HIDDEN -uint64_t bt_ctf_event_get_timestamp(struct bt_ctf_event *event) -{ - assert(event); - return event->timestamp; -} - BT_HIDDEN int bt_ctf_event_populate_event_header(struct bt_ctf_event *event) { @@ -800,10 +875,28 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event) timestamp_field = bt_ctf_field_structure_get_field(event->event_header, "timestamp"); if (timestamp_field) { - ret = set_integer_field_value(timestamp_field, - (uint64_t) event->timestamp); - if (ret) { - goto end; + struct bt_ctf_field_type *timestamp_field_type = + bt_ctf_field_get_type(timestamp_field); + struct bt_ctf_clock *mapped_clock; + + assert(timestamp_field_type); + mapped_clock = bt_ctf_field_type_integer_get_mapped_clock( + timestamp_field_type); + bt_ctf_field_type_put(timestamp_field_type); + if (mapped_clock) { + uint64_t timestamp = bt_ctf_clock_get_time( + mapped_clock); + + bt_ctf_clock_put(mapped_clock); + if (timestamp == (uint64_t) -1ULL) { + goto end; + } + + ret = set_integer_field_value(timestamp_field, + timestamp); + if (ret) { + goto end; + } } } end: