X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent.c;h=2d15c83480f5fc074be98478427c6ad1ea0600e9;hb=44e0a4f5a816e471f1e74278704a6e52f94ab975;hp=0bc7f6359aef3daa242ff40a868f519798854767;hpb=662e778c1c251b8ab256f572913b12b819679d32;p=babeltrace.git diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c index 0bc7f635..2d15c834 100644 --- a/formats/ctf/ir/event.c +++ b/formats/ctf/ir/event.c @@ -36,6 +36,7 @@ #include #include #include +#include #include static @@ -47,47 +48,122 @@ int set_integer_field_value(struct bt_ctf_field *field, uint64_t value); struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name) { + int ret; + struct bt_object *obj = NULL; struct bt_ctf_event_class *event_class = NULL; if (bt_ctf_validate_identifier(name)) { - goto end; + goto error; } event_class = g_new0(struct bt_ctf_event_class, 1); if (!event_class) { - goto end; + goto error; } bt_ctf_ref_init(&event_class->ref_count); - event_class->name = g_quark_from_string(name); -end: + event_class->fields = bt_ctf_field_type_structure_create(); + if (!event_class->fields) { + goto error; + } + + event_class->attributes = bt_ctf_attributes_create(); + if (!event_class->attributes) { + goto error; + } + + obj = bt_object_integer_create_init(-1); + if (!obj) { + goto error; + } + + ret = bt_ctf_attributes_set_field_value(event_class->attributes, + "id", obj); + if (ret) { + goto error; + } + + BT_OBJECT_PUT(obj); + + obj = bt_object_string_create_init(name); + if (!obj) { + goto error; + } + + ret = bt_ctf_attributes_set_field_value(event_class->attributes, + "name", obj); + if (ret) { + goto error; + } + + BT_OBJECT_PUT(obj); + return event_class; + +error: + if (event_class) { + bt_ctf_event_class_put(event_class); + } + + BT_OBJECT_PUT(obj); + + return NULL; } const char *bt_ctf_event_class_get_name(struct bt_ctf_event_class *event_class) { + struct bt_object *obj = NULL; const char *name = NULL; if (!event_class) { goto end; } - name = g_quark_to_string(event_class->name); + obj = bt_ctf_attributes_get_field_value(event_class->attributes, + BT_CTF_EVENT_CLASS_ATTR_NAME_INDEX); + if (!obj) { + goto end; + } + + if (bt_object_string_get(obj, &name)) { + name = NULL; + } + end: + BT_OBJECT_PUT(obj); + return name; } int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class) { - int64_t ret; + struct bt_object *obj = NULL; + int64_t ret = 0; - if (!event_class || !event_class->id_set) { + if (!event_class) { + ret = -1; + goto end; + } + + obj = bt_ctf_attributes_get_field_value(event_class->attributes, + BT_CTF_EVENT_CLASS_ATTR_ID_INDEX); + if (!obj) { + goto end; + } + + if (bt_object_integer_get(obj, &ret)) { + ret = -1; + } + + if (ret < 0) { + /* means ID is not set */ ret = -1; goto end; } - ret = (int64_t) event_class->id; end: + BT_OBJECT_PUT(obj); + return ret; } @@ -95,6 +171,7 @@ int bt_ctf_event_class_set_id(struct bt_ctf_event_class *event_class, uint32_t id) { int ret = 0; + struct bt_object *obj = NULL; if (!event_class) { ret = -1; @@ -110,12 +187,142 @@ int bt_ctf_event_class_set_id(struct bt_ctf_event_class *event_class, goto end; } - event_class->id = id; - event_class->id_set = 1; + obj = bt_ctf_attributes_get_field_value(event_class->attributes, + BT_CTF_EVENT_CLASS_ATTR_ID_INDEX); + if (!obj) { + goto end; + } + + if (bt_object_integer_set(obj, id)) { + ret = -1; + goto end; + } + end: + BT_OBJECT_PUT(obj); + return ret; } +int bt_ctf_event_class_set_attribute( + struct bt_ctf_event_class *event_class, const char *name, + struct bt_object *value) +{ + int ret = 0; + + if (!event_class || !name || !value || event_class->frozen) { + ret = -1; + goto end; + } + + if (!strcmp(name, "id") || !strcmp(name, "loglevel")) { + if (!bt_object_is_integer(value)) { + ret = -1; + goto end; + } + } else if (!strcmp(name, "name") || !strcmp(name, "model.emf.uri")) { + if (!bt_object_is_string(value)) { + ret = -1; + goto end; + } + } else { + /* unknown attribute */ + ret = -1; + goto end; + } + + /* "id" special case: >= 0 */ + if (!strcmp(name, "id")) { + int64_t val; + + ret = bt_object_integer_get(value, &val); + + if (ret) { + goto end; + } + + if (val < 0) { + ret = -1; + goto end; + } + } + + ret = bt_ctf_attributes_set_field_value(event_class->attributes, + name, value); + +end: + return ret; +} + +int bt_ctf_event_class_get_attribute_count( + struct bt_ctf_event_class *event_class) +{ + int ret = 0; + + if (!event_class) { + ret = -1; + goto end; + } + + ret = bt_ctf_attributes_get_count(event_class->attributes); + +end: + return ret; +} + +const char * +bt_ctf_event_class_get_attribute_name( + struct bt_ctf_event_class *event_class, int index) +{ + const char *ret; + + if (!event_class) { + ret = NULL; + goto end; + } + + ret = bt_ctf_attributes_get_field_name(event_class->attributes, index); + +end: + return ret; +} + +struct bt_object * +bt_ctf_event_class_get_attribute_value(struct bt_ctf_event_class *event_class, + int index) +{ + struct bt_object *ret; + + if (!event_class) { + ret = NULL; + goto end; + } + + ret = bt_ctf_attributes_get_field_value(event_class->attributes, index); + +end: + return ret; +} + +struct bt_object * +bt_ctf_event_class_get_attribute_value_by_name( + struct bt_ctf_event_class *event_class, const char *name) +{ + struct bt_object *ret; + + if (!event_class || !name) { + ret = NULL; + goto end; + } + + ret = bt_ctf_attributes_get_field_value_by_name(event_class->attributes, + name); + +end: + return ret; + +} + struct bt_ctf_stream_class *bt_ctf_event_class_get_stream_class( struct bt_ctf_event_class *event_class) { @@ -131,6 +338,39 @@ 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 || + bt_ctf_field_type_get_type_id(payload) != CTF_TYPE_STRUCT) { + 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) @@ -143,12 +383,10 @@ int bt_ctf_event_class_add_field(struct bt_ctf_event_class *event_class, 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, @@ -167,6 +405,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; @@ -183,6 +427,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: @@ -199,6 +449,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; @@ -273,22 +528,14 @@ void bt_ctf_event_class_put(struct bt_ctf_event_class *event_class) struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class) { + int ret; + struct bt_object *obj = NULL; struct bt_ctf_event *event = NULL; if (!event_class) { goto end; } - event = g_new0(struct bt_ctf_event, 1); - if (!event) { - goto end; - } - - bt_ctf_ref_init(&event->ref_count); - bt_ctf_event_class_get(event_class); - bt_ctf_event_class_freeze(event_class); - event->event_class = event_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 @@ -296,10 +543,34 @@ struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class) * associated stream class has been reclaimed. */ if (!event_class->stream_class) { - goto error_destroy; + goto end; } assert(event_class->stream_class->event_header_type); + /* set "stream_id" attribute now that we know its value */ + obj = bt_object_integer_create_init(event_class->stream_class->id); + if (!obj) { + goto end; + } + + ret = bt_ctf_attributes_set_field_value(event_class->attributes, + "stream_id", obj); + BT_OBJECT_PUT(obj); + + if (ret) { + goto end; + } + + event = g_new0(struct bt_ctf_event, 1); + if (!event) { + goto end; + } + + bt_ctf_ref_init(&event->ref_count); + bt_ctf_event_class_get(event_class); + bt_ctf_event_class_freeze(event_class); + event->event_class = event_class; + event->event_header = bt_ctf_field_create( event_class->stream_class->event_header_type); if (!event->event_header) { @@ -325,7 +596,10 @@ struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class) end: return event; error_destroy: - bt_ctf_event_destroy(&event->ref_count); + if (event) { + bt_ctf_event_destroy(&event->ref_count); + } + return NULL; } @@ -343,6 +617,22 @@ end: return event_class; } +struct bt_ctf_stream *bt_ctf_event_get_stream(struct bt_ctf_event *event) +{ + struct bt_ctf_stream *stream = NULL; + + if (!event) { + goto end; + } + + stream = event->stream; + if (stream) { + bt_ctf_stream_get(stream); + } +end: + return stream; +} + struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event) { struct bt_ctf_clock *clock = NULL; @@ -378,17 +668,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 || bt_ctf_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; } @@ -399,11 +704,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; } @@ -549,6 +860,9 @@ void bt_ctf_event_class_destroy(struct bt_ctf_ref *ref) * bt_ctf_event_class_set_stream_class for explanation. */ event_class = container_of(ref, struct bt_ctf_event_class, ref_count); + if (event_class->attributes) { + bt_ctf_attributes_destroy(event_class->attributes); + } if (event_class->context) { bt_ctf_field_type_put(event_class->context); } @@ -634,6 +948,7 @@ void bt_ctf_event_class_freeze(struct bt_ctf_event_class *event_class) event_class->frozen = 1; bt_ctf_field_type_freeze(event_class->context); bt_ctf_field_type_freeze(event_class->fields); + bt_ctf_attributes_freeze(event_class->attributes); } BT_HIDDEN @@ -670,23 +985,76 @@ BT_HIDDEN int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class, struct metadata_context *context) { + int i; + int count; int ret = 0; - int64_t stream_id; + struct bt_object *attr_value = NULL; assert(event_class); assert(context); - stream_id = bt_ctf_stream_class_get_id(event_class->stream_class); - if (stream_id < 0) { + + context->current_indentation_level = 1; + g_string_assign(context->field_name, ""); + g_string_append(context->string, "event {\n"); + count = bt_ctf_event_class_get_attribute_count(event_class); + + if (count < 0) { ret = -1; goto end; } - context->current_indentation_level = 1; - g_string_assign(context->field_name, ""); - g_string_append_printf(context->string, "event {\n\tname = \"%s\";\n\tid = %u;\n\tstream_id = %" PRId64 ";\n", - g_quark_to_string(event_class->name), - event_class->id, - stream_id); + for (i = 0; i < count; ++i) { + const char *attr_name = NULL; + + attr_name = bt_ctf_event_class_get_attribute_name( + event_class, i); + attr_value = bt_ctf_event_class_get_attribute_value( + event_class, i); + + if (!attr_name || !attr_value) { + ret = -1; + goto end; + } + + switch (bt_object_get_type(attr_value)) { + case BT_OBJECT_TYPE_INTEGER: + { + int64_t value; + + ret = bt_object_integer_get(attr_value, &value); + + if (ret) { + goto end; + } + + g_string_append_printf(context->string, + "\t%s = %" PRId64 ";\n", attr_name, value); + break; + } + + case BT_OBJECT_TYPE_STRING: + { + const char *value; + + ret = bt_object_string_get(attr_value, &value); + + if (ret) { + goto end; + } + + g_string_append_printf(context->string, + "\t%s = \"%s\";\n", attr_name, value); + break; + } + + default: + /* should never happen */ + assert(false); + break; + } + + BT_OBJECT_PUT(attr_value); + } if (event_class->context) { g_string_append(context->string, "\tcontext := "); @@ -710,6 +1078,7 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class, g_string_append(context->string, "};\n\n"); end: context->current_indentation_level = 0; + BT_OBJECT_PUT(attr_value); return ret; } @@ -776,30 +1145,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) { @@ -814,7 +1159,8 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event) id_field = bt_ctf_field_structure_get_field(event->event_header, "id"); if (id_field) { ret = set_integer_field_value(id_field, - (uint64_t) event->event_class->id); + (uint64_t) bt_ctf_event_class_get_id( + event->event_class)); if (ret) { goto end; } @@ -823,10 +1169,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: @@ -838,3 +1202,25 @@ end: } return ret; } + +BT_HIDDEN +int bt_ctf_event_set_stream(struct bt_ctf_event *event, + struct bt_ctf_stream *stream) +{ + int ret = 0; + + if (!event) { + ret = -1; + goto end; + } + + if (event->stream && stream) { + /* Already attached to a stream */ + ret = -1; + goto end; + } + + event->stream = stream; +end: + return ret; +}